Unverified Commit 842470c4 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas
Browse files

Revert "drm/fb-helper: improve DRM fbdev emulation device names" 



This reverts commit b3484d2b.

That change attempted to improve the DRM drivers fbdev emulation device
names to avoid having confusing names like "simpledrmdrmfb" in /proc/fb.

But unfortunately, there are user-space programs such as pm-utils that
match against the fbdev names and so broke after the mentioned commit.

Since the names in /proc/fb are used by tools that consider it an uAPI,
let's restore the old names even when this lead to silly names like the
one mentioned above.

Fixes: b3484d2b ("drm/fb-helper: improve DRM fbdev emulation device names")
Reported-by: default avatarJohannes Stezenbach <js@sig21.net>
Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211020165740.3011927-1-javierm@redhat.com
parent b19926d4

drivers/gpu/drm/drm_fb_helper.c

+7 −1
Original line number Diff line number Diff line
@@ -1743,7 +1743,13 @@ void drm_fb_helper_fill_info(struct fb_info *info, 
			       sizes->fb_width, sizes->fb_height);



	info->par = fb_helper;

	snprintf(info->fix.id, sizeof(info->fix.id), "%s",

	/*

	 * The DRM drivers fbdev emulation device name can be confusing if the

	 * driver name also has a "drm" suffix on it. Leading to names such as

	 * "simpledrmdrmfb" in /proc/fb. Unfortunately, it's an uAPI and can't

	 * be changed due user-space tools (e.g: pm-utils) matching against it.

	 */

	snprintf(info->fix.id, sizeof(info->fix.id), "%sdrmfb",

		 fb_helper->dev->driver->name);



}