Commit 3420e742 authored by Dave Airlie's avatar Dave Airlie

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: default avatarDave Airlie <airlied@redhat.com>
parent 3b51096f
...@@ -616,7 +616,7 @@ void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch) ...@@ -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.xpanstep = 1; /* doing it in hw */
info->fix.ypanstep = 1; /* doing it in hw */ info->fix.ypanstep = 1; /* doing it in hw */
info->fix.ywrapstep = 0; info->fix.ywrapstep = 0;
info->fix.accel = FB_ACCEL_I830; info->fix.accel = FB_ACCEL_NONE;
info->fix.type_aux = 0; info->fix.type_aux = 0;
info->fix.line_length = pitch; info->fix.line_length = pitch;
......
...@@ -205,7 +205,7 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width, ...@@ -205,7 +205,7 @@ static int intelfb_create(struct drm_device *dev, uint32_t fb_width,
// memset(info->screen_base, 0, size); // 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); drm_fb_helper_fill_var(info, fb, fb_width, fb_height);
/* FIXME: we really shouldn't expose mmio space at all */ /* FIXME: we really shouldn't expose mmio space at all */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment