From: Dave Airlie <airlied@redhat.com>
Date: Fri, 15 Feb 2008 06:42:44 +0000 (+1000)
Subject: fb: fixup the offset by getting it from the right place
X-Git-Tag: android-x86-1.6~141^2~260
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=088b38382962a9dccca59a53af2444a1fe8bc18f;p=android-x86%2Fexternal-libdrm.git

fb: fixup the offset by getting it from the right place
---

diff --git a/linux-core/drm_crtc.c b/linux-core/drm_crtc.c
index 3a0dd9c8..aceb31b4 100644
--- a/linux-core/drm_crtc.c
+++ b/linux-core/drm_crtc.c
@@ -1754,7 +1754,6 @@ int drm_mode_addfb(struct drm_device *dev,
 	fb->pitch = r->pitch;
 	fb->bits_per_pixel = r->bpp;
 	fb->depth = r->depth;
-	fb->offset = bo->offset;
 	fb->bo = bo;
 
 	r->buffer_id = fb->id;
diff --git a/linux-core/intel_display.c b/linux-core/intel_display.c
index db3aee83..6a9d9808 100644
--- a/linux-core/intel_display.c
+++ b/linux-core/intel_display.c
@@ -370,7 +370,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y)
 	int dspbase = (pipe == 0 ? DSPABASE : DSPBBASE);
 	int dspsurf = (pipe == 0 ? DSPASURF : DSPBSURF);
 
-	Start = crtc->fb->offset;
+	Start = crtc->fb->bo->offset;
 	Offset = y * crtc->fb->pitch + x * (crtc->fb->bits_per_pixel / 8);
 
 	DRM_DEBUG("Writing base %08lX %08lX %d %d\n", Start, Offset, x, y);
@@ -814,6 +814,7 @@ static void intel_crtc_mode_set(struct drm_crtc *crtc,
 		else
 			dspcntr |= DISPPLANE_16BPP;
 		break;
+	case 24:
 	case 32:
 		dspcntr |= DISPPLANE_32BPP_NO_ALPHA;
 		break;