drm/amdgpu: use memcpy_to/fromio for UVD fw upload
Subsystems (2)
PATCH 1/2 drm/amdgpu: use memcpy_to/fromio for UVD fw upload
From: Christian König <[email protected]>
Also use the firmware size from the header instead of calculating it.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +5 -5
@@ -298,7 +298,7 @@ int amdgpu_uvd_suspend(struct amdgpu_device *adev)if (!adev->uvd.saved_bo)return -ENOMEM ; -memcpy (adev->uvd.saved_bo, ptr, size); +memcpy_fromio (adev->uvd.saved_bo, ptr, size);return 0 ; }
@@ -315,7 +315,7 @@ int amdgpu_uvd_resume(struct amdgpu_device *adev) ptr = adev->uvd.cpu_addr;if (adev->uvd.saved_bo !=NULL ) { -memcpy (ptr, adev->uvd.saved_bo, size); +memcpy_toio (ptr, adev->uvd.saved_bo, size);kfree (adev->uvd.saved_bo); adev->uvd.saved_bo =NULL ; }else {
@@ -324,11 +324,11 @@ int amdgpu_uvd_resume(struct amdgpu_device *adev) hdr = (const struct common_firmware_header *)adev->uvd.fw->data; offset =le32_to_cpu (hdr->ucode_array_offset_bytes); -memcpy (adev->uvd.cpu_addr, (adev->uvd.fw->data) + offset, - (adev->uvd.fw->size) - offset); +memcpy_toio (adev->uvd.cpu_addr, adev->uvd.fw->data + offset, +le32_to_cpu (hdr->ucode_size_bytes)); size -=le32_to_cpu (hdr->ucode_size_bytes); ptr +=le32_to_cpu (hdr->ucode_size_bytes); -memset (ptr,0 , size); +memset_io (ptr,0 , size); }return 0 ;
Signature · 6 lines
2.5.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1471944026-2158-1-git-send-email-deathsimple-ANTagKRnAhcb1SvskN2V4Q@public.gmane.org
PATCH 2/2 drm/amdgpu: use memcpy_toio for VCE firmware upload
From: Christian König <[email protected]>
Try to be clean here, even when it's a noop on x86.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c +2 -2
@@ -282,8 +282,8 @@ int amdgpu_vce_resume(struct amdgpu_device *adev) hdr = (const struct common_firmware_header *)adev->vce.fw->data; offset =le32_to_cpu (hdr->ucode_array_offset_bytes); -memcpy (cpu_addr, (adev->vce.fw->data) + offset, - (adev->vce.fw->size) - offset); +memcpy_toio (cpu_addr, adev->vce.fw->data + offset, + adev->vce.fw->size - offset);amdgpu_bo_kunmap (adev->vce.vcpu_bo);
Signature · 6 lines
2.5.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 8 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Christian König
Sent: Tuesday, August 23, 2016 5:20 AM
To: [email protected]
Subject: [PATCH 1/2] drm/amdgpu: use memcpy_to/fromio for UVD fw upload
Quoted 5 lines
From: Christian König <[email protected]>
Also use the firmware size from the header instead of calculating it.
Signed-off-by Christian König <[email protected]>
For the series:
Quoted 51 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +1
-1@@ -298,7 +298,7 @@ int amdgpu_uvd_suspend(struct amdgpu_device *adev)if (!adev->uvd.saved_bo)return -ENOMEM ; -memcpy (adev->uvd.saved_bo, ptr, size); +memcpy_fromio (adev->uvd.saved_bo, ptr, size);return 0 ;}
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +1
-1@@ -315,7 +315,7 @@ int amdgpu_uvd_resume(struct amdgpu_device *adev) ptr = adev->uvd.cpu_addr;if (adev->uvd.saved_bo !=NULL ) { -memcpy (ptr, adev->uvd.saved_bo, size); +memcpy_toio (ptr, adev->uvd.saved_bo, size);kfree (adev->uvd.saved_bo); adev->uvd.saved_bo =NULL ;drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +3
-4}else {@@ -324,11 +324,11 @@ int amdgpu_uvd_resume(struct amdgpu_device *adev) hdr = (const struct common_firmware_header *)adev- >uvd.fw->data; offset =le32_to_cpu (hdr->ucode_array_offset_bytes); -memcpy (adev->uvd.cpu_addr, (adev->uvd.fw->data) + offset, - (adev->uvd.fw->size) - offset); +memcpy_toio (adev->uvd.cpu_addr, adev->uvd.fw->data + offset, +le32_to_cpu (hdr->ucode_size_bytes)); size -=le32_to_cpu (hdr->ucode_size_bytes); ptr +=le32_to_cpu (hdr->ucode_size_bytes); -memset (ptr,0 , size); +memset_io (ptr,0 , size); }return 0 ; --2.5.0
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx