aboutsummaryrefslogtreecommitdiffstats
path: root/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0856-drm-amdgpu-added-api-for-stopping-psp-ring-v2.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0856-drm-amdgpu-added-api-for-stopping-psp-ring-v2.patch')
-rw-r--r--meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0856-drm-amdgpu-added-api-for-stopping-psp-ring-v2.patch152
1 files changed, 0 insertions, 152 deletions
diff --git a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0856-drm-amdgpu-added-api-for-stopping-psp-ring-v2.patch b/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0856-drm-amdgpu-added-api-for-stopping-psp-ring-v2.patch
deleted file mode 100644
index 41b6899b..00000000
--- a/meta-v1000/recipes-kernel/linux/linux-yocto-4.14.71/0856-drm-amdgpu-added-api-for-stopping-psp-ring-v2.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From e4b60ba7866bac498702e1a181e5b8fc64115bac Mon Sep 17 00:00:00 2001
-From: Evan Quan <evan.quan@amd.com>
-Date: Fri, 8 Sep 2017 13:04:52 +0800
-Subject: [PATCH 0856/4131] drm/amdgpu: added api for stopping psp ring (v2)
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-- v2: reuse the ring stop api in ring destory
-
-Change-Id: I53bcacd531d8df801a49acd0409c3f27b49fb1be
-Signed-off-by: Evan Quan <evan.quan@amd.com>
-Reviewed-by: Junwei Zhang <Jerry.Zhang@amd.com>
-Acked-by: Christian König <christian.koenig@amd.com>
-Reviewed-by: Huang Rui <ray.huang@amd.com>
----
- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 ++
- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 2 ++
- drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 15 ++++++++++++++-
- drivers/gpu/drm/amd/amdgpu/psp_v10_0.h | 2 ++
- drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 15 ++++++++++++++-
- drivers/gpu/drm/amd/amdgpu/psp_v3_1.h | 2 ++
- 6 files changed, 36 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
-index 7ad8fa8..fea1a86 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
-@@ -57,6 +57,7 @@ static int psp_sw_init(void *handle)
- psp->prep_cmd_buf = psp_v3_1_prep_cmd_buf;
- psp->ring_init = psp_v3_1_ring_init;
- psp->ring_create = psp_v3_1_ring_create;
-+ psp->ring_stop = psp_v3_1_ring_stop;
- psp->ring_destroy = psp_v3_1_ring_destroy;
- psp->cmd_submit = psp_v3_1_cmd_submit;
- psp->compare_sram_data = psp_v3_1_compare_sram_data;
-@@ -69,6 +70,7 @@ static int psp_sw_init(void *handle)
- psp->prep_cmd_buf = psp_v10_0_prep_cmd_buf;
- psp->ring_init = psp_v10_0_ring_init;
- psp->ring_create = psp_v10_0_ring_create;
-+ psp->ring_stop = psp_v10_0_ring_stop;
- psp->ring_destroy = psp_v10_0_ring_destroy;
- psp->cmd_submit = psp_v10_0_cmd_submit;
- psp->compare_sram_data = psp_v10_0_compare_sram_data;
-diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
-index 538fa9d..e79795b 100644
---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
-+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
-@@ -66,6 +66,8 @@ struct psp_context
- struct psp_gfx_cmd_resp *cmd);
- int (*ring_init)(struct psp_context *psp, enum psp_ring_type ring_type);
- int (*ring_create)(struct psp_context *psp, enum psp_ring_type ring_type);
-+ int (*ring_stop)(struct psp_context *psp,
-+ enum psp_ring_type ring_type);
- 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,
-diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
-index 8b30c2a..bbd783d 100644
---- a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
-+++ b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
-@@ -210,7 +210,7 @@ int psp_v10_0_ring_create(struct psp_context *psp, enum psp_ring_type ring_type)
- return ret;
- }
-
--int psp_v10_0_ring_destroy(struct psp_context *psp, enum psp_ring_type ring_type)
-+int psp_v10_0_ring_stop(struct psp_context *psp, enum psp_ring_type ring_type)
- {
- int ret = 0;
- struct psp_ring *ring;
-@@ -230,6 +230,19 @@ int psp_v10_0_ring_destroy(struct psp_context *psp, enum psp_ring_type ring_type
- ret = psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0, mmMP0_SMN_C2PMSG_64),
- 0x80000000, 0x80000000, false);
-
-+ return ret;
-+}
-+
-+int psp_v10_0_ring_destroy(struct psp_context *psp, enum psp_ring_type ring_type)
-+{
-+ int ret = 0;
-+ struct psp_ring *ring = &psp->km_ring;
-+ struct amdgpu_device *adev = psp->adev;
-+
-+ ret = psp_v10_0_ring_stop(psp, ring_type);
-+ if (ret)
-+ DRM_ERROR("Fail to stop psp ring\n");
-+
- amdgpu_bo_free_kernel(&adev->firmware.rbuf,
- &ring->ring_mem_mc_addr,
- (void **)&ring->ring_mem);
-diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.h b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.h
-index e76cde2..3af3ad1 100644
---- a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.h
-+++ b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.h
-@@ -34,6 +34,8 @@ extern int psp_v10_0_ring_init(struct psp_context *psp,
- enum psp_ring_type ring_type);
- extern int psp_v10_0_ring_create(struct psp_context *psp,
- enum psp_ring_type ring_type);
-+extern int psp_v10_0_ring_stop(struct psp_context *psp,
-+ enum psp_ring_type ring_type);
- extern int psp_v10_0_ring_destroy(struct psp_context *psp,
- enum psp_ring_type ring_type);
- extern int psp_v10_0_cmd_submit(struct psp_context *psp,
-diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
-index 2a535a4..bcbe30d 100644
---- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
-+++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
-@@ -319,7 +319,7 @@ int psp_v3_1_ring_create(struct psp_context *psp, enum psp_ring_type ring_type)
- return ret;
- }
-
--int psp_v3_1_ring_destroy(struct psp_context *psp, enum psp_ring_type ring_type)
-+int psp_v3_1_ring_stop(struct psp_context *psp, enum psp_ring_type ring_type)
- {
- int ret = 0;
- struct psp_ring *ring;
-@@ -339,6 +339,19 @@ int psp_v3_1_ring_destroy(struct psp_context *psp, enum psp_ring_type ring_type)
- ret = psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0, mmMP0_SMN_C2PMSG_64),
- 0x80000000, 0x80000000, false);
-
-+ return ret;
-+}
-+
-+int psp_v3_1_ring_destroy(struct psp_context *psp, enum psp_ring_type ring_type)
-+{
-+ int ret = 0;
-+ struct psp_ring *ring = &psp->km_ring;
-+ struct amdgpu_device *adev = psp->adev;
-+
-+ ret = psp_v3_1_ring_stop(psp, ring_type);
-+ if (ret)
-+ DRM_ERROR("Fail to stop psp ring\n");
-+
- amdgpu_bo_free_kernel(&adev->firmware.rbuf,
- &ring->ring_mem_mc_addr,
- (void **)&ring->ring_mem);
-diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.h b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.h
-index 9dcd0b2..5af2231 100644
---- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.h
-+++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.h
-@@ -41,6 +41,8 @@ extern int psp_v3_1_ring_init(struct psp_context *psp,
- enum psp_ring_type ring_type);
- extern int psp_v3_1_ring_create(struct psp_context *psp,
- enum psp_ring_type ring_type);
-+extern int psp_v3_1_ring_stop(struct psp_context *psp,
-+ enum psp_ring_type ring_type);
- extern int psp_v3_1_ring_destroy(struct psp_context *psp,
- enum psp_ring_type ring_type);
- extern int psp_v3_1_cmd_submit(struct psp_context *psp,
---
-2.7.4
-