Revert "drm/amdgpu/vcn: add shared memory restore after wake up from sleep."

This reverts commit 21b704d78352c289d31697824ceea7ad0ff4ce59.
To merge vcn firmware shared memory bo into vcn vcpu bo.

Signed-off-by: James Zhu <James.Zhu@amd.com>
Reviewed-by: Leo Liu <leo.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index a777d585db84d8eb1821633d32451253f047b3b9..354ebf3507cf872c0e1222df6c2d234b26b61004 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -60,7 +60,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;
@@ -206,9 +206,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;
@@ -224,7 +221,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);
@@ -274,17 +270,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;
 }
@@ -322,17 +307,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;
 }

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
index e125e8bfac541f6f98d5067b993db15bff874fce..b5e9088c1ba73922549dbcef9ea144f1cb2a2126 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
@@ -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 {