mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-29 23:53:32 +00:00
Code Issues Releases Wiki Activity

drm/amdgpu: add saved_bo to save vce 4.0 context when suspend

Browse source 
We are using PSP to resume firmware after suspend, and it is
resumed at where it got suspended, so we'd better save the
the context.

Signed-off-by: Leo Liu <leo.liu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Leo Liu 2017-05-31 14:25:54 -04:00 committed by Alex Deucher
parent 78b3c83983
commit a107ebf61e
2 changed files with 38 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h
View file

@ -34,6 +34,7 @@ struct amdgpu_vce {
struct amdgpu_bo *vcpu_bo; struct amdgpu_bo *vcpu_bo;
uint64_t gpu_addr; uint64_t gpu_addr;
void *cpu_addr; void *cpu_addr;
void *saved_bo;
unsigned fw_version; unsigned fw_version;
unsigned fb_version; unsigned fb_version;
atomic_t handles[AMDGPU_MAX_VCE_HANDLES]; atomic_t handles[AMDGPU_MAX_VCE_HANDLES];

45
drivers/gpu/drm/amd/amdgpu/vce_v4_0.c
View file

@ -419,15 +419,19 @@ static int vce_v4_0_sw_init(void *handle)
if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) { if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
const struct common_firmware_header *hdr; const struct common_firmware_header *hdr;
unsigned size = amdgpu_bo_size(adev->vce.vcpu_bo);
adev->vce.saved_bo = kmalloc(size, GFP_KERNEL);
if (!adev->vce.saved_bo)
return -ENOMEM;
hdr = (const struct common_firmware_header *)adev->vce.fw->data; hdr = (const struct common_firmware_header *)adev->vce.fw->data;
adev->firmware.ucode[AMDGPU_UCODE_ID_VCE].ucode_id = AMDGPU_UCODE_ID_VCE; adev->firmware.ucode[AMDGPU_UCODE_ID_VCE].ucode_id = AMDGPU_UCODE_ID_VCE;
adev->firmware.ucode[AMDGPU_UCODE_ID_VCE].fw = adev->vce.fw; adev->firmware.ucode[AMDGPU_UCODE_ID_VCE].fw = adev->vce.fw;
adev->firmware.fw_size += adev->firmware.fw_size +=
ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE); ALIGN(le32_to_cpu(hdr->ucode_size_bytes), PAGE_SIZE);
DRM_INFO("PSP loading VCE firmware\n"); DRM_INFO("PSP loading VCE firmware\n");
} } else {
if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) {
r = amdgpu_vce_resume(adev); r = amdgpu_vce_resume(adev);
if (r) if (r)
return r; return r;
@ -466,6 +470,11 @@ static int vce_v4_0_sw_fini(void *handle)
/* free MM table */ /* free MM table */
amdgpu_virt_free_mm_table(adev); amdgpu_virt_free_mm_table(adev);
if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
kfree(adev->vce.saved_bo);
adev->vce.saved_bo = NULL;
}
r = amdgpu_vce_suspend(adev); r = amdgpu_vce_suspend(adev);
if (r) if (r)
return r; return r;
@ -522,8 +531,18 @@ static int vce_v4_0_hw_fini(void *handle)
static int vce_v4_0_suspend(void *handle) static int vce_v4_0_suspend(void *handle)
{ {
int r;
struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct amdgpu_device *adev = (struct amdgpu_device *)handle;
int r;
if (adev->vce.vcpu_bo == NULL)
return 0;
if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
unsigned size = amdgpu_bo_size(adev->vce.vcpu_bo);
void *ptr = adev->vce.cpu_addr;
memcpy_fromio(adev->vce.saved_bo, ptr, size);
}
r = vce_v4_0_hw_fini(adev); r = vce_v4_0_hw_fini(adev);
if (r) if (r)
@ -534,12 +553,22 @@ static int vce_v4_0_suspend(void *handle)
static int vce_v4_0_resume(void *handle) static int vce_v4_0_resume(void *handle)
{ {
int r;
struct amdgpu_device *adev = (struct amdgpu_device *)handle; struct amdgpu_device *adev = (struct amdgpu_device *)handle;
int r;
r = amdgpu_vce_resume(adev); if (adev->vce.vcpu_bo == NULL)
if (r) return -EINVAL;
return r;
if (adev->firmware.load_type == AMDGPU_FW_LOAD_PSP) {
unsigned size = amdgpu_bo_size(adev->vce.vcpu_bo);
void *ptr = adev->vce.cpu_addr;
memcpy_toio(ptr, adev->vce.saved_bo, size);
} else {
r = amdgpu_vce_resume(adev);
if (r)
return r;
}
return vce_v4_0_hw_init(adev); return vce_v4_0_hw_init(adev);
} }