Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb2a99e1 authored by Sascha Hauer's avatar Sascha Hauer Committed by Dave Airlie
Browse files

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: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent d9bc3c02

drivers/gpu/drm/gma500/framebuffer.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -507,11 +507,7 @@ static int psbfb_create(struct psb_fbdev *fbdev, 
	info->fix.mmio_start = pci_resource_start(dev->pdev, 0);

	info->fix.mmio_start = pci_resource_start(dev->pdev, 0);

	info->fix.mmio_len = pci_resource_len(dev->pdev, 0);

	info->fix.mmio_len = pci_resource_len(dev->pdev, 0);





	info->pixmap.size = 64 * 1024;

	/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */

	info->pixmap.buf_align = 8;

	info->pixmap.access_align = 32;

	info->pixmap.flags = FB_PIXMAP_SYSTEM;

	info->pixmap.scan_align = 1;





	dev_info(dev->dev, "allocated %dx%d fb\n",

	dev_info(dev->dev, "allocated %dx%d fb\n",

					psbfb->base.width, psbfb->base.height);

					psbfb->base.width, psbfb->base.height);

drivers/gpu/drm/i915/intel_fb.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -152,11 +152,7 @@ static int intelfb_create(struct intel_fbdev *ifbdev, 
	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);

	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->depth);

	drm_fb_helper_fill_var(info, &ifbdev->helper, sizes->fb_width, sizes->fb_height);

	drm_fb_helper_fill_var(info, &ifbdev->helper, sizes->fb_width, sizes->fb_height);





	info->pixmap.size = 64*1024;

	/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */

	info->pixmap.buf_align = 8;

	info->pixmap.access_align = 32;

	info->pixmap.flags = FB_PIXMAP_SYSTEM;

	info->pixmap.scan_align = 1;





	DRM_DEBUG_KMS("allocated %dx%d fb: 0x%08x, bo %p\n",

	DRM_DEBUG_KMS("allocated %dx%d fb: 0x%08x, bo %p\n",

		      fb->width, fb->height,

		      fb->width, fb->height,

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -381,11 +381,7 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev, 
		goto out_unref;

		goto out_unref;

	}

	}





	info->pixmap.size = 64*1024;

	/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */

	info->pixmap.buf_align = 8;

	info->pixmap.access_align = 32;

	info->pixmap.flags = FB_PIXMAP_SYSTEM;

	info->pixmap.scan_align = 1;





	mutex_unlock(&dev->struct_mutex);

	mutex_unlock(&dev->struct_mutex);

drivers/gpu/drm/radeon/radeon_fb.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -254,11 +254,7 @@ static int radeonfb_create(struct radeon_fbdev *rfbdev, 
	info->apertures->ranges[0].base = rdev->ddev->mode_config.fb_base;

	info->apertures->ranges[0].base = rdev->ddev->mode_config.fb_base;

	info->apertures->ranges[0].size = rdev->mc.aper_size;

	info->apertures->ranges[0].size = rdev->mc.aper_size;





	info->pixmap.size = 64*1024;

	/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */

	info->pixmap.buf_align = 8;

	info->pixmap.access_align = 32;

	info->pixmap.flags = FB_PIXMAP_SYSTEM;

	info->pixmap.scan_align = 1;





	if (info->screen_base == NULL) {

	if (info->screen_base == NULL) {

		ret = -ENOSPC;

		ret = -ENOSPC;

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

+1 −13
Original line number Original line Diff line number Diff line
@@ -515,19 +515,7 @@ int vmw_fb_init(struct vmw_private *vmw_priv) 
	info->var.xres = initial_width;

	info->var.xres = initial_width;

	info->var.yres = initial_height;

	info->var.yres = initial_height;





#if 0

	/* Use default scratch pixmap (info->pixmap.flags = FB_PIXMAP_SYSTEM) */

	info->pixmap.size = 64*1024;

	info->pixmap.buf_align = 8;

	info->pixmap.access_align = 32;

	info->pixmap.flags = FB_PIXMAP_SYSTEM;

	info->pixmap.scan_align = 1;

#else

	info->pixmap.size = 0;

	info->pixmap.buf_align = 8;

	info->pixmap.access_align = 32;

	info->pixmap.flags = FB_PIXMAP_SYSTEM;

	info->pixmap.scan_align = 1;

#endif





	info->apertures = alloc_apertures(1);

	info->apertures = alloc_apertures(1);

	if (!info->apertures) {

	if (!info->apertures) {