diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-02-06 04:58:19 -0500 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2012-02-09 05:34:43 -0500 |
commit | fb2a99e15ff0d342de4ba58c84a791224a96a01a (patch) | |
tree | 7e7addff62f92f4ffed79162474a93c1ba25c49b /drivers/gpu/drm/i915 | |
parent | d9bc3c02e36d844c2d980e65ddda5c7699e073f8 (diff) |
drm: do not set fb_info->pixmap fields
The drm drivers set the fb_info->pixmap fields without setting
fb_info->pixmap.addr. If this is not set the fb core will overwrite
these all fb_info->pixmap fields anyway, so there is not much point
in setting them in the first place.
[airlied: dropped nvidiafb piece - not mine]
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915')
-rw-r--r-- | drivers/gpu/drm/i915/intel_fb.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index 571375a3eef..2d876697838 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c | |||
@@ -152,11 +152,7 @@ static int intelfb_create(struct intel_fbdev *ifbdev, | |||
152 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth); | 152 | drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth); |
153 | drm_fb_helper_fill_var(info, &ifbdev->helper, sizes->fb_width, sizes->fb_height); | 153 | drm_fb_helper_fill_var(info, &ifbdev->helper, sizes->fb_width, sizes->fb_height); |
154 | 154 | ||
155 | info->pixmap.size = 64*1024; | 155 | /* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */ |
156 | info->pixmap.buf_align = 8; | ||
157 | info->pixmap.access_align = 32; | ||
158 | info->pixmap.flags = FB_PIXMAP_SYSTEM; | ||
159 | info->pixmap.scan_align = 1; | ||
160 | 156 | ||
161 | DRM_DEBUG_KMS("allocated %dx%d fb: 0x%08x, bo %p\n", | 157 | DRM_DEBUG_KMS("allocated %dx%d fb: 0x%08x, bo %p\n", |
162 | fb->width, fb->height, | 158 | fb->width, fb->height, |