diff options
| author | Jon Medhurst <tixy@linaro.org> | 2017-04-10 16:23:31 +0100 |
|---|---|---|
| committer | Ryan Harkin <ryan.harkin@linaro.org> | 2017-07-13 21:45:01 +0100 |
| commit | 0100c9074eb12ea62f4303a36b960ef0b190d184 (patch) | |
| tree | b9a3a5f49d5b91aee919b89b3c64f22cb4da3c5f | |
| parent | c4d48d72bb2a7733ef1e180b1dd7cd7ec9acf9e5 (diff) | |
fixup! drm: hdlcd: Create frame buffers with a virtual height twice physical heightlatest-armlt-hdlcd
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | drivers/gpu/drm/arm/hdlcd_fb_helper.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/arm/hdlcd_fb_helper.c b/drivers/gpu/drm/arm/hdlcd_fb_helper.c index 0f877c03ff75..1963dbc9fd3d 100644 --- a/drivers/gpu/drm/arm/hdlcd_fb_helper.c +++ b/drivers/gpu/drm/arm/hdlcd_fb_helper.c @@ -39,7 +39,7 @@ static int hdlcd_fb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg); /****************************************************************************** - * Code copied from drivers/gpu/drm/drm_fb_helper.c as of Linux 4.4 + * Code copied from drivers/gpu/drm/drm_fb_helper.c as of Linux 4.11-rc4 ******************************************************************************/ /** @@ -60,9 +60,9 @@ static int hdlcd_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 * MAX_FRAMES) { - 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 * MAX_FRAMES) { + 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, |