diff options
| author | Dave Airlie | 2017-03-28 09:34:19 +0200 |
|---|---|---|
| committer | Dave Airlie | 2017-03-28 09:34:19 +0200 |
| commit | e5c1ff14757afe21733ddee9cc4bbaeaeadbf803 (patch) | |
| tree | 0da1c9aaf772fac30fe68590a4ca1c3dd439cebd /drivers/gpu/drm/drm_fb_helper.c | |
| parent | BackMerge tag 'v4.11-rc3' into drm-next (diff) | |
| parent | Linux 4.11-rc4 (diff) | |
| download | kernel-qcow2-linux-e5c1ff14757afe21733ddee9cc4bbaeaeadbf803.tar.gz kernel-qcow2-linux-e5c1ff14757afe21733ddee9cc4bbaeaeadbf803.tar.xz kernel-qcow2-linux-e5c1ff14757afe21733ddee9cc4bbaeaeadbf803.zip | |
Backmerge tag 'v4.11-rc4' into drm-next
Linux 4.11-rc4
The i915 GVT team need the rc4 code to base some more code on.
Diffstat (limited to 'drivers/gpu/drm/drm_fb_helper.c')
| -rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 45fde2ffef2a..e65becd964a1 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1332,9 +1332,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, |