Commit 4fb9326b authored by Zack Rusin's avatar Zack Rusin
Browse files

drm/vmwgfx: support 64 UAVs 



If the host supports SVGA3D_DEVCAP_GL43, we can handle 64 instead of
just 8 UAVs.
Based on a patch from Roland Scheidegger <sroland@vmware.com>.

Signed-off-by: default avatarRoland Scheidegger <sroland@vmware.com>
Signed-off-by: default avatarZack Rusin <zackr@vmware.com>
Reviewed-by: default avatarMartin Krastev <krastevm@vmware.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211206172620.3139754-9-zack@kde.org
parent 853369df

drivers/gpu/drm/vmwgfx/vmwgfx_binding.c

+2 −2
Original line number Diff line number Diff line
@@ -1070,7 +1070,7 @@ static int vmw_emit_set_uav(struct vmw_ctx_binding_state *cbs) 
	size_t cmd_size, view_id_size;

	const struct vmw_resource *ctx = vmw_cbs_context(cbs);



	vmw_collect_view_ids(cbs, loc, SVGA3D_MAX_UAVIEWS);

	vmw_collect_view_ids(cbs, loc, vmw_max_num_uavs(cbs->dev_priv));

	view_id_size = cbs->bind_cmd_count*sizeof(uint32);

	cmd_size = sizeof(*cmd) + view_id_size;

	cmd = VMW_CMD_CTX_RESERVE(ctx->dev_priv, cmd_size, ctx->id);
@@ -1100,7 +1100,7 @@ static int vmw_emit_set_cs_uav(struct vmw_ctx_binding_state *cbs) 
	size_t cmd_size, view_id_size;

	const struct vmw_resource *ctx = vmw_cbs_context(cbs);



	vmw_collect_view_ids(cbs, loc, SVGA3D_MAX_UAVIEWS);

	vmw_collect_view_ids(cbs, loc, vmw_max_num_uavs(cbs->dev_priv));

	view_id_size = cbs->bind_cmd_count*sizeof(uint32);

	cmd_size = sizeof(*cmd) + view_id_size;

	cmd = VMW_CMD_CTX_RESERVE(ctx->dev_priv, cmd_size, ctx->id);

drivers/gpu/drm/vmwgfx/vmwgfx_binding.h

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ struct vmw_dx_shader_bindings { 
 * @splice_index: The device splice index set by user-space.

 */

struct vmw_ctx_bindinfo_uav {

	struct vmw_ctx_bindinfo_view views[SVGA3D_MAX_UAVIEWS];

	struct vmw_ctx_bindinfo_view views[SVGA3D_DX11_1_MAX_UAVIEWS];

	uint32 index;

};

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+5 −1
Original line number Diff line number Diff line
@@ -364,6 +364,7 @@ static void vmw_print_sm_type(struct vmw_private *dev_priv) 
		[VMW_SM_4] = "SM4",

		[VMW_SM_4_1] = "SM4_1",

		[VMW_SM_5] = "SM_5",

		[VMW_SM_5_1X] = "SM_5_1X",

		[VMW_SM_MAX] = "Invalid"

	};

	BUILD_BUG_ON(ARRAY_SIZE(names) != (VMW_SM_MAX + 1));
@@ -1083,8 +1084,11 @@ static int vmw_driver_load(struct vmw_private *dev_priv, u32 pci_id) 
			dev_priv->sm_type = VMW_SM_4_1;

		if (has_sm4_1_context(dev_priv) &&

				(dev_priv->capabilities2 & SVGA_CAP2_DX3)) {

			if (vmw_devcap_get(dev_priv, SVGA3D_DEVCAP_SM5))

			if (vmw_devcap_get(dev_priv, SVGA3D_DEVCAP_SM5)) {

				dev_priv->sm_type = VMW_SM_5;

				if (vmw_devcap_get(dev_priv, SVGA3D_DEVCAP_GL43))

					dev_priv->sm_type = VMW_SM_5_1X;

			}

		}

	}

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+20 −0
Original line number Diff line number Diff line
@@ -488,6 +488,7 @@ enum { 
 * @VMW_SM_4: Context support upto SM4.

 * @VMW_SM_4_1: Context support upto SM4_1.

 * @VMW_SM_5: Context support up to SM5.

 * @VMW_SM_5_1X: Adds support for sm5_1 and gl43 extensions.

 * @VMW_SM_MAX: Should be the last.

 */

enum vmw_sm_type {
@@ -495,6 +496,7 @@ enum vmw_sm_type { 
	VMW_SM_4,

	VMW_SM_4_1,

	VMW_SM_5,

	VMW_SM_5_1X,

	VMW_SM_MAX

};
@@ -755,6 +757,24 @@ static inline bool has_sm5_context(const struct vmw_private *dev_priv) 
	return (dev_priv->sm_type >= VMW_SM_5);

}



/**

 * has_gl43_context - Does the device support GL43 context.

 * @dev_priv: Device private.

 *

 * Return: Bool value if device support SM5 context or not.

 */

static inline bool has_gl43_context(const struct vmw_private *dev_priv)

{

	return (dev_priv->sm_type >= VMW_SM_5_1X);

}





static inline u32 vmw_max_num_uavs(struct vmw_private *dev_priv)

{

	return (has_gl43_context(dev_priv) ?

			SVGA3D_DX11_1_MAX_UAVIEWS : SVGA3D_MAX_UAVIEWS);

}



extern void vmw_svga_enable(struct vmw_private *dev_priv);

extern void vmw_svga_disable(struct vmw_private *dev_priv);

drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c

+2 −2
Original line number Diff line number Diff line
@@ -2916,7 +2916,7 @@ static int vmw_cmd_set_uav(struct vmw_private *dev_priv, 
	if (!has_sm5_context(dev_priv))

		return -EINVAL;



	if (num_uav > SVGA3D_MAX_UAVIEWS) {

	if (num_uav > vmw_max_num_uavs(dev_priv)) {

		VMW_DEBUG_USER("Invalid UAV binding.\n");

		return -EINVAL;

	}
@@ -2948,7 +2948,7 @@ static int vmw_cmd_set_cs_uav(struct vmw_private *dev_priv, 
	if (!has_sm5_context(dev_priv))

		return -EINVAL;



	if (num_uav > SVGA3D_MAX_UAVIEWS) {

	if (num_uav > vmw_max_num_uavs(dev_priv)) {

		VMW_DEBUG_USER("Invalid UAV binding.\n");

		return -EINVAL;

	}