drm/vmwgfx: Rename stream output target binding tracker struct

Previous name vmw_ctx_bindinfo_so is misleading because it actually
represent so target and stream output is a new resource type that needs
tracking for SM5 capable device. Also rename binding type enum and
internal functions to reflect these belongs to so targets.

Signed-off-by: Deepak Rawat <drawat.floss@gmail.com>
Reviewed-by: Thomas Hellström (VMware) <thomas_os@shipmail.org>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Signed-off-by: Roland Scheidegger <sroland@vmware.com>

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_binding.c b/drivers/gpu/drm/vmwgfx/vmwgfx_binding.c
index f0a576698266b5e5ed1cab7404aa30ada023bad9..f923b3c7c152d5f91364706c502c9645ffafd9b0 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_binding.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_binding.c
@@ -57,7 +57,7 @@
 
 #define VMW_BINDING_RT_BIT     0
 #define VMW_BINDING_PS_BIT     1
-#define VMW_BINDING_SO_BIT     2
+#define VMW_BINDING_SO_T_BIT   2
 #define VMW_BINDING_VB_BIT     3
 #define VMW_BINDING_UAV_BIT    4
 #define VMW_BINDING_CS_UAV_BIT 5
@@ -98,7 +98,7 @@ struct vmw_ctx_binding_state {
        struct vmw_ctx_bindinfo_view render_targets[SVGA3D_RT_MAX];
        struct vmw_ctx_bindinfo_tex texture_units[SVGA3D_NUM_TEXTURE_UNITS];
        struct vmw_ctx_bindinfo_view ds_view;
-       struct vmw_ctx_bindinfo_so so_targets[SVGA3D_DX_MAX_SOTARGETS];
+       struct vmw_ctx_bindinfo_so_target so_targets[SVGA3D_DX_MAX_SOTARGETS];
        struct vmw_ctx_bindinfo_vb vertex_buffers[SVGA3D_DX_MAX_VERTEXBUFFERS];
        struct vmw_ctx_bindinfo_ib index_buffer;
        struct vmw_dx_shader_bindings per_shader[SVGA3D_NUM_SHADERTYPE];
@@ -119,7 +119,7 @@ static int vmw_binding_scrub_texture(struct vmw_ctx_bindinfo *bi, bool rebind);
 static int vmw_binding_scrub_cb(struct vmw_ctx_bindinfo *bi, bool rebind);
 static int vmw_binding_scrub_dx_rt(struct vmw_ctx_bindinfo *bi, bool rebind);
 static int vmw_binding_scrub_sr(struct vmw_ctx_bindinfo *bi, bool rebind);
-static int vmw_binding_scrub_so(struct vmw_ctx_bindinfo *bi, bool rebind);
+static int vmw_binding_scrub_so_target(struct vmw_ctx_bindinfo *bi, bool rebind);
 static int vmw_binding_emit_dirty(struct vmw_ctx_binding_state *cbs);
 static int vmw_binding_scrub_dx_shader(struct vmw_ctx_bindinfo *bi,
                                       bool rebind);
@@ -187,7 +187,7 @@ static const size_t vmw_binding_sr_offsets[] = {
        offsetof(struct vmw_ctx_binding_state, per_shader[4].shader_res),
        offsetof(struct vmw_ctx_binding_state, per_shader[5].shader_res),
 };
-static const size_t vmw_binding_so_offsets[] = {
+static const size_t vmw_binding_so_target_offsets[] = {
        offsetof(struct vmw_ctx_binding_state, so_targets),
 };
 static const size_t vmw_binding_vb_offsets[] = {
@@ -236,10 +236,10 @@ static const struct vmw_binding_info vmw_binding_infos[] = {
                .size = sizeof(struct vmw_ctx_bindinfo_view),
                .offsets = vmw_binding_dx_ds_offsets,
                .scrub_func = vmw_binding_scrub_dx_rt},
-       [vmw_ctx_binding_so] = {
-               .size = sizeof(struct vmw_ctx_bindinfo_so),
-               .offsets = vmw_binding_so_offsets,
-               .scrub_func = vmw_binding_scrub_so},
+       [vmw_ctx_binding_so_target] = {
+               .size = sizeof(struct vmw_ctx_bindinfo_so_target),
+               .offsets = vmw_binding_so_target_offsets,
+               .scrub_func = vmw_binding_scrub_so_target},
        [vmw_ctx_binding_vb] = {
                .size = sizeof(struct vmw_ctx_bindinfo_vb),
                .offsets = vmw_binding_vb_offsets,
@@ -874,8 +874,8 @@ static void vmw_collect_so_targets(struct vmw_ctx_binding_state *cbs,
                                   const struct vmw_ctx_bindinfo *bi,
                                   u32 max_num)
 {
-       const struct vmw_ctx_bindinfo_so *biso =
-               container_of(bi, struct vmw_ctx_bindinfo_so, bi);
+       const struct vmw_ctx_bindinfo_so_target *biso =
+               container_of(bi, struct vmw_ctx_bindinfo_so_target, bi);
        unsigned long i;
        SVGA3dSoTarget *so_buffer = (SVGA3dSoTarget *) cbs->bind_cmd_buffer;
 
@@ -900,11 +900,11 @@ static void vmw_collect_so_targets(struct vmw_ctx_binding_state *cbs,
 }
 
 /**
- * vmw_binding_emit_set_so - Issue delayed streamout binding commands
+ * vmw_emit_set_so_target - Issue delayed streamout binding commands
  *
  * @cbs: Pointer to the context's struct vmw_ctx_binding_state
  */
-static int vmw_emit_set_so(struct vmw_ctx_binding_state *cbs)
+static int vmw_emit_set_so_target(struct vmw_ctx_binding_state *cbs)
 {
        const struct vmw_ctx_bindinfo *loc = &cbs->so_targets[0].bi;
        struct {
@@ -1136,8 +1136,8 @@ static int vmw_binding_emit_dirty(struct vmw_ctx_binding_state *cbs)
                case VMW_BINDING_PS_BIT:
                        ret = vmw_binding_emit_dirty_ps(cbs);
                        break;
-               case VMW_BINDING_SO_BIT:
-                       ret = vmw_emit_set_so(cbs);
+               case VMW_BINDING_SO_T_BIT:
+                       ret = vmw_emit_set_so_target(cbs);
                        break;
                case VMW_BINDING_VB_BIT:
                        ret = vmw_emit_set_vb(cbs);
@@ -1201,18 +1201,18 @@ static int vmw_binding_scrub_dx_rt(struct vmw_ctx_bindinfo *bi, bool rebind)
 }
 
 /**
- * vmw_binding_scrub_so - Schedule a dx streamoutput buffer binding
+ * vmw_binding_scrub_so_target - Schedule a dx streamoutput buffer binding
  * scrub from a context
  *
  * @bi: single binding information.
  * @rebind: Whether to issue a bind instead of scrub command.
  */
-static int vmw_binding_scrub_so(struct vmw_ctx_bindinfo *bi, bool rebind)
+static int vmw_binding_scrub_so_target(struct vmw_ctx_bindinfo *bi, bool rebind)
 {
        struct vmw_ctx_binding_state *cbs =
                vmw_context_binding_state(bi->ctx);
 
-       __set_bit(VMW_BINDING_SO_BIT, &cbs->dirty);
+       __set_bit(VMW_BINDING_SO_T_BIT, &cbs->dirty);
 
        return 0;
 }
@@ -1387,7 +1387,7 @@ u32 vmw_binding_dirtying(enum vmw_ctx_binding_type binding_type)
                [vmw_ctx_binding_rt] = VMW_RES_DIRTY_SET,
                [vmw_ctx_binding_dx_rt] = VMW_RES_DIRTY_SET,
                [vmw_ctx_binding_ds] = VMW_RES_DIRTY_SET,
-               [vmw_ctx_binding_so] = VMW_RES_DIRTY_SET,
+               [vmw_ctx_binding_so_target] = VMW_RES_DIRTY_SET,
                [vmw_ctx_binding_uav] = VMW_RES_DIRTY_SET,
                [vmw_ctx_binding_cs_uav] = VMW_RES_DIRTY_SET,
        };

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_binding.h b/drivers/gpu/drm/vmwgfx/vmwgfx_binding.h
index da67cbc9cd73291b48d952ac0ae86ce8aa4a2567..8d5f87aad490dfdd27adba2cdff9be6352cbe812 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_binding.h
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_binding.h
@@ -50,7 +50,7 @@ enum vmw_ctx_binding_type {
        vmw_ctx_binding_dx_rt,
        vmw_ctx_binding_sr,
        vmw_ctx_binding_ds,
-       vmw_ctx_binding_so,
+       vmw_ctx_binding_so_target,
        vmw_ctx_binding_vb,
        vmw_ctx_binding_ib,
        vmw_ctx_binding_uav,
@@ -132,14 +132,14 @@ struct vmw_ctx_bindinfo_view {
 };
 
 /**
- * struct vmw_ctx_bindinfo_so - StreamOutput binding metadata
+ * struct vmw_ctx_bindinfo_so_target - StreamOutput binding metadata
  *
  * @bi: struct vmw_ctx_bindinfo we derive from.
  * @offset: Device data used to reconstruct binding command.
  * @size: Device data used to reconstruct binding command.
  * @slot: Device data used to reconstruct binding command.
  */
-struct vmw_ctx_bindinfo_so {
+struct vmw_ctx_bindinfo_so_target {
        struct vmw_ctx_bindinfo bi;
        uint32 offset;
        uint32 size;

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
index ecab6cbbc8d329fdda456484043432bd2ed1feb0..d49169c68fbad82fcab448ba7cc41f00108966a0 100644 (file)
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c
@@ -2479,7 +2479,7 @@ static int vmw_cmd_dx_set_so_targets(struct vmw_private *dev_priv,
                                     SVGA3dCmdHeader *header)
 {
        struct vmw_ctx_validation_info *ctx_node = VMW_GET_CTX_NODE(sw_context);
-       struct vmw_ctx_bindinfo_so binding;
+       struct vmw_ctx_bindinfo_so_target binding;
        struct vmw_resource *res;
        struct {
                SVGA3dCmdHeader header;
@@ -2509,7 +2509,7 @@ static int vmw_cmd_dx_set_so_targets(struct vmw_private *dev_priv,
 
                binding.bi.ctx = ctx_node->ctx;
                binding.bi.res = res;
-               binding.bi.bt = vmw_ctx_binding_so,
+               binding.bi.bt = vmw_ctx_binding_so_target,
                binding.offset = cmd->targets[i].offset;
                binding.size = cmd->targets[i].sizeInBytes;
                binding.slot = i;