drm/amdgpu: fix default UVD context size
Subsystems (2)
PATCH 1/2 drm/amdgpu: fix default UVD context size
From: Christian König <[email protected]>
Context buffers should be denied by default, not allowed.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +1 -1
@@ -410,7 +410,7 @@ static int amdgpu_uvd_cs_msg_decode(struct amdgpu_device *adev, uint32_t *msg,unsigned fs_in_mb = width_in_mb * height_in_mb;unsigned image_size, tmp, min_dpb_size, num_dpb_buffer; -unsigned min_ctx_size =0 ; +unsigned min_ctx_size = ~0 ; image_size = width * height; image_size += image_size /2 ;
Signature · 6 lines
2.7.4 _______________________________________________ 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): 1469715195-7174-1-git-send-email-leo.liu-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amdgpu: enable UVD context buffer for older HW
From: Christian König <[email protected]>
Supported starting on certain FW versions.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -1688,6 +1688,7 @@ struct amdgpu_uvd {struct amdgpu_ring ring;struct amdgpu_irq_src irq;bool address_64_bit; +bool use_ctx_buf;struct amd_sched_entity entity;uint32_t srbm_soft_reset; };
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +26 -2
@@ -41,8 +41,15 @@/* 1 second timeout */ #define UVD_IDLE_TIMEOUT msecs_to_jiffies(1000) + +/* Firmware versions for VI */ +#define FW_1_65_10 ((1 << 24) | (65 << 16) | (10 << 8)) +#define FW_1_87_11 ((1 << 24) | (87 << 16) | (11 << 8)) +#define FW_1_87_12 ((1 << 24) | (87 << 16) | (12 << 8)) +#define FW_1_37_15 ((1 << 24) | (37 << 16) | (15 << 8)) +/* Polaris10/11 firmware version */ -#define FW_1_66_16 ((1 << 24) | (66 << 16) | (16 << 8)) +#define FW_1_66_16 ((1 << 24) | (66 << 16) | (16 << 8))/* Firmware Names */ #ifdef CONFIG_DRM_AMDGPU_CIK
@@ -220,6 +227,23 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)if (!amdgpu_ip_block_version_cmp (adev,AMD_IP_BLOCK_TYPE_UVD ,5 ,0 )) adev->uvd.address_64_bit = true; +switch (adev->asic_type) { +case CHIP_TONGA : + adev->uvd.use_ctx_buf = adev->uvd.fw_version >=FW_1_65_10 ; +break ; +case CHIP_CARRIZO : + adev->uvd.use_ctx_buf = adev->uvd.fw_version >=FW_1_87_11 ; +break ; +case CHIP_FIJI : + adev->uvd.use_ctx_buf = adev->uvd.fw_version >=FW_1_87_12 ; +break ; +case CHIP_STONEY : + adev->uvd.use_ctx_buf = adev->uvd.fw_version >=FW_1_37_15 ; +break ; +default : + adev->uvd.use_ctx_buf = adev->asic_type >=CHIP_POLARIS10 ; + } +return 0 ; }
@@ -529,7 +553,7 @@ static int amdgpu_uvd_cs_msg_decode(struct amdgpu_device *adev, uint32_t *msg,/* reference picture buffer */ min_dpb_size = image_size * num_dpb_buffer; -if (adev->asic_type <CHIP_POLARIS10 ){ +if (!adev->uvd.use_ctx_buf){/* macroblock context buffer */ min_dpb_size += width_in_mb * height_in_mb * num_dpb_buffer *192 ;
Signature · 6 lines
2.7.4 _______________________________________________ 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): 1469715195-7174-2-git-send-email-leo.liu-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 2/2] drm/amdgpu: enable UVD context buffer for older HW
Quoted 8 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Leo Liu
Sent: Thursday, July 28, 2016 10:13 AM
To: [email protected]
Cc: Koenig, Christian; [email protected]
Subject: [PATCH 2/2] drm/amdgpu: enable UVD context buffer for older HW
Quoted 6 lines
From: Christian König <[email protected]>
Supported starting on certain FW versions.
Signed-off-by Christian König <[email protected]>Reviewed-by Leo Liu <[email protected]>
Series is:
Quoted 86 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 28 ++++++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +1
-0@@ -1688,6 +1688,7 @@ struct amdgpu_uvd {struct amdgpu_ring ring;struct amdgpu_irq_src irq;bool address_64_bit; +bool use_ctx_buf;struct amd_sched_entity entity;uint32_t srbm_soft_reset; };drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +14
-1@@ -41,8 +41,15 @@/* 1 second timeout */ #define UVD_IDLE_TIMEOUT msecs_to_jiffies(1000) + +/* Firmware versions for VI */ +#define FW_1_65_10 ((1 << 24) | (65 << 16) | (10 << 8)) +#define FW_1_87_11 ((1 << 24) | (87 << 16) | (11 << 8)) +#define FW_1_87_12 ((1 << 24) | (87 << 16) | (12 << 8)) +#define FW_1_37_15 ((1 << 24) | (37 << 16) | (15 << 8)) +/* Polaris10/11 firmware version */ -#define FW_1_66_16 ((1 << 24) | (66 << 16) | (16 << 8)) +#define FW_1_66_16 ((1 << 24) | (66 << 16) | (16 << 8))/* Firmware Names */ #ifdef CONFIG_DRM_AMDGPU_CIK @@ -220,6 +227,23 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)if (!amdgpu_ip_block_version_cmp (adev,AMD_IP_BLOCK_TYPE_UVD ,5 ,0 )) adev->uvd.address_64_bit = true; +switch (adev->asic_type) { +case CHIP_TONGA : + adev->uvd.use_ctx_buf = adev->uvd.fw_version >=FW_1_65_10 ; +break ; +case CHIP_CARRIZO : + adev->uvd.use_ctx_buf = adev->uvd.fw_version >=
FW_1_87_11;drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +3
-0+break ; +case CHIP_FIJI : + adev->uvd.use_ctx_buf = adev->uvd.fw_version >=
FW_1_87_12;drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +3
-0+break ; +case CHIP_STONEY : + adev->uvd.use_ctx_buf = adev->uvd.fw_version >=
FW_1_37_15;drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +3
-0+break ; +default : + adev->uvd.use_ctx_buf = adev->asic_type >=
CHIP_POLARIS10;drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c +3
-1+ } +return 0 ; }@@ -529,7 +553,7 @@ static int amdgpu_uvd_cs_msg_decode(struct amdgpu_device *adev, uint32_t *msg,/* reference picture buffer */ min_dpb_size = image_size * num_dpb_buffer; -if (adev->asic_type <CHIP_POLARIS10 ){ +if (!adev->uvd.use_ctx_buf){/* macroblock context buffer */ min_dpb_size +=
width_in_mb*height_in_mb*num_dpb_buffer* 192;
--
2.7.4
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