niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm/fb-helper: Set flag in struct drm_fb_helper for leaking physical addresses

Browse source 
Uncouple the parameter drm_leak_fbdev_smem from the implementation by
setting a flag in struct drm_fb_helper. This will help to move the
generic fbdev emulation into its own source file, while keeping the
parameter in drm_fb_helper.c. No functional changes.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221103151446.2638-21-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2022-11-03 16:14:43 +01:00
parent 7ce19535e9
commit e7c5c29a9e
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/gpu/drm/drm_fb_helper.c
View file

@ -74,7 +74,7 @@ MODULE_PARM_DESC(drm_fbdev_overalloc,
* considered as a broken and legacy behaviour from a modern fbdev device. * considered as a broken and legacy behaviour from a modern fbdev device.
*/ */
#if IS_ENABLED(CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM) #if IS_ENABLED(CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM)
static bool drm_leak_fbdev_smem = false; static bool drm_leak_fbdev_smem;
module_param_unsafe(drm_leak_fbdev_smem, bool, 0600); module_param_unsafe(drm_leak_fbdev_smem, bool, 0600);
MODULE_PARM_DESC(drm_leak_fbdev_smem, MODULE_PARM_DESC(drm_leak_fbdev_smem,
"Allow unsafe leaking fbdev physical smem address [default=false]"); "Allow unsafe leaking fbdev physical smem address [default=false]");
@ -1968,6 +1968,10 @@ static int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
sizes.surface_height = config->max_height; sizes.surface_height = config->max_height;
} }
#if IS_ENABLED(CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM)
fb_helper->hint_leak_smem_start = drm_leak_fbdev_smem;
#endif
/* push down into drivers */ /* push down into drivers */
ret = (*fb_helper->funcs->fb_probe)(fb_helper, &sizes); ret = (*fb_helper->funcs->fb_probe)(fb_helper, &sizes);
if (ret < 0) if (ret < 0)
@ -2165,7 +2169,7 @@ __drm_fb_helper_initial_config_and_unlock(struct drm_fb_helper *fb_helper,
info->var.pixclock = 0; info->var.pixclock = 0;
/* Shamelessly allow physical address leaking to userspace */ /* Shamelessly allow physical address leaking to userspace */
#if IS_ENABLED(CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM) #if IS_ENABLED(CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM)
if (!drm_leak_fbdev_smem) if (!fb_helper->hint_leak_smem_start)
#endif #endif
/* don't leak any physical addresses to userspace */ /* don't leak any physical addresses to userspace */
info->flags |= FBINFO_HIDE_SMEM_START; info->flags |= FBINFO_HIDE_SMEM_START;
@ -2564,7 +2568,7 @@ static int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper,
* case. * case.
*/ */
#if IS_ENABLED(CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM) #if IS_ENABLED(CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM)
if (drm_leak_fbdev_smem && fbi->fix.smem_start == 0 && if (fb_helper->hint_leak_smem_start && fbi->fix.smem_start == 0 &&
!drm_WARN_ON_ONCE(dev, map.is_iomem)) !drm_WARN_ON_ONCE(dev, map.is_iomem))
fbi->fix.smem_start = fbi->fix.smem_start =
page_to_phys(virt_to_page(fbi->screen_buffer)); page_to_phys(virt_to_page(fbi->screen_buffer));

2
include/drm/drm_fb_helper.h
View file

@ -199,6 +199,8 @@ struct drm_fb_helper {
* See also: @deferred_setup * See also: @deferred_setup
*/ */
int preferred_bpp; int preferred_bpp;
bool hint_leak_smem_start;
}; };
static inline struct drm_fb_helper * static inline struct drm_fb_helper *