From: Neha Bhende Date: Wed, 29 Mar 2017 17:35:12 +0000 (-0700) Subject: winsys/svga: Avoid cap2 code path for now X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dfab1289e84978f594972d3c47332f4bc803379d;p=mesa.git winsys/svga: Avoid cap2 code path for now CAP2 functionality is not yet part of vmwgfx. This is causing unnecessary dmesg error messages. Reviewed-by: Charmaine Lee --- diff --git a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c b/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c index f759f765e8b..99f8f42107e 100644 --- a/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c +++ b/src/gallium/winsys/svga/drm/vmw_screen_ioctl.c @@ -928,19 +928,11 @@ vmw_ioctl_init(struct vmw_winsys_screen *vws) if (vws->base.have_gb_objects && !drm_gb_capable) goto out_no_3d; - 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, - &gp_arg, sizeof(gp_arg)); - if (ret) - vws->base.have_intra_surface_copy = FALSE; - else { - if (gp_arg.value & (uint64_t) SVGA_CAP2_INTRA_SURFACE_COPY) - vws->base.have_intra_surface_copy = TRUE; - else - vws->base.have_intra_surface_copy = FALSE; - } - + /* + * CAP2 functionality is not yet in vmwgfx. Till then, avoiding + * this code path. + */ + vws->base.have_intra_surface_copy = FALSE; vws->base.have_vgpu10 = FALSE; if (vws->base.have_gb_objects) {