From: Deepak Rawat Date: Thu, 13 Dec 2018 19:36:31 +0000 (-0800) Subject: drm/vmwgfx: Also check for SVGA_CAP_DX before reading DX context support X-Git-Tag: v5.7-rc1~136^2~4^2~16 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef7c7b7497d6aba37a8932205411c872972dae5d;p=thirdparty%2Fkernel%2Flinux.git drm/vmwgfx: Also check for SVGA_CAP_DX before reading DX context support Virtual device consider SVGA_CAP_DX and SVGA3D_DEVCAP_DXCONTEXT independent of each other. Some of the commands in cmd_buf depends on SVGA_CAP_DX, so better to check for that as well. Signed-off-by: Deepak Rawat Reviewed-by: Thomas Hellström (VMware) Reviewed-by: Roland Scheidegger Signed-off-by: Roland Scheidegger --- diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 4f58364421ce7..f976dabe18de2 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c @@ -883,7 +883,7 @@ static int vmw_driver_load(struct drm_device *dev, unsigned long chipset) } } - if (dev_priv->has_mob) { + if (dev_priv->has_mob && (dev_priv->capabilities & SVGA_CAP_DX)) { spin_lock(&dev_priv->cap_lock); vmw_write(dev_priv, SVGA_REG_DEV_CAP, SVGA3D_DEVCAP_DXCONTEXT); dev_priv->has_dx = !!vmw_read(dev_priv, SVGA_REG_DEV_CAP);