drm/amdgpu/gfx10: fix mqd backup/restore for gfx rings (v2)

1. no need to allocate an extra member for 'mqd_backup' array
2. backup/restore mqd to/from the correct 'mqd_backup' array slot

v2: warning fix (Alex)

Signed-off-by: Xiaojie Yuan <xiaojie.yuan@amd.com>
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
index c9d1fad..f063a5c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c
@@ -455,7 +455,7 @@ void amdgpu_gfx_mqd_sw_fini(struct amdgpu_device *adev)
 
        ring = &adev->gfx.kiq.ring;
        if (adev->asic_type >= CHIP_NAVI10 && amdgpu_async_gfx_ring)
-               kfree(adev->gfx.me.mqd_backup[AMDGPU_MAX_GFX_RINGS]);
+               kfree(adev->gfx.me.mqd_backup[AMDGPU_MAX_GFX_RINGS - 1]);
        kfree(adev->gfx.mec.mqd_backup[AMDGPU_MAX_COMPUTE_RINGS]);
        amdgpu_bo_free_kernel(&ring->mqd_obj,
                              &ring->mqd_gpu_addr,

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
index a74ecd4..0ae0a27 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h
@@ -225,7 +225,7 @@ struct amdgpu_me {
        uint32_t                        num_me;
        uint32_t                        num_pipe_per_me;
        uint32_t                        num_queue_per_pipe;
-       void                            *mqd_backup[AMDGPU_MAX_GFX_RINGS + 1];
+       void                            *mqd_backup[AMDGPU_MAX_GFX_RINGS];
 
        /* These are the resources for which amdgpu takes ownership */
        DECLARE_BITMAP(queue_bitmap, AMDGPU_MAX_GFX_QUEUES);

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
index a93dd3d..b128012 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c
@@ -3114,6 +3114,7 @@ static int gfx_v10_0_gfx_init_queue(struct amdgpu_ring *ring)
 {
        struct amdgpu_device *adev = ring->adev;
        struct v10_gfx_mqd *mqd = ring->mqd_ptr;
+       int mqd_idx = ring - &adev->gfx.gfx_ring[0];
 
        if (!adev->in_gpu_reset && !adev->in_suspend) {
                memset((void *)mqd, 0, sizeof(*mqd));
@@ -3125,12 +3126,12 @@ static int gfx_v10_0_gfx_init_queue(struct amdgpu_ring *ring)
 #endif
                nv_grbm_select(adev, 0, 0, 0, 0);
                mutex_unlock(&adev->srbm_mutex);
-               if (adev->gfx.me.mqd_backup[AMDGPU_MAX_GFX_RINGS])
-                       memcpy(adev->gfx.me.mqd_backup[AMDGPU_MAX_GFX_RINGS], mqd, sizeof(*mqd));
+               if (adev->gfx.me.mqd_backup[mqd_idx])
+                       memcpy(adev->gfx.me.mqd_backup[mqd_idx], mqd, sizeof(*mqd));
        } else if (adev->in_gpu_reset) {
                /* reset mqd with the backup copy */
-               if (adev->gfx.me.mqd_backup[AMDGPU_MAX_GFX_RINGS])
-                       memcpy(mqd, adev->gfx.me.mqd_backup[AMDGPU_MAX_GFX_RINGS], sizeof(*mqd));
+               if (adev->gfx.me.mqd_backup[mqd_idx])
+                       memcpy(mqd, adev->gfx.me.mqd_backup[mqd_idx], sizeof(*mqd));
                /* reset the ring */
                ring->wptr = 0;
                adev->wb.wb[ring->wptr_offs] = 0;