diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3466-drm-amdgpu-remove-redundant-argument-for-psp_funcs-c.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3466-drm-amdgpu-remove-redundant-argument-for-psp_funcs-c.patch | 105 |
1 files changed, 105 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3466-drm-amdgpu-remove-redundant-argument-for-psp_funcs-c.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3466-drm-amdgpu-remove-redundant-argument-for-psp_funcs-c.patch new file mode 100644 index 00000000..8f162693 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3466-drm-amdgpu-remove-redundant-argument-for-psp_funcs-c.patch @@ -0,0 +1,105 @@ +From a5267ed2f1c8a92ae8543a500c833dff53c4d5a7 Mon Sep 17 00:00:00 2001 +From: Xiaojie Yuan <xiaojie.yuan@amd.com> +Date: Fri, 16 Aug 2019 18:00:54 +0800 +Subject: [PATCH 3466/4256] drm/amdgpu: remove redundant argument for + psp_funcs::cmd_submit callback + +Signed-off-by: Xiaojie Yuan <xiaojie.yuan@amd.com> +Reviewed-by: Evan Quan <evan.quan@amd.com> +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 3 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 5 ++--- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 1 - + 6 files changed, 3 insertions(+), 9 deletions(-) + +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +index 72c269078564..2d5cf18f2241 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +@@ -145,8 +145,7 @@ psp_cmd_submit_buf(struct psp_context *psp, + memcpy(psp->cmd_buf_mem, cmd, sizeof(struct psp_gfx_cmd_resp)); + + index = atomic_inc_return(&psp->fence_value); +- ret = psp_cmd_submit(psp, ucode, psp->cmd_buf_mc_addr, +- fence_mc_addr, index); ++ ret = psp_cmd_submit(psp, psp->cmd_buf_mc_addr, fence_mc_addr, index); + if (ret) { + atomic_dec(&psp->fence_value); + mutex_unlock(&psp->mutex); +diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +index 0029fa2b2ff9..b73d4aa28fba 100644 +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +@@ -90,7 +90,6 @@ struct psp_funcs + int (*ring_destroy)(struct psp_context *psp, + enum psp_ring_type ring_type); + int (*cmd_submit)(struct psp_context *psp, +- struct amdgpu_firmware_info *ucode, + uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr, + int index); + bool (*compare_sram_data)(struct psp_context *psp, +@@ -223,8 +222,8 @@ struct amdgpu_psp_funcs { + #define psp_ring_create(psp, type) (psp)->funcs->ring_create((psp), (type)) + #define psp_ring_stop(psp, type) (psp)->funcs->ring_stop((psp), (type)) + #define psp_ring_destroy(psp, type) ((psp)->funcs->ring_destroy((psp), (type))) +-#define psp_cmd_submit(psp, ucode, cmd_mc, fence_mc, index) \ +- (psp)->funcs->cmd_submit((psp), (ucode), (cmd_mc), (fence_mc), (index)) ++#define psp_cmd_submit(psp, cmd_mc, fence_mc, index) \ ++ (psp)->funcs->cmd_submit((psp), (cmd_mc), (fence_mc), (index)) + #define psp_compare_sram_data(psp, ucode, type) \ + (psp)->funcs->compare_sram_data((psp), (ucode), (type)) + #define psp_init_microcode(psp) \ +diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +index 70a5a9eaf037..216af0af255a 100644 +--- a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c +@@ -190,7 +190,6 @@ static int psp_v10_0_ring_destroy(struct psp_context *psp, + } + + static int psp_v10_0_cmd_submit(struct psp_context *psp, +- struct amdgpu_firmware_info *ucode, + uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr, + int index) + { +diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +index 4954b1d7d3d0..247a7aebb273 100644 +--- a/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/psp_v11_0.c +@@ -506,7 +506,6 @@ static int psp_v11_0_ring_destroy(struct psp_context *psp, + } + + static int psp_v11_0_cmd_submit(struct psp_context *psp, +- struct amdgpu_firmware_info *ucode, + uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr, + int index) + { +diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c +index f37b8af4b986..fd55baa6ea31 100644 +--- a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c +@@ -334,7 +334,6 @@ static int psp_v12_0_ring_destroy(struct psp_context *psp, + } + + static int psp_v12_0_cmd_submit(struct psp_context *psp, +- struct amdgpu_firmware_info *ucode, + uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr, + int index) + { +diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +index ba327581f301..4a02058682f5 100644 +--- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c ++++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +@@ -409,7 +409,6 @@ static int psp_v3_1_ring_destroy(struct psp_context *psp, + } + + static int psp_v3_1_cmd_submit(struct psp_context *psp, +- struct amdgpu_firmware_info *ucode, + uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr, + int index) + { +-- +2.17.1 + |