Revert "drm/amdgpu/vcn: add shared memory restore after wake up from sleep."
Subsystems (2)
PATCH 1/2 Revert "drm/amdgpu/vcn: add shared memory restore after wake up from sleep."
This reverts commit 41fd4db3eca29d10222f164cc1d56f60e3da97b8. To merge vcn firmware shared memory bo into vcn vcpu bo.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 28 +--------------------------- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 - 2 files changed, 1 insertion(+), 28 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +1 -27
@@ -58,7 +58,7 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work);int amdgpu_vcn_sw_init (struct amdgpu_device *adev) { -unsigned long bo_size, fw_shared_bo_size; +unsigned long bo_size;const char *fw_name;const struct common_firmware_header *hdr;unsigned char fw_check;
@@ -198,9 +198,6 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)dev_err (adev->dev,"VCN %d (%d) failed to allocate firmware shared bo\n" , i, r);return r; } - - fw_shared_bo_size =amdgpu_bo_size (adev->vcn.inst[i].fw_shared_bo); - adev->vcn.inst[i].saved_shm_bo =kvmalloc (fw_shared_bo_size,GFP_KERNEL ); }return 0 ;
@@ -216,7 +213,6 @@ int amdgpu_vcn_sw_fini(struct amdgpu_device *adev)if (adev->vcn.harvest_config & (1 << j))continue ; -kvfree (adev->vcn.inst[j].saved_shm_bo);amdgpu_bo_free_kernel (&adev->vcn.inst[j].fw_shared_bo, &adev->vcn.inst[j].fw_shared_gpu_addr, (void **)&adev->vcn.inst[j].fw_shared_cpu_addr);
@@ -266,17 +262,6 @@ int amdgpu_vcn_suspend(struct amdgpu_device *adev)return -ENOMEM ;memcpy_fromio (adev->vcn.inst[i].saved_bo, ptr, size); - -if (adev->vcn.inst[i].fw_shared_bo ==NULL ) -return 0 ; - -if (!adev->vcn.inst[i].saved_shm_bo) -return -ENOMEM ; - - size =amdgpu_bo_size (adev->vcn.inst[i].fw_shared_bo); - ptr = adev->vcn.inst[i].fw_shared_cpu_addr; - -memcpy_fromio (adev->vcn.inst[i].saved_shm_bo, ptr, size); }return 0 ; }
@@ -314,17 +299,6 @@ int amdgpu_vcn_resume(struct amdgpu_device *adev) }memset_io (ptr,0 , size); } - -if (adev->vcn.inst[i].fw_shared_bo ==NULL ) -return -EINVAL ; - - size =amdgpu_bo_size (adev->vcn.inst[i].fw_shared_bo); - ptr = adev->vcn.inst[i].fw_shared_cpu_addr; - -if (adev->vcn.inst[i].saved_shm_bo !=NULL ) -memcpy_toio (ptr, adev->vcn.inst[i].saved_shm_bo, size); -else -memset_io (ptr,0 , size); }return 0 ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +0 -1
@@ -207,7 +207,6 @@ struct amdgpu_vcn_inst {atomic_t dpg_enc_submission_cnt;void *fw_shared_cpu_addr;uint64_t fw_shared_gpu_addr; -void *saved_shm_bo; };struct amdgpu_vcn {
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amdgpu/vcn: merge shared memory into vcpu
Merge vcn firmware shared memory bo into vcn vcpu bo.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 18 ++++++------------ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 - 2 files changed, 6 insertions(+), 13 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +6 -12
@@ -168,6 +168,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) bo_size =AMDGPU_VCN_STACK_SIZE +AMDGPU_VCN_CONTEXT_SIZE ;if (adev->firmware.load_type !=AMDGPU_FW_LOAD_PSP ) bo_size +=AMDGPU_GPU_PAGE_ALIGN (le32_to_cpu (hdr->ucode_size_bytes) +8 ); + bo_size +=AMDGPU_GPU_PAGE_ALIGN (sizeof (struct amdgpu_fw_shared ));for (i =0 ; i < adev->vcn.num_vcn_inst; i++) {if (adev->vcn.harvest_config & (1 << i))
@@ -181,6 +182,11 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)return r; } + adev->vcn.inst[i].fw_shared_cpu_addr = adev->vcn.inst[i].cpu_addr + + bo_size -AMDGPU_GPU_PAGE_ALIGN (sizeof (struct amdgpu_fw_shared )); + adev->vcn.inst[i].fw_shared_gpu_addr = adev->vcn.inst[i].gpu_addr + + bo_size -AMDGPU_GPU_PAGE_ALIGN (sizeof (struct amdgpu_fw_shared )); +if (adev->vcn.indirect_sram) { r = amdgpu_bo_create_kernel(adev, 64 * 2 * 4, PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM, &adev->vcn.inst[i].dpg_sram_bo,
@@ -190,14 +196,6 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)return r; } } - - r =amdgpu_bo_create_kernel (adev,AMDGPU_GPU_PAGE_ALIGN (sizeof (struct amdgpu_fw_shared )), -PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM , &adev->vcn.inst[i].fw_shared_bo, - &adev->vcn.inst[i].fw_shared_gpu_addr, &adev->vcn.inst[i].fw_shared_cpu_addr); -if (r) { -dev_err (adev->dev,"VCN %d (%d) failed to allocate firmware shared bo\n" , i, r); -return r; - } }return 0 ;
@@ -213,10 +211,6 @@ int amdgpu_vcn_sw_fini(struct amdgpu_device *adev)if (adev->vcn.harvest_config & (1 << j))continue ; -amdgpu_bo_free_kernel (&adev->vcn.inst[j].fw_shared_bo, - &adev->vcn.inst[j].fw_shared_gpu_addr, - (void **)&adev->vcn.inst[j].fw_shared_cpu_addr); -if (adev->vcn.indirect_sram) { amdgpu_bo_free_kernel(&adev->vcn.inst[j].dpg_sram_bo, &adev->vcn.inst[j].dpg_sram_gpu_addr,
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +0 -1
@@ -199,7 +199,6 @@ struct amdgpu_vcn_inst {struct amdgpu_irq_src irq;struct amdgpu_vcn_reg external;struct amdgpu_bo *dpg_sram_bo; -struct amdgpu_bo *fw_shared_bo;struct dpg_pause_state pause_state;void *dpg_sram_cpu_addr;uint64_t dpg_sram_gpu_addr;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/2] drm/amdgpu/vcn: merge shared memory into vcpu
Ping ...
Quoted 63 lines · James Zhu
Merge vcn firmware shared memory bo into vcn vcpu bo.
Signed-off-by James Zhu <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 18 ++++++------------ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 - 2 files changed, 6 insertions(+), 13 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +6
-12@@ -168,6 +168,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev) bo_size =AMDGPU_VCN_STACK_SIZE +AMDGPU_VCN_CONTEXT_SIZE ;if (adev->firmware.load_type !=AMDGPU_FW_LOAD_PSP ) bo_size +=AMDGPU_GPU_PAGE_ALIGN (le32_to_cpu (hdr->ucode_size_bytes) +8 ); + bo_size +=AMDGPU_GPU_PAGE_ALIGN (sizeof (struct amdgpu_fw_shared ));for (i =0 ; i < adev->vcn.num_vcn_inst; i++) {if (adev->vcn.harvest_config & (1 << i))@@ -181,6 +182,11 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)return r; } + adev->vcn.inst[i].fw_shared_cpu_addr = adev->vcn.inst[i].cpu_addr + + bo_size -AMDGPU_GPU_PAGE_ALIGN (sizeof (struct amdgpu_fw_shared )); + adev->vcn.inst[i].fw_shared_gpu_addr = adev->vcn.inst[i].gpu_addr + + bo_size -AMDGPU_GPU_PAGE_ALIGN (sizeof (struct amdgpu_fw_shared )); +if (adev->vcn.indirect_sram) { r = amdgpu_bo_create_kernel(adev, 64 * 2 * 4, PAGE_SIZE, AMDGPU_GEM_DOMAIN_VRAM, &adev->vcn.inst[i].dpg_sram_bo,@@ -190,14 +196,6 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)return r; } } - - r =amdgpu_bo_create_kernel (adev,AMDGPU_GPU_PAGE_ALIGN (sizeof (struct amdgpu_fw_shared )), -PAGE_SIZE ,AMDGPU_GEM_DOMAIN_VRAM , &adev->vcn.inst[i].fw_shared_bo, - &adev->vcn.inst[i].fw_shared_gpu_addr, &adev->vcn.inst[i].fw_shared_cpu_addr); -if (r) { -dev_err (adev->dev,"VCN %d (%d) failed to allocate firmware shared bo\n" , i, r); -return r; - } }return 0 ;@@ -213,10 +211,6 @@ int amdgpu_vcn_sw_fini(struct amdgpu_device *adev)if (adev->vcn.harvest_config & (1 << j))continue ; -amdgpu_bo_free_kernel (&adev->vcn.inst[j].fw_shared_bo, - &adev->vcn.inst[j].fw_shared_gpu_addr, - (void **)&adev->vcn.inst[j].fw_shared_cpu_addr); -if (adev->vcn.indirect_sram) { amdgpu_bo_free_kernel(&adev->vcn.inst[j].dpg_sram_bo, &adev->vcn.inst[j].dpg_sram_gpu_addr,drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h struct amdgpu_vcn_inst { · line 204
Quoted 7 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +0
-1@@ -199,7 +199,6 @@ struct amdgpu_vcn_inst {struct amdgpu_irq_src irq;struct amdgpu_vcn_reg external;struct amdgpu_bo *dpg_sram_bo; -struct amdgpu_bo *fw_shared_bo;struct dpg_pause_state pause_state;void *dpg_sram_cpu_addr;uint64_t dpg_sram_gpu_addr;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
The series are:
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of James Zhu
Sent: July 16, 2020 9:15 AM
To: [email protected]
Cc: Zhu, James <[email protected]>
Subject: [PATCH 1/2] Revert "drm/amdgpu/vcn: add shared memory restore after wake up from sleep."
This reverts commit 41fd4db3eca29d10222f164cc1d56f60e3da97b8. To merge vcn firmware shared memory bo into vcn vcpu bo.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 28 +--------------------------- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 - 2 files changed, 1 insertion(+), 28 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c +1 -27
@@ -58,7 +58,7 @@ static void amdgpu_vcn_idle_work_handler(struct work_struct *work);int amdgpu_vcn_sw_init (struct amdgpu_device *adev) { -unsigned long bo_size, fw_shared_bo_size; +unsigned long bo_size;const char *fw_name;const struct common_firmware_header *hdr;unsigned char fw_check;
@@ -198,9 +198,6 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)dev_err (adev->dev,"VCN %d (%d) failed to allocate firmware shared bo\n" , i, r);return r; } - - fw_shared_bo_size =amdgpu_bo_size (adev->vcn.inst[i].fw_shared_bo); - adev->vcn.inst[i].saved_shm_bo =kvmalloc (fw_shared_bo_size,GFP_KERNEL ); }return 0 ;
@@ -216,7 +213,6 @@ int amdgpu_vcn_sw_fini(struct amdgpu_device *adev)if (adev->vcn.harvest_config & (1 << j))continue ; -kvfree (adev->vcn.inst[j].saved_shm_bo);amdgpu_bo_free_kernel (&adev->vcn.inst[j].fw_shared_bo, &adev->vcn.inst[j].fw_shared_gpu_addr, (void **)&adev->vcn.inst[j].fw_shared_cpu_addr);
@@ -266,17 +262,6 @@ int amdgpu_vcn_suspend(struct amdgpu_device *adev)return -ENOMEM ;memcpy_fromio (adev->vcn.inst[i].saved_bo, ptr, size); - -if (adev->vcn.inst[i].fw_shared_bo ==NULL ) -return 0 ; - -if (!adev->vcn.inst[i].saved_shm_bo) -return -ENOMEM ; - - size =amdgpu_bo_size (adev->vcn.inst[i].fw_shared_bo); - ptr = adev->vcn.inst[i].fw_shared_cpu_addr; - -memcpy_fromio (adev->vcn.inst[i].saved_shm_bo, ptr, size); }return 0 ; }
@@ -314,17 +299,6 @@ int amdgpu_vcn_resume(struct amdgpu_device *adev) }memset_io (ptr,0 , size); } - -if (adev->vcn.inst[i].fw_shared_bo ==NULL ) -return -EINVAL ; - - size =amdgpu_bo_size (adev->vcn.inst[i].fw_shared_bo); - ptr = adev->vcn.inst[i].fw_shared_cpu_addr; - -if (adev->vcn.inst[i].saved_shm_bo !=NULL ) -memcpy_toio (ptr, adev->vcn.inst[i].saved_shm_bo, size); -else -memset_io (ptr,0 , size); }return 0 ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h +0 -1
@@ -207,7 +207,6 @@ struct amdgpu_vcn_inst {atomic_t dpg_enc_submission_cnt;void *fw_shared_cpu_addr;uint64_t fw_shared_gpu_addr; -void *saved_shm_bo; };struct amdgpu_vcn {
--
2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cleo.liu%40amd.com%7Cab677877f20e4c85705e08d8298a3e6a%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637305021084985149&sdata=zAkfUcoQW27ao2wZf3sQOxgOjU7p9%2BAoaCGTdM0nsCk%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx