drm/amdgpu: Add new mode 2560x1440
Subsystems (3)
PATCH 1/3 drm/amdgpu: Add new mode 2560x1440
Add one more 2k resolution which appears frequently in market.
--- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +3 -2
@@ -294,7 +294,7 @@ static int dce_virtual_get_modes(struct drm_connector *connector)static const struct mode_size {int w;int h; - } common_modes[21 ] = { + } common_modes[] = { {640 ,480 }, {720 ,480 }, {800 ,600 },
@@ -312,13 +312,14 @@ static int dce_virtual_get_modes(struct drm_connector *connector) {1600, 1200}, {1920, 1080}, {1920, 1200}, + {2560, 1440}, {4096, 3112}, {3656, 2664}, {3840, 2160}, {4096, 2160}, }; -for (i =0 ; i <21 ; i++) { +for (i =0 ; i <ARRAY_SIZE (common_modes); i++) { mode =drm_cvt_mode (dev, common_modes[i].w, common_modes[i].h,60 , false, false, false);drm_mode_probed_add (connector, mode); }
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/3 drm/amdgpu: Correct the read sclk for navi10
According to hw, after navi10,it runs in dfll mode, and should read sclk from AverageGfxclkFrequency.
--- drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1 -1
@@ -1673,7 +1673,7 @@ static int navi10_read_sensor(struct smu_context *smu, *size =4 ;break ;case AMDGPU_PP_SENSOR_GFX_SCLK : - ret =navi10_get_current_clk_freq_by_table (smu,SMU_GFXCLK , (uint32_t *)data); + ret =navi10_get_smu_metrics_data (smu,METRICS_AVERAGE_GFXCLK , (uint32_t *)data); *(uint32_t *)data *=100 ; *size =4 ;break ;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/3] drm/amdgpu: Correct the read sclk for navi10
Quoted 5 lines · Emily.Deng
According to hw, after navi10,it runs in dfll mode, and should read sclk from AverageGfxclkFrequency.
Signed-off-by Emily.Deng <[email protected]>
Quoted 20 lines
--- drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1
-2@@ -1673,7 +1673,7 @@ static int navi10_read_sensor(struct smu_context *smu, *size =4 ;break ;case AMDGPU_PP_SENSOR_GFX_SCLK : - ret =navi10_get_current_clk_freq_by_table (smu,SMU_GFXCLK , (uint32_t *)data); + ret =navi10_get_smu_metrics_data (smu,METRICS_AVERAGE_GFXCLK , (uint32_t *)data); *(uint32_t *)data *=100 ; *size =4 ;break ; --2.25.1
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
RE: [PATCH 2/3] drm/amdgpu: Correct the read sclk for navi10
In reply to Emily.Deng[AMD Official Use Only - Internal Distribution Only]
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Emily.Deng
Sent: Wednesday, January 6, 2021 9:05 AM
To: [email protected]
Cc: Deng, Emily <[email protected]>
Subject: [PATCH 2/3] drm/amdgpu: Correct the read sclk for navi10
According to hw, after navi10,it runs in dfll mode, and should read sclk from AverageGfxclkFrequency.
--- drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +1 -1
@@ -1673,7 +1673,7 @@ static int navi10_read_sensor(struct smu_context *smu, *size =4 ;break ;case AMDGPU_PP_SENSOR_GFX_SCLK : -ret =navi10_get_current_clk_freq_by_table (smu,SMU_GFXCLK , (uint32_t *)data); +ret =navi10_get_smu_metrics_data (smu,METRICS_AVERAGE_GFXCLK , (uint32_t *)data); *(uint32_t *)data *=100 ; *size =4 ;break ;
--
2.25.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cevan.quan%40amd.com%7Cf8dd063d81db4666206308d8b1df2912%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637454919343172670%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=gA1B8ytfQj0g5TMPHYYC%2FKNUli2qY7iY%2Fc1vn4M7vWA%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Feng, Kenneth
maintainerRE: [PATCH 2/3] drm/amdgpu: Correct the read sclk for navi10
In reply to Emily.Deng[AMD Official Use Only - Internal Distribution Only]
Hello Emily,
The average clock value is a little different from the 'current clock' value.
May I know what's the purpose of this patch to display the average clock? Any issue or any customer requirement? Thanks.
Best Regards
Kenneth
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Emily.Deng
Sent: Wednesday, January 6, 2021 9:05 AM
To: [email protected]
Cc: Deng, Emily <[email protected]>
Subject: [PATCH 2/3] drm/amdgpu: Correct the read sclk for navi10
[CAUTION: External Email]
According to hw, after navi10,it runs in dfll mode, and should read sclk from AverageGfxclkFrequency.
--- drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2 -1
@@ -1673,7 +1673,7 @@ static int navi10_read_sensor(struct smu_context *smu, *size =4 ;break ;case AMDGPU_PP_SENSOR_GFX_SCLK : - ret =navi10_get_current_clk_freq_by_table (smu,SMU_GFXCLK , (uint32_t *)data); + ret =navi10_get_smu_metrics_data (smu, +METRICS_AVERAGE_GFXCLK , (uint32_t *)data); *(uint32_t *)data *=100 ; *size =4 ;
break;
--
2.25.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7CKenneth.Feng%40amd.com%7Cf8dd063d81db4666206308d8b1df2912%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637454919344238874%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=mXK3%2F5g4lqMFFN1ovavfXdbuypZK2FUGbAEce9VPTWs%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amdgpu:Limit the resolution for virtual_display
In reply to Emily.DengLimit the resolution not bigger than 16384, which means dev->mode_info.num_crtc * common_modes[i].w not bigger than 16384.
--- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_virtual.c +5 -2
@@ -289,6 +289,7 @@ dce_virtual_encoder(struct drm_connector *connector)static int dce_virtual_get_modes (struct drm_connector *connector) {struct drm_device *dev = connector->dev; +struct amdgpu_device *adev = dev->dev_private;struct drm_display_mode *mode =NULL ;unsigned i; static const struct mode_size {
@@ -320,8 +321,10 @@ static int dce_virtual_get_modes(struct drm_connector *connector) };for (i =0 ; i <ARRAY_SIZE (common_modes); i++) { - mode =drm_cvt_mode (dev, common_modes[i].w, common_modes[i].h,60 , false, false, false); -drm_mode_probed_add (connector, mode); +if (adev->mode_info.num_crtc <=4 || common_modes[i].w <=2560 ) { + mode =drm_cvt_mode (dev, common_modes[i].w, common_modes[i].h,60 , false, false, false); +drm_mode_probed_add (connector, mode); + } }return 0 ;
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 4 lines · Emily.Deng
Add one more 2k resolution which appears frequently in market.
Signed-off-by Emily.Deng <[email protected]>
Quoted 36 lines
--- drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/dce_virtual.c +3
-3@@ -294,7 +294,7 @@ static int dce_virtual_get_modes(struct drm_connector *connector)static const struct mode_size {int w;int h; - } common_modes[21 ] = { + } common_modes[] = { {640 ,480 }, {720 ,480 }, {800 ,600 },@@ -312,13 +312,14 @@ static int dce_virtual_get_modes(struct drm_connector *connector) {1600, 1200}, {1920, 1080}, {1920, 1200}, + {2560, 1440}, {4096, 3112}, {3656, 2664}, {3840, 2160}, {4096, 2160}, }; -for (i =0 ; i <21 ; i++) { +for (i =0 ; i <ARRAY_SIZE (common_modes); i++) { mode =drm_cvt_mode (dev, common_modes[i].w, common_modes[i].h,60 , false, false, false);drm_mode_probed_add (connector, mode); } --2.25.1
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