drm/edid: don't log errors on absent or old CEA SAD blocks
Subsystems (4)
v2 cover drm/edid: don't log errors on absent or old CEA SAD blocks
Hi all,
This is my attempt to fix bug fdo#107825:
https://bugs.freedesktop.org/show_bug.cgi?id=107825
[PATCH 1/3] drm/amd: be quiet when no SAD block is found [PATCH 2/3] drm/radeon: be quiet when no SAD block is found [PATCH 3/3] drm/edid: no CEA extension is not an error
Changes since v1:
* Fixed subject of patch 2
* Treat CEA extension version < 3 as non-error too (suggested by Ville Syrjälä)
Signature · 6 lines
Jean Delvare SUSE L3 Support _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 1/3 drm/amd: be quiet when no SAD block is found
It is fine for displays without audio functionality to not provide any SAD block in their EDID. Do not log an error in that case, just return quietly.
This fixes half of bug fdo#107825:
https://bugs.freedesktop.org/show_bug.cgi?id=107825
---
No change since v1.
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 ++-- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 7 +++---- 5 files changed, 11 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +2 -2
@@ -1345,10 +1345,10 @@ static void dce_v10_0_audio_write_sad_re } sad_count =drm_edid_to_sad (amdgpu_connector_edid (connector), &sads); -if (sad_count <=0 ) { +if (sad_count <0 )DRM_ERROR ("Couldn't read SADs: %d\n" , sad_count); +if (sad_count <=0 )return ; - }BUG_ON (!sads);for (i =0 ; i <ARRAY_SIZE (eld_reg_to_type); i++) {
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +2 -2
@@ -1371,10 +1371,10 @@ static void dce_v11_0_audio_write_sad_re } sad_count =drm_edid_to_sad (amdgpu_connector_edid (connector), &sads); -if (sad_count <=0 ) { +if (sad_count <0 )DRM_ERROR ("Couldn't read SADs: %d\n" , sad_count); +if (sad_count <=0 )return ; - }BUG_ON (!sads);for (i =0 ; i <ARRAY_SIZE (eld_reg_to_type); i++) {
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +2 -2
@@ -1248,10 +1248,10 @@ static void dce_v6_0_audio_write_sad_reg } sad_count =drm_edid_to_sad (amdgpu_connector_edid (connector), &sads); -if (sad_count <=0 ) { +if (sad_count <0 )DRM_ERROR ("Couldn't read SADs: %d\n" , sad_count); +if (sad_count <=0 )return ; - }for (i =0 ; i <ARRAY_SIZE (eld_reg_to_type); i++) {u32 tmp =0 ;
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +2 -2
@@ -1298,10 +1298,10 @@ static void dce_v8_0_audio_write_sad_reg } sad_count =drm_edid_to_sad (amdgpu_connector_edid (connector), &sads); -if (sad_count <=0 ) { +if (sad_count <0 )DRM_ERROR ("Couldn't read SADs: %d\n" , sad_count); +if (sad_count <=0 )return ; - }BUG_ON (!sads);for (i =0 ; i <ARRAY_SIZE (eld_reg_to_type); i++) {
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +3 -4
@@ -98,11 +98,10 @@ enum dc_edid_status dm_helpers_parse_edi (struct edid *) edid->raw_edid); sad_count =drm_edid_to_sad ((struct edid *) edid->raw_edid, &sads); -if (sad_count <=0 ) { -DRM_INFO ("SADs count is: %d, don't need to read it\n" , - sad_count); +if (sad_count <0 ) +DRM_ERROR ("Couldn't read SADs: %d\n" , sad_count); +if (sad_count <=0 )return result; - } edid_caps->audio_mode_count = sad_count <DC_MAX_AUDIO_DESC_COUNT ? sad_count :DC_MAX_AUDIO_DESC_COUNT ;for (i =0 ; i < edid_caps->audio_mode_count; ++i) {
Signature · 6 lines
Jean Delvare SUSE L3 Support _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 2/3 drm/radeon: be quiet when no SAD block is found
In reply to Jean DelvareIt is fine for displays without audio functionality to not provide any SAD block in their EDID. Do not log an error in that case, just return quietly.
Inspired by a similar fix to the amdgpu driver in the context of bug fdo#107825:
https://bugs.freedesktop.org/show_bug.cgi?id=107825
---
Changes since v1:
* Fixed subject
drivers/gpu/drm/radeon/radeon_audio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/radeon/radeon_audio.c +2 -2
@@ -367,10 +367,10 @@ static void radeon_audio_write_sad_regs(return ; sad_count =drm_edid_to_sad (radeon_connector_edid (connector), &sads); -if (sad_count <=0 ) { +if (sad_count <0 )DRM_ERROR ("Couldn't read SADs: %d\n" , sad_count); +if (sad_count <=0 )return ; - }BUG_ON (!sads);if (radeon_encoder->audio && radeon_encoder->audio->write_sad_regs)
Signature · 6 lines
Jean Delvare SUSE L3 Support _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v2 3/3 drm/edid: no CEA v3 extension is not an error
In reply to Jean DelvareIt is fine for displays without audio functionality to not implement CEA v3 extension in their EDID. Do not return an error in that case, instead return 0 as if there was a CEA v3 extension with no audio or speaker block.
This fixes half of bug fdo#107825:
https://bugs.freedesktop.org/show_bug.cgi?id=107825
---
Changes since v1:
* Treat CEA extension version < 3 as non-error too (suggested by Ville Syrjälä)
drivers/gpu/drm/drm_edid.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/drm_edid.c +4 -4
@@ -4130,12 +4130,12 @@ int drm_edid_to_sad(struct edid *edid, s cea =drm_find_cea_extension (edid);if (!cea) {DRM_DEBUG_KMS ("SAD: no CEA Extension found\n" ); -return -ENOENT ; +return 0 ; }if (cea_revision (cea) <3 ) {DRM_DEBUG_KMS ("SAD: wrong CEA revision\n" ); -return -ENOTSUPP ; +return 0 ; }if (cea_db_offsets (cea, &start, &end)) {
@@ -4191,12 +4191,12 @@ int drm_edid_to_speaker_allocation(struc cea =drm_find_cea_extension (edid);if (!cea) {DRM_DEBUG_KMS ("SAD: no CEA Extension found\n" ); -return -ENOENT ; +return 0 ; }if (cea_revision (cea) <3 ) {DRM_DEBUG_KMS ("SAD: wrong CEA revision\n" ); -return -ENOTSUPP ; +return 0 ; }if (cea_db_offsets (cea, &start, &end)) {
Signature · 6 lines
Jean Delvare SUSE L3 Support _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 1/3] drm/amd: be quiet when no SAD block is found
In reply to Jean DelvareQuoted 7 lines · Jean Delvare
It is fine for displays without audio functionality to not provide any SAD block in their EDID. Do not log an error in that case, just return quietly.
This fixes half of bug fdo#107825:
https://bugs.freedesktop.org/show_bug.cgi?id=107825
Quoted 8 lines
Signed-off-by Jean Delvare <[email protected]>Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc "David (ChunMing) Zhou" <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Harry Wentland <[email protected]>Cc Leo Li <[email protected]>
Harry
Quoted 78 lines
---
No change since v1.drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 ++-- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 7 +++---- 5 files changed, 11 insertions(+), 12 deletions(-)drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +2
-2@@ -1345,10 +1345,10 @@ static void dce_v10_0_audio_write_sad_re } sad_count =drm_edid_to_sad (amdgpu_connector_edid (connector), &sads); -if (sad_count <=0 ) { +if (sad_count <0 )DRM_ERROR ("Couldn't read SADs: %d\n" , sad_count); +if (sad_count <=0 )return ; - }BUG_ON (!sads);for (i =0 ; i <ARRAY_SIZE (eld_reg_to_type); i++) {drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +2
-2@@ -1371,10 +1371,10 @@ static void dce_v11_0_audio_write_sad_re } sad_count =drm_edid_to_sad (amdgpu_connector_edid (connector), &sads); -if (sad_count <=0 ) { +if (sad_count <0 )DRM_ERROR ("Couldn't read SADs: %d\n" , sad_count); +if (sad_count <=0 )return ; - }BUG_ON (!sads);for (i =0 ; i <ARRAY_SIZE (eld_reg_to_type); i++) {drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +2
-2@@ -1248,10 +1248,10 @@ static void dce_v6_0_audio_write_sad_reg } sad_count =drm_edid_to_sad (amdgpu_connector_edid (connector), &sads); -if (sad_count <=0 ) { +if (sad_count <0 )DRM_ERROR ("Couldn't read SADs: %d\n" , sad_count); +if (sad_count <=0 )return ; - }for (i =0 ; i <ARRAY_SIZE (eld_reg_to_type); i++) {u32 tmp =0 ;drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +2
-2@@ -1298,10 +1298,10 @@ static void dce_v8_0_audio_write_sad_reg } sad_count =drm_edid_to_sad (amdgpu_connector_edid (connector), &sads); -if (sad_count <=0 ) { +if (sad_count <0 )DRM_ERROR ("Couldn't read SADs: %d\n" , sad_count); +if (sad_count <=0 )return ; - }BUG_ON (!sads);for (i =0 ; i <ARRAY_SIZE (eld_reg_to_type); i++) {drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +0
-1@@ -98,11 +98,10 @@ enum dc_edid_status dm_helpers_parse_edi (struct edid *) edid->raw_edid); sad_count =drm_edid_to_sad ((struct edid *) edid->raw_edid, &sads); -if (sad_count <=0 ) {
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c enum dc_edid_status dm_helpers_parse_edi · line 107
Quoted 10 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +3
-3-DRM_INFO ("SADs count is: %d, don't need to read it\n" , - sad_count); +if (sad_count <0 ) +DRM_ERROR ("Couldn't read SADs: %d\n" , sad_count); +if (sad_count <=0 )return result; - } edid_caps->audio_mode_count = sad_count <DC_MAX_AUDIO_DESC_COUNT ? sad_count :DC_MAX_AUDIO_DESC_COUNT ;for (i =0 ; i < edid_caps->audio_mode_count; ++i) {
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH v2 1/3] drm/amd: be quiet when no SAD block is found
Quoted 18 lines · Harry Wentland
Quoted 7 lines · Jean Delvare
It is fine for displays without audio functionality to not provide any SAD block in their EDID. Do not log an error in that case, just return quietly.
This fixes half of bug fdo#107825:
https://bugs.freedesktop.org/show_bug.cgi?id=107825Quoted 8 lines
Signed-off-by Jean Delvare <[email protected]>Cc Alex Deucher <[email protected]>Cc "Christian König" <[email protected]>Cc "David (ChunMing) Zhou" <[email protected]>Cc David Airlie <[email protected]>Cc Daniel Vetter <[email protected]>Cc Harry Wentland <[email protected]>Cc Leo Li <[email protected]>
Quoted 1 line
Reviewed-by Harry Wentland <[email protected]>
Patches 1 and 2 applied.
Thanks!
Alex
Quoted 88 lines
Harry
Quoted 85 lines
---
No change since v1.drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 ++-- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 7 +++---- 5 files changed, 11 insertions(+), 12 deletions(-)drivers/gpu/drm/amd/amdgpu/dce_v10_0.c 2019-08-30 14:28:46.081682223 +0200 renamed from drivers/gpu/drm/amd/amdgpu/dce_v10_0.c 2019-07-08 00:41:56.000000000 +0200 +2
-2@@ -1345,10 +1345,10 @@ static void dce_v10_0_audio_write_sad_re } sad_count = drm_edid_to_sad(amdgpu_connector_edid(connector), &sads); - if (sad_count <= 0) { + if (sad_count < 0) DRM_ERROR("Couldn't read SADs: %d\n", sad_count); + if (sad_count <= 0) return; - } BUG_ON(!sads); for (i = 0; i < ARRAY_SIZE(eld_reg_to_type); i++) {drivers/gpu/drm/amd/amdgpu/dce_v11_0.c 2019-08-30 14:29:27.276205310 +0200 renamed from drivers/gpu/drm/amd/amdgpu/dce_v11_0.c 2019-07-08 00:41:56.000000000 +0200 +2
-2@@ -1371,10 +1371,10 @@ static void dce_v11_0_audio_write_sad_re } sad_count = drm_edid_to_sad(amdgpu_connector_edid(connector), &sads); - if (sad_count <= 0) { + if (sad_count < 0) DRM_ERROR("Couldn't read SADs: %d\n", sad_count); + if (sad_count <= 0) return; - } BUG_ON(!sads); for (i = 0; i < ARRAY_SIZE(eld_reg_to_type); i++) {drivers/gpu/drm/amd/amdgpu/dce_v6_0.c 2019-08-30 17:58:53.613953458 +0200 renamed from drivers/gpu/drm/amd/amdgpu/dce_v6_0.c 2019-07-08 00:41:56.000000000 +0200 +2
-2@@ -1248,10 +1248,10 @@ static void dce_v6_0_audio_write_sad_reg } sad_count = drm_edid_to_sad(amdgpu_connector_edid(connector), &sads); - if (sad_count <= 0) { + if (sad_count < 0) DRM_ERROR("Couldn't read SADs: %d\n", sad_count); + if (sad_count <= 0) return; - } for (i = 0; i < ARRAY_SIZE(eld_reg_to_type); i++) { u32 tmp = 0;drivers/gpu/drm/amd/amdgpu/dce_v8_0.c 2019-08-30 14:29:01.948883708 +0200 renamed from drivers/gpu/drm/amd/amdgpu/dce_v8_0.c 2019-07-08 00:41:56.000000000 +0200 +2
-2@@ -1298,10 +1298,10 @@ static void dce_v8_0_audio_write_sad_reg } sad_count = drm_edid_to_sad(amdgpu_connector_edid(connector), &sads); - if (sad_count <= 0) { + if (sad_count < 0) DRM_ERROR("Couldn't read SADs: %d\n", sad_count); + if (sad_count <= 0) return; - } BUG_ON(!sads); for (i = 0; i < ARRAY_SIZE(eld_reg_to_type); i++) {drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c 2019-08-30 14:31:03.086421910 +0200 renamed from drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c 2019-07-08 00:41:56.000000000 +0200 +3
-4@@ -98,11 +98,10 @@ enum dc_edid_status dm_helpers_parse_edi (struct edid *) edid->raw_edid); sad_count = drm_edid_to_sad((struct edid *) edid->raw_edid, &sads); - if (sad_count <= 0) { - DRM_INFO("SADs count is: %d, don't need to read it\n", - sad_count); + if (sad_count < 0) + DRM_ERROR("Couldn't read SADs: %d\n", sad_count); + if (sad_count <= 0) return result; - }
Quoted 7 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c 2019-08-30 14:31:03.086421910 +0200 enum dc_edid_status dm_helpers_parse_edi · line 107
Quoted 3 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c 2019-08-30 14:31:03.086421910 +0200 renamed from drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c 2019-07-08 00:41:56.000000000 +0200 +0
-0edid_caps->audio_mode_count = sad_count < DC_MAX_AUDIO_DESC_COUNT ? sad_count : DC_MAX_AUDIO_DESC_COUNT; for (i = 0; i < edid_caps->audio_mode_count; ++i) {_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel