Browse Source

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>
Dave Airlie 16 năm trước cách đây
mục cha
commit
3420e74262
2 tập tin đã thay đổi với 2 bổ sung2 xóa
  1. 1 1
      drivers/gpu/drm/drm_fb_helper.c
  2. 1 1
      drivers/gpu/drm/i915/intel_fb.c

+ 1 - 1
drivers/gpu/drm/drm_fb_helper.c

@@ -616,7 +616,7 @@ void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch)
 	info->fix.xpanstep = 1; /* doing it in hw */
 	info->fix.ypanstep = 1; /* doing it in hw */
 	info->fix.ywrapstep = 0;
-	info->fix.accel = FB_ACCEL_I830;
+	info->fix.accel = FB_ACCEL_NONE;
 	info->fix.type_aux = 0;
 
 	info->fix.line_length = pitch;

+ 1 - 1
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 */