diff options
| author | Sean Paul | 2017-04-04 17:26:14 +0200 |
|---|---|---|
| committer | Sean Paul | 2017-04-04 17:26:14 +0200 |
| commit | c829a33253e018472335b02e6d8bb1bb4213a142 (patch) | |
| tree | 3da5ab428f3d9f0812f288d32d8893a3f16868b9 /drivers/gpu/drm/drm_fb_helper.c | |
| parent | drm: virtio: fix virtio_gpu_mode_dumb_create (diff) | |
| parent | Merge tag 'omapdrm-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tom... (diff) | |
| download | kernel-qcow2-linux-c829a33253e018472335b02e6d8bb1bb4213a142.tar.gz kernel-qcow2-linux-c829a33253e018472335b02e6d8bb1bb4213a142.tar.xz kernel-qcow2-linux-c829a33253e018472335b02e6d8bb1bb4213a142.zip | |
Merge airlied/drm-next into drm-misc-next
Backmerging in order to pull vmwgfx [1] and the new synopsys media
format [2] reqs.
[1]- http://patchwork.freedesktop.org/patch/msgid/20170331233255.GA38850@syeh-m02
[2]- http://patchwork.freedesktop.org/patch/msgid/20170403163544.kcw5kk52tgku5xua@art_vandelay
Signed-off-by: Sean Paul <seanpaul@chromium.org>
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 8afc1bb287a2..673a47445d61 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1342,9 +1342,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, |