diff options
| author | Sean Paul <seanpaul@chromium.org> | 2017-04-04 11:26:14 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2017-04-04 11:26:14 -0400 |
| commit | c829a33253e018472335b02e6d8bb1bb4213a142 (patch) | |
| tree | 3da5ab428f3d9f0812f288d32d8893a3f16868b9 /drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | |
| parent | 9c4ad466d1dd2e067d5fdb2fcdbcc30fc5c145f9 (diff) | |
| parent | e1b489d207c73e67810659a88c45b8db4bd62773 (diff) | |
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/vmwgfx/vmwgfx_surface.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c index b445ce9b9757..41b9d20d6ae7 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c @@ -814,7 +814,6 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, } else { srf->snooper.image = NULL; } - srf->snooper.crtc = NULL; user_srf->prime.base.shareable = false; user_srf->prime.base.tfile = NULL; @@ -1480,10 +1479,24 @@ int vmw_surface_gb_priv_define(struct drm_device *dev, *srf_out = NULL; if (for_scanout) { + uint32_t max_width, max_height; + if (!svga3dsurface_is_screen_target_format(format)) { DRM_ERROR("Invalid Screen Target surface format."); return -EINVAL; } + + max_width = min(dev_priv->texture_max_width, + dev_priv->stdu_max_width); + max_height = min(dev_priv->texture_max_height, + dev_priv->stdu_max_height); + + if (size.width > max_width || size.height > max_height) { + DRM_ERROR("%ux%u\n, exeeds max surface size %ux%u", + size.width, size.height, + max_width, max_height); + return -EINVAL; + } } else { const struct svga3d_surface_desc *desc; |