Attachment 130207 Details for Bug 99841 – Only reject if FBINFO_MISC_USEREVENT is set

[patch] Only reject if FBINFO_MISC_USEREVENT is set

drm-FBINFO_MISC_USEREVENT.diff (text/plain), 1019 bytes, created by Michel Dänzer on 2017-03-14 01:50:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2017-03-14 01:50:32 UTC

Size: 1019 bytes

patch

obsolete

>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->bits_per_pixel ||
>-	    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->bits_per_pixel ||
>+	     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,

Actions: View | Splinter Review

Attachments on bug 99841: 129683 | 129956 | 130207 | 130227

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.