From 45517f492b461df1e536c254c5f7e0fbb9295c53 Mon Sep 17 00:00:00 2001 From: Charmaine Lee Date: Mon, 6 Nov 2017 14:13:47 -0800 Subject: [PATCH] winsys/drm: check for CAPS2/SM41 support if VGPU10 is enabled No need to check for HW_CAPS2 or SM4_1 support if VGPU10 is not enabled or is explicitly disabled via the environment variable SVGA_VGPU10. Reviewed-by: Deepak Rawat --- src/gallium/winsys/svga/drm/vmw_screen_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c b/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c index 94414e75342..739e4ea131f 100644 --- a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c +++ b/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c @@ -1070,7 +1070,7 @@ vmw_ioctl_init(struct vmw_winsys_screen *vws) } } - if (vws->ioctl.have_drm_2_15) { + if (vws->ioctl.have_drm_2_15 && vws->base.have_vgpu10) { memset(&gp_arg, 0, sizeof(gp_arg)); gp_arg.param = DRM_VMW_PARAM_HW_CAPS2; ret = drmCommandWriteRead(vws->ioctl.drm_fd, DRM_VMW_GET_PARAM, -- 2.30.2