Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1602146

[PATCH] drm/fb-helper: Only reject FB changes if FB_MISC_USER_EVENT is set

Show all headers | View raw

From: Michel Dänzer <michel.daenzer@amd.com>

Otherwise this can also prevent modesets e.g. for switching VTs.

FB_MISC_USER_EVENT is set when the request originates from userspace,
which is what we're interested in here according to the DRM_DEBUG
output.

Bugzilla: https://bugs.freedesktop.org/99841
Fixes: 865afb11949e ("drm/fb-helper: reject any changes to the fbdev")
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
---

I'm not entirely sure why the values can not match for a VT switch. If
anybody thinks this just papers over the real issue, please speak up.

 drivers/gpu/drm/drm_fb_helper.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index f6d4d9700734..9663f3b8f287 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -1259,9 +1259,10 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
 	 * Changes struct fb_var_screeninfo are currently not pushed back
 	 * to KMS, hence fail if different settings are requested.
 	 */
-	if (var->bits_per_pixel != fb->format->cpp[0] * 8 ||
-	    var->xres != fb->width || var->yres != fb->height ||
-	    var->xres_virtual != fb->width || var->yres_virtual != fb->height) {
+	if ((info->flags & FBINFO_MISC_USEREVENT) &&
+	    (var->bits_per_pixel != fb->format->cpp[0] * 8 ||
+	     var->xres != fb->width || var->yres != fb->height ||
+	     var->xres_virtual != fb->width || var->yres_virtual != fb->height)) {
 		DRM_DEBUG("fb userspace requested width/height/bpp different than current fb "
 			  "request %dx%d-%d (virtual %dx%d) > %dx%d-%d\n",
 			  var->xres, var->yres, var->bits_per_pixel,
-- 
2.11.0

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] drm/fb-helper: Only reject FB changes if FB_MISC_USER_EVENT is set Michel Dänzer <michel@daenzer.net> - 2017-03-16 11:00 +0100
  Re: [PATCH] drm/fb-helper: Only reject FB changes if  FB_MISC_USER_EVENT is set Daniel Stone <daniel@fooishbar.org> - 2017-03-16 11:10 +0100
    Re: [PATCH] drm/fb-helper: Only reject FB changes if  FB_MISC_USER_EVENT is set Michel Dänzer <michel@daenzer.net> - 2017-03-17 10:00 +0100
  Re: [PATCH] drm/fb-helper: Only reject FB changes if  FB_MISC_USER_EVENT is set Ville Syrjälä <ville.syrjala@linux.intel.com> - 2017-03-16 11:10 +0100
    Re: [PATCH] drm/fb-helper: Only reject FB changes if  FB_MISC_USER_EVENT is set Michel Dänzer <michel@daenzer.net> - 2017-03-17 10:10 +0100
      Re: [PATCH] drm/fb-helper: Only reject FB changes if  FB_MISC_USER_EVENT is set Ville Syrjälä <ville.syrjala@linux.intel.com> - 2017-03-17 11:50 +0100
        Re: [PATCH] drm/fb-helper: Only reject FB changes if  FB_MISC_USER_EVENT is set Michel Dänzer <michel@daenzer.net> - 2017-03-17 11:50 +0100
          Re: [PATCH] drm/fb-helper: Only reject FB changes if  FB_MISC_USER_EVENT is set Ville Syrjälä <ville.syrjala@linux.intel.com> - 2017-03-17 12:20 +0100
            Re: [PATCH] drm/fb-helper: Only reject FB changes if  FB_MISC_USER_EVENT is set Michel Dänzer <michel@daenzer.net> - 2017-03-21 04:30 +0100
  [PATCH] drm/fb-helper: Allow var->x/yres(_virtual) < fb->width/height again Michel Dänzer <michel@daenzer.net> - 2017-03-23 10:00 +0100
    Re: [PATCH] drm/fb-helper: Allow var->x/yres(_virtual) <  fb->width/height again Daniel Stone <daniel@fooishbar.org> - 2017-03-23 13:10 +0100
      Re: [PATCH] drm/fb-helper: Allow var->x/yres(_virtual) <  fb->width/height again Daniel Vetter <daniel@ffwll.ch> - 2017-03-23 15:00 +0100
    Re: [PATCH] drm/fb-helper: Allow var->x/yres(_virtual) <  fb->width/height again Stefan Agner <stefan@agner.ch> - 2017-03-24 02:00 +0100

csiph-web