diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-04-29 14:27:50 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-04-29 14:27:50 +1000 |
| commit | d8ba5d60d59fd1db5b53c8a110c2f8321591a9d8 (patch) | |
| tree | e93fc174ca1511ef65823e9944fc8426a70af0fb /drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | |
| parent | 9a11d2e7e66b6b8764a2430686b8716637bf812e (diff) | |
| parent | 7851496a32319237456919575e5f4ba62f74cc7d (diff) | |
| download | linux-stable-d8ba5d60d59fd1db5b53c8a110c2f8321591a9d8.tar.gz linux-stable-d8ba5d60d59fd1db5b53c8a110c2f8321591a9d8.tar.bz2 linux-stable-d8ba5d60d59fd1db5b53c8a110c2f8321591a9d8.zip | |
Merge branch 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux into drm-fixes
three misc vmwgfx fixes
* 'drm-vmwgfx-fixes' of git://people.freedesktop.org/~syeh/repos_linux:
drm/vmwgfx: Fix order of operation
drm/vmwgfx: use vmw_cmd_dx_cid_check for query commands.
drm/vmwgfx: Enable SVGA_3D_CMD_DX_SET_PREDICATION
Diffstat (limited to 'drivers/gpu/drm/vmwgfx/vmwgfx_fb.c')
| -rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c index 3b1faf7862a5..679a4cb98ee3 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fb.c @@ -573,9 +573,9 @@ static int vmw_fb_set_par(struct fb_info *info) mode = old_mode; old_mode = NULL; } else if (!vmw_kms_validate_mode_vram(vmw_priv, - mode->hdisplay * - (var->bits_per_pixel + 7) / 8, - mode->vdisplay)) { + mode->hdisplay * + DIV_ROUND_UP(var->bits_per_pixel, 8), + mode->vdisplay)) { drm_mode_destroy(vmw_priv->dev, mode); return -EINVAL; } |