drm/amdgpu: add amdgpu_set_ib_value helper (v2)

And use it in UVD/VCE command patching.

v2: squash in Christian's fix

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

3 files changed, 15 insertions, 8 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index f2f9b64d0141..4a6e87857875 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1250,11 +1250,19 @@ struct amdgpu_job {
 #define to_amdgpu_job(sched_job)                \
                 container_of((sched_job), struct amdgpu_job, base)
 
-static inline u32 amdgpu_get_ib_value(struct amdgpu_cs_parser *p, uint32_t ib_idx, int idx)
+static inline u32 amdgpu_get_ib_value(struct amdgpu_cs_parser *p,
+                                      uint32_t ib_idx, int idx)
 {
         return p->ibs[ib_idx].ptr[idx];
 }
 
+static inline void amdgpu_set_ib_value(struct amdgpu_cs_parser *p,
+                                       uint32_t ib_idx, int idx,
+                                       uint32_t value)
+{
+        p->ibs[ib_idx].ptr[idx] = value;
+}
+
 /*
  * Writeback
  */
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index 72193f1c8e99..676ef699b6ad 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -616,7 +616,6 @@ static int amdgpu_uvd_cs_pass2(struct amdgpu_uvd_cs_ctx *ctx)
 {
         struct amdgpu_bo_va_mapping *mapping;
         struct amdgpu_bo *bo;
-        struct amdgpu_ib *ib;
         uint32_t cmd, lo, hi;
         uint64_t start, end;
         uint64_t addr;
@@ -638,9 +637,10 @@ static int amdgpu_uvd_cs_pass2(struct amdgpu_uvd_cs_ctx *ctx)
         addr -= ((uint64_t)mapping->it.start) * AMDGPU_GPU_PAGE_SIZE;
         start += addr;
 
-        ib = &ctx->parser->ibs[ctx->ib_idx];
-        ib->ptr[ctx->data0] = start & 0xFFFFFFFF;
-        ib->ptr[ctx->data1] = start >> 32;
+        amdgpu_set_ib_value(ctx->parser, ctx->ib_idx, ctx->data0,
+                            lower_32_bits(start));
+        amdgpu_set_ib_value(ctx->parser, ctx->ib_idx, ctx->data1,
+                            upper_32_bits(start));
 
         cmd = amdgpu_get_ib_value(ctx->parser, ctx->ib_idx, ctx->idx) >> 1;
         if (cmd < 0x4) {
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
index c90517f61210..43aad45969a7 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
@@ -519,7 +519,6 @@ static int amdgpu_vce_cs_reloc(struct amdgpu_cs_parser *p, uint32_t ib_idx,
                                int lo, int hi, unsigned size, uint32_t index)
 {
         struct amdgpu_bo_va_mapping *mapping;
-        struct amdgpu_ib *ib = &p->ibs[ib_idx];
         struct amdgpu_bo *bo;
         uint64_t addr;
 
@@ -548,8 +547,8 @@ static int amdgpu_vce_cs_reloc(struct amdgpu_cs_parser *p, uint32_t ib_idx,
         addr += amdgpu_bo_gpu_offset(bo);
         addr -= ((uint64_t)size) * ((uint64_t)index);
 
-        ib->ptr[lo] = addr & 0xFFFFFFFF;
-        ib->ptr[hi] = addr >> 32;
+        amdgpu_set_ib_value(p, ib_idx, lo, lower_32_bits(addr));
+        amdgpu_set_ib_value(p, ib_idx, hi, upper_32_bits(addr));
 
         return 0;
 }