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

Commit 57084d05 authored by James Simmons's avatar James Simmons Committed by Dave Airlie
Browse files

drm/fb: Don't expose mmio for fbdev emulation layer 



For the fbdev api if the struct fb_var_screeninfo accel_flags field is set
to FB_ACCELF_TEXT then userland applications can not mmap the mmio region.
Since it is a bad idea for DRM drivers to expose the mmio region via the
fbdev layer we always set the accel_flags to prevent this. Please apply.

Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent b08ebe7e

drivers/gpu/drm/drm_fb_helper.c

+3 −0
Original line number Diff line number Diff line
@@ -985,6 +985,8 @@ void drm_fb_helper_fill_fix(struct fb_info *info, uint32_t pitch, 
	info->fix.type = FB_TYPE_PACKED_PIXELS;

	info->fix.visual = depth == 8 ? FB_VISUAL_PSEUDOCOLOR :

		FB_VISUAL_TRUECOLOR;

	info->fix.mmio_start = 0;

	info->fix.mmio_len = 0;

	info->fix.type_aux = 0;

	info->fix.xpanstep = 1; /* doing it in hw */

	info->fix.ypanstep = 1; /* doing it in hw */
@@ -1005,6 +1007,7 @@ void drm_fb_helper_fill_var(struct fb_info *info, struct drm_fb_helper *fb_helpe 
	info->var.xres_virtual = fb->width;

	info->var.yres_virtual = fb->height;

	info->var.bits_per_pixel = fb->bits_per_pixel;

	info->var.accel_flags = FB_ACCELF_TEXT;

	info->var.xoffset = 0;

	info->var.yoffset = 0;

	info->var.activate = FB_ACTIVATE_NOW;

drivers/gpu/drm/i915/intel_fb.c

+1 −5
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static int intelfb_create(struct intel_fbdev *ifbdev, 
	struct drm_gem_object *fbo = NULL;

	struct drm_i915_gem_object *obj_priv;

	struct device *device = &dev->pdev->dev;

	int size, ret, mmio_bar = IS_GEN2(dev) ? 1 : 0;

	int size, ret;



	/* we don't do packed 24bpp */

	if (sizes->surface_bpp == 24)
@@ -156,10 +156,6 @@ static int intelfb_create(struct intel_fbdev *ifbdev, 
	drm_fb_helper_fill_fix(info, fb->pitch, fb->depth);

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



	/* FIXME: we really shouldn't expose mmio space at all */

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

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



	info->pixmap.size = 64*1024;

	info->pixmap.buf_align = 8;

	info->pixmap.access_align = 32;

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+0 −4
Original line number Diff line number Diff line
@@ -348,10 +348,6 @@ nouveau_fbcon_create(struct nouveau_fbdev *nfbdev, 
	drm_fb_helper_fill_fix(info, fb->pitch, fb->depth);

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



	/* FIXME: we really shouldn't expose mmio space at all */

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

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



	/* Set aperture base/size for vesafb takeover */

	info->apertures = dev_priv->apertures;

	if (!info->apertures) {

drivers/gpu/drm/radeon/radeon_fb.c

+0 −2
Original line number Diff line number Diff line
@@ -247,8 +247,6 @@ static int radeonfb_create(struct radeon_fbdev *rfbdev, 
	info->apertures->ranges[0].base = rdev->ddev->mode_config.fb_base;

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



	info->fix.mmio_start = 0;

	info->fix.mmio_len = 0;

	info->pixmap.size = 64*1024;

	info->pixmap.buf_align = 8;

	info->pixmap.access_align = 32;

drivers/gpu/drm/vmwgfx/vmwgfx_fb.c

+0 −3
Original line number Diff line number Diff line
@@ -480,9 +480,6 @@ int vmw_fb_init(struct vmw_private *vmw_priv) 
	info->fix.smem_start = 0;

	info->fix.smem_len = fb_size;



	info->fix.mmio_start = 0;

	info->fix.mmio_len = 0;



	info->pseudo_palette = par->pseudo_palette;

	info->screen_base = par->vmalloc;

	info->screen_size = fb_size;