Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1607270
| From | Michel Dänzer <michel@daenzer.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH] drm/fb-helper: Allow var->x/yres(_virtual) < fb->width/height again |
| Date | 2017-03-23 10:00 +0100 |
| Message-ID | <to6L8-8hs-23@gated-at.bofh.it> (permalink) |
| References | <tlAmn-4QJ-25@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
From: Michel Dänzer <michel.daenzer@amd.com>
Otherwise this can also prevent modesets e.g. for switching VTs, when
multiple monitors with different native resolutions are connected.
The depths must match though, so keep the != test for that.
Also update the DRM_DEBUG output to be slightly more accurate, this
doesn't only affect requests from userspace.
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>
---
drivers/gpu/drm/drm_fb_helper.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index f6d4d9700734..324a688b3f30 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -1260,9 +1260,9 @@ int drm_fb_helper_check_var(struct fb_var_screeninfo *var,
* 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) {
- DRM_DEBUG("fb userspace requested width/height/bpp different than current fb "
+ var->xres > fb->width || var->yres > fb->height ||
+ var->xres_virtual > fb->width || var->yres_virtual > fb->height) {
+ DRM_DEBUG("fb requested width/height/bpp can't fit in current fb "
"request %dx%d-%d (virtual %dx%d) > %dx%d-%d\n",
var->xres, var->yres, var->bits_per_pixel,
var->xres_virtual, var->yres_virtual,
--
2.11.0
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll 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