summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-08-31 10:33:29 +1000
committerDave Airlie <airlied@redhat.com>2009-08-31 10:33:29 +1000
commit3420e74262a7d6496d0ac433d6f61c9972f015f6 (patch)
tree8da12c0cf4c5834bf18872e4b65ed3f7cce742e6 /drivers/gpu/drm/i915
parent3b51096f95633e6ab47675984e8e38fc37b09eeb (diff)
downloadblackbird-op-linux-3420e74262a7d6496d0ac433d6f61c9972f015f6.tar.gz
blackbird-op-linux-3420e74262a7d6496d0ac433d6f61c9972f015f6.zip
drm: fix two issues with fb consolidation.
Set accel to none, we really don't want anyone thinking fb is an accel interface. Pass pitch not depth to function for intel. Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r--drivers/gpu/drm/i915/intel_fb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c
index 3041530c3673..7ba4a232a97f 100644
--- a/drivers/gpu/drm/i915/intel_fb.c
+++ b/drivers/gpu/drm/i915/intel_fb.c
@@ -205,7 +205,7 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
// memset(info->screen_base, 0, size);
- drm_fb_helper_fill_fix(info, fb->depth);
+ drm_fb_helper_fill_fix(info, fb->pitch);
drm_fb_helper_fill_var(info, fb, fb_width, fb_height);
/* FIXME: we really shouldn't expose mmio space at all */
OpenPOWER on IntegriCloud