drm/amdkfd: Shift sdma_engine_id and sdma_queue_id in mqd

FW of some new ASICs requires sdma mqd size to be not more than
128 dwords. Repurpose the last 2 reserved fields of sdma mqd for
driver internal use, so the total mqd size is no bigger than 128
dwords

Signed-off-by: Oak Zeng <ozeng@amd.com>
Reviewed-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/include/cik_structs.h b/drivers/gpu/drm/amd/include/cik_structs.h
index 749eab94e335d772eab2818d0e49333bca8d0a80..699e658c3cec5425abca0b6b15adaa9f96e03d70 100644 (file)
--- a/drivers/gpu/drm/amd/include/cik_structs.h
+++ b/drivers/gpu/drm/amd/include/cik_structs.h
@@ -282,8 +282,7 @@ struct cik_sdma_rlc_registers {
        uint32_t reserved_123;
        uint32_t reserved_124;
        uint32_t reserved_125;
-       uint32_t reserved_126;
-       uint32_t reserved_127;
+       /* reserved_126,127: repurposed for driver-internal use */
        uint32_t sdma_engine_id;
        uint32_t sdma_queue_id;
 };

diff --git a/drivers/gpu/drm/amd/include/v9_structs.h b/drivers/gpu/drm/amd/include/v9_structs.h
index ceaf4932258dacb355e7b6032ef81047be6ff4a3..8b383dbe1cda57793eaf27534a521fdd5f973844 100644 (file)
--- a/drivers/gpu/drm/amd/include/v9_structs.h
+++ b/drivers/gpu/drm/amd/include/v9_structs.h
@@ -151,8 +151,7 @@ struct v9_sdma_mqd {
        uint32_t reserved_123;
        uint32_t reserved_124;
        uint32_t reserved_125;
-       uint32_t reserved_126;
-       uint32_t reserved_127;
+       /* reserved_126,127: repurposed for driver-internal use */
        uint32_t sdma_engine_id;
        uint32_t sdma_queue_id;
 };

diff --git a/drivers/gpu/drm/amd/include/vi_structs.h b/drivers/gpu/drm/amd/include/vi_structs.h
index 717fbae1d362011bfee7185fffefc01cba3fcf71..c17613287cd0c67b01374d6b3a55f65f1a36426c 100644 (file)
--- a/drivers/gpu/drm/amd/include/vi_structs.h
+++ b/drivers/gpu/drm/amd/include/vi_structs.h
@@ -151,8 +151,7 @@ struct vi_sdma_mqd {
        uint32_t reserved_123;
        uint32_t reserved_124;
        uint32_t reserved_125;
-       uint32_t reserved_126;
-       uint32_t reserved_127;
+       /* reserved_126,127: repurposed for driver-internal use */
        uint32_t sdma_engine_id;
        uint32_t sdma_queue_id;
 };