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

main
Dave Airlie 2008-02-15 16:42:44 +10:00
parent 222092a1a8
commit 088b383829
2 changed files with 2 additions and 2 deletions

View File

@ -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;

View File

@ -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;