drm/amdgpu: move vsync_timer_enabled setup to dce virtual early_init
Subsystems (2)
PATCH 1/3 drm/amdgpu: move vsync_timer_enabled setup to dce virtual early_init
Put it in one place.
--- drivers/gpu/drm/amd/amdgpu/cik.c | 1 - drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 1 + drivers/gpu/drm/amd/amdgpu/vi.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/cik.c +0 -1
@@ -2324,7 +2324,6 @@ static const struct amdgpu_ip_block_version kaveri_ip_blocks_vd[] =int cik_set_ip_blocks (struct amdgpu_device *adev) {if (amdgpu_virtual_display) { - adev->mode_info.vsync_timer_enabled =AMDGPU_IRQ_STATE_DISABLE ;switch (adev->asic_type) {case CHIP_BONAIRE : adev->ip_blocks = bonaire_ip_blocks_vd;
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +1 -0
@@ -353,6 +353,7 @@ static int dce_virtual_early_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; + adev->mode_info.vsync_timer_enabled =AMDGPU_IRQ_STATE_DISABLE ;dce_virtual_set_display_funcs (adev);dce_virtual_set_irq_funcs (adev);
drivers/gpu/drm/amd/amdgpu/vi.c +0 -1
@@ -1388,7 +1388,6 @@ static const struct amdgpu_ip_block_version cz_ip_blocks_vd[] =int vi_set_ip_blocks (struct amdgpu_device *adev) {if (amdgpu_virtual_display) { - adev->mode_info.vsync_timer_enabled =AMDGPU_IRQ_STATE_DISABLE ;switch (adev->asic_type) {case CHIP_TOPAZ : adev->ip_blocks = topaz_ip_blocks;
Signature · 6 lines
2.5.5 _______________________________________________ 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): 1470682000-4223-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
PATCH 2/3 drm/amdgpu/virtual_dce: add case for topaz for disable_dce
This asic has no DCE block. Also clarify the error message for unmatched chips.
--- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +4 -1
@@ -124,8 +124,11 @@ void dce_virtual_stop_mc_access(struct amdgpu_device *adev,case CHIP_POLARIS10 :dce_v11_0_disable_dce (adev);break ; +case CHIP_TOPAZ : +/* no DCE */ +return ;default : -DRM_ERROR ("Usupported ASIC type: 0x%X\n" , adev->asic_type); +DRM_ERROR ("Virtual display unsupported ASIC type: 0x%X\n" , adev->asic_type); }return ;
Signature · 6 lines
2.5.5 _______________________________________________ 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): 1470682000-4223-2-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Deng, Emily
Reviewed-by Emily DengRE: [PATCH 2/3] drm/amdgpu/virtual_dce: add case for topaz for disable_dce
Quoted 40 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Alex Deucher
Sent: Tuesday, August 09, 2016 2:47 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 2/3] drm/amdgpu/virtual_dce: add case for topaz fordisable_dceThis asic has no DCE block. Also clarify the error message for unmatched chips.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/amdgpu/dce_virtual.c +5
-2@@ -124,8 +124,11 @@ void dce_virtual_stop_mc_access(structamdgpu_device *adev, case CHIP_POLARIS10:dce_v11_0_disable_dce (adev );break ; +case CHIP_TOPAZ : +/* no DCE */ +return ;default : -DRM_ERROR ("Usupported ASIC type: 0x%X\n" , adev- >asic_type); +DRM_ERROR ("Virtual display unsupported ASIC type: 0x%X\n" , +adev->asic_type); }return ; --2.5.5
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
PATCH 3/3 drm/amdgpu: add virtual dce support for iceland
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/vi.c | 58 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/vi.c +56 -2
@@ -823,6 +823,60 @@ static const struct amdgpu_ip_block_version topaz_ip_blocks[] = }, }; +static const struct amdgpu_ip_block_version topaz_ip_blocks_vd[] = +{ +/* ORDER MATTERS! */ + { + .type =AMD_IP_BLOCK_TYPE_COMMON , + .major =2 , + .minor =0 , + .rev =0 , + .funcs = &vi_common_ip_funcs, + }, + { + .type =AMD_IP_BLOCK_TYPE_GMC , + .major =7 , + .minor =4 , + .rev =0 , + .funcs = &gmc_v7_0_ip_funcs, + }, + { + .type =AMD_IP_BLOCK_TYPE_IH , + .major =2 , + .minor =4 , + .rev =0 , + .funcs = &iceland_ih_ip_funcs, + }, + { + .type =AMD_IP_BLOCK_TYPE_SMC , + .major =7 , + .minor =1 , + .rev =0 , + .funcs = &amdgpu_pp_ip_funcs, + }, + { + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =1 , + .minor =0 , + .rev =0 , + .funcs = &dce_virtual_ip_funcs, + }, + { + .type =AMD_IP_BLOCK_TYPE_GFX , + .major =8 , + .minor =0 , + .rev =0 , + .funcs = &gfx_v8_0_ip_funcs, + }, + { + .type =AMD_IP_BLOCK_TYPE_SDMA , + .major =2 , + .minor =4 , + .rev =0 , + .funcs = &sdma_v2_4_ip_funcs, + }, +}; +static const struct amdgpu_ip_block_version tonga_ip_blocks[] = {/* ORDER MATTERS! */
@@ -1390,8 +1444,8 @@ int vi_set_ip_blocks(struct amdgpu_device *adev)if (amdgpu_virtual_display) {switch (adev->asic_type) {case CHIP_TOPAZ : - adev->ip_blocks = topaz_ip_blocks; - adev->num_ip_blocks =ARRAY_SIZE (topaz_ip_blocks); + adev->ip_blocks = topaz_ip_blocks_vd; + adev->num_ip_blocks =ARRAY_SIZE (topaz_ip_blocks_vd);break ;case CHIP_FIJI : adev->ip_blocks = fiji_ip_blocks_vd;
Signature · 6 lines
2.5.5 _______________________________________________ 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): 1470682000-4223-3-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Deng, Emily
Reviewed-by Emily DengRE: [PATCH 3/3] drm/amdgpu: add virtual dce support for iceland
Quoted 93 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Alex Deucher
Sent: Tuesday, August 09, 2016 2:47 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 3/3] drm/amdgpu: add virtual dce support for icelandSigned-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/vi.c | 58 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/vi.cindex 2d3e3ed..69c2f81 100644drivers/gpu/drm/amd/amdgpu/vi.c +0
-0@@ -823,6 +823,60 @@ static const struct amdgpu_ip_block_versiontopaz_ip_blocks[] =
drivers/gpu/drm/amd/amdgpu/vi.c +55
-2}, }; +static const struct amdgpu_ip_block_version topaz_ip_blocks_vd[] = { +/* ORDER MATTERS! */ + { + .type =AMD_IP_BLOCK_TYPE_COMMON , + .major =2 , + .minor =0 , + .rev =0 , + .funcs = &vi_common_ip_funcs, + }, + { + .type =AMD_IP_BLOCK_TYPE_GMC , + .major =7 , + .minor =4 , + .rev =0 , + .funcs = &gmc_v7_0_ip_funcs, + }, + { + .type =AMD_IP_BLOCK_TYPE_IH , + .major =2 , + .minor =4 , + .rev =0 , + .funcs = &iceland_ih_ip_funcs, + }, + { + .type =AMD_IP_BLOCK_TYPE_SMC , + .major =7 , + .minor =1 , + .rev =0 , + .funcs = &amdgpu_pp_ip_funcs, + }, + { + .type =AMD_IP_BLOCK_TYPE_DCE , + .major =1 , + .minor =0 , + .rev =0 , + .funcs = &dce_virtual_ip_funcs, + }, + { + .type =AMD_IP_BLOCK_TYPE_GFX , + .major =8 , + .minor =0 , + .rev =0 , + .funcs = &gfx_v8_0_ip_funcs, + }, + { + .type =AMD_IP_BLOCK_TYPE_SDMA , + .major =2 , + .minor =4 , + .rev =0 , + .funcs = &sdma_v2_4_ip_funcs, + }, +}; +static const struct amdgpu_ip_block_version tonga_ip_blocks[] = {/* ORDER MATTERS! */ @@ -1390,8 +1444,8 @@ int vi_set_ip_blocks(struct amdgpu_device *adev)if (amdgpu_virtual_display) {switch (adev->asic_type) {case CHIP_TOPAZ : - adev->ip_blocks = topaz_ip_blocks; - adev->num_ip_blocks =ARRAY_SIZE (topaz_ip_blocks); + adev->ip_blocks = topaz_ip_blocks_vd; + adev->num_ip_blocks =ARRAY_SIZE (topaz_ip_blocks_vd);break ;case CHIP_FIJI :
adev->ip_blocks=fiji_ip_blocks_vd;
--
2.5.5
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
Deng, Emily
Reviewed-by Emily DengQuoted 59 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Alex Deucher
Sent: Tuesday, August 09, 2016 2:47 AM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: [PATCH 1/3] drm/amdgpu: movevsync_timer_enabledsetup to dce virtualearly_initPut it in one place.
Signed-off-by Alex Deucher <[email protected]>--- drivers/gpu/drm/amd/amdgpu/cik.c | 1 - drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 1 + drivers/gpu/drm/amd/amdgpu/vi.c | 1 - 3 files changed, 1 insertion(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/cik.c +0
-1@@ -2324,7 +2324,6 @@ static const struct amdgpu_ip_block_version kaveri_ip_blocks_vd[] = int cik_set_ip_blocks(struct amdgpu_device *adev) {if (amdgpu_virtual_display) { - adev->mode_info.vsync_timer_enabled =AMDGPU_IRQ_STATE_DISABLE ;switch (adev->asic_type) {case CHIP_BONAIRE : adev->ip_blocks = bonaire_ip_blocks_vd; diff --git
a/drivers/gpu/drm/amd/amdgpu/dce_virtual.cb/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
index 1c16983..4c8ca58 100644drivers/gpu/drm/amd/amdgpu/dce_virtual.c +1
-0@@ -353,6 +353,7 @@ static int dce_virtual_early_init(void *handle) {struct amdgpu_device *adev = (struct amdgpu_device *)handle; + adev->mode_info.vsync_timer_enabled =AMDGPU_IRQ_STATE_DISABLE ;dce_virtual_set_display_funcs (adev);dce_virtual_set_irq_funcs (adev);(quoted diff) +0
-0
b/drivers/gpu/drm/amd/amdgpu/vi.cindex 0642917..2d3e3ed 100644drivers/gpu/drm/amd/amdgpu/vi.c +0
-2@@ -1388,7 +1388,6 @@ static const struct amdgpu_ip_block_version cz_ip_blocks_vd[] = int vi_set_ip_blocks(struct amdgpu_device *adev) {if (amdgpu_virtual_display) { - adev->mode_info.vsync_timer_enabled =AMDGPU_IRQ_STATE_DISABLE ;switch (adev->asic_type) {case CHIP_TOPAZ : adev->ip_blocks = topaz_ip_blocks; --2.5.5
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