[PATCH v2 0/3] drm/edid: don't log errors on absent or old CEA SAD blocks

List overview All Threads
Download

newer

older

Re: drm/amdgpu: remove the...

[PATCH] drm/v3d: clean caches at...

Jean Delvare

4 Sep 2019 4 Sep '19

9:11 a.m.

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ä)

-- Jean Delvare SUSE L3 Support

Show replies by date

Jean Delvare

4 Sep 4 Sep

9:12 a.m.

New subject: [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

Signed-off-by: Jean Delvare jdelvare@suse.de Cc: Alex Deucher alexander.deucher@amd.com Cc: "Christian König" christian.koenig@amd.com Cc: "David (ChunMing) Zhou" David1.Zhou@amd.com Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel@ffwll.ch Cc: Harry Wentland harry.wentland@amd.com Cc: Leo Li sunpeng.li@amd.com --- 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(-)

--- linux-5.2.orig/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c 2019-07-08 00:41:56.000000000 +0200 +++ linux-5.2/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c 2019-08-30 14:28:46.081682223 +0200 @@ -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++) { --- linux-5.2.orig/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c 2019-07-08 00:41:56.000000000 +0200 +++ linux-5.2/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c 2019-08-30 14:29:27.276205310 +0200 @@ -1371,10 +1371,10 @@ static void dce_v11_0_audio_write_sad_re }

for (i = 0; i < ARRAY_SIZE(eld_reg_to_type); i++) { --- linux-5.2.orig/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c 2019-07-08 00:41:56.000000000 +0200 +++ linux-5.2/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c 2019-08-30 17:58:53.613953458 +0200 @@ -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; --- linux-5.2.orig/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c 2019-07-08 00:41:56.000000000 +0200 +++ linux-5.2/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c 2019-08-30 14:29:01.948883708 +0200 @@ -1298,10 +1298,10 @@ static void dce_v8_0_audio_write_sad_reg }

for (i = 0; i < ARRAY_SIZE(eld_reg_to_type); i++) { --- linux-5.2.orig/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c 2019-07-08 00:41:56.000000000 +0200 +++ linux-5.2/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c 2019-08-30 14:31:03.086421910 +0200 @@ -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) {

-- Jean Delvare SUSE L3 Support

Harry Wentland

1:18 p.m.

New subject: [PATCH v2 1/3] drm/amd: be quiet when no SAD block is found

On 2019-09-04 5:12 a.m., Jean Delvare wrote:

...

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

Signed-off-by: Jean Delvare jdelvare@suse.de Cc: Alex Deucher alexander.deucher@amd.com Cc: "Christian König" christian.koenig@amd.com Cc: "David (ChunMing) Zhou" David1.Zhou@amd.com Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel@ffwll.ch Cc: Harry Wentland harry.wentland@amd.com Cc: Leo Li sunpeng.li@amd.com

Reviewed-by: Harry Wentland harry.wentland@amd.com

Harry

...

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(-)

--- linux-5.2.orig/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c 2019-07-08 00:41:56.000000000 +0200 +++ linux-5.2/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c 2019-08-30 14:28:46.081682223 +0200 @@ -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++) {

--- linux-5.2.orig/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c 2019-07-08 00:41:56.000000000 +0200 +++ linux-5.2/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c 2019-08-30 14:29:27.276205310 +0200 @@ -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++) {

--- linux-5.2.orig/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c 2019-07-08 00:41:56.000000000 +0200 +++ linux-5.2/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c 2019-08-30 17:58:53.613953458 +0200 @@ -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;

--- linux-5.2.orig/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c 2019-07-08 00:41:56.000000000 +0200 +++ linux-5.2/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c 2019-08-30 14:29:01.948883708 +0200 @@ -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++) {

--- linux-5.2.orig/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c 2019-07-08 00:41:56.000000000 +0200 +++ linux-5.2/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c 2019-08-30 14:31:03.086421910 +0200 @@ -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) {

Alex Deucher

13 Sep 13 Sep

8:51 p.m.

New subject: [PATCH v2 1/3] drm/amd: be quiet when no SAD block is found

On Wed, Sep 4, 2019 at 9:18 AM Harry Wentland hwentlan@amd.com wrote:

...

On 2019-09-04 5:12 a.m., Jean Delvare wrote:

...
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

Signed-off-by: Jean Delvare jdelvare@suse.de Cc: Alex Deucher alexander.deucher@amd.com Cc: "Christian König" christian.koenig@amd.com Cc: "David (ChunMing) Zhou" David1.Zhou@amd.com Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel@ffwll.ch Cc: Harry Wentland harry.wentland@amd.com Cc: Leo Li sunpeng.li@amd.com

Reviewed-by: Harry Wentland harry.wentland@amd.com

Patches 1 and 2 applied.

Thanks!

Alex

...

Harry

...
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(-)

--- linux-5.2.orig/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c 2019-07-08 00:41:56.000000000 +0200 +++ linux-5.2/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c 2019-08-30 14:28:46.081682223 +0200 @@ -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++) {
--- linux-5.2.orig/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c 2019-07-08 00:41:56.000000000 +0200 +++ linux-5.2/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c 2019-08-30 14:29:27.276205310 +0200 @@ -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++) {
--- linux-5.2.orig/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c 2019-07-08 00:41:56.000000000 +0200 +++ linux-5.2/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c 2019-08-30 17:58:53.613953458 +0200 @@ -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;
--- linux-5.2.orig/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c 2019-07-08 00:41:56.000000000 +0200 +++ linux-5.2/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c 2019-08-30 14:29:01.948883708 +0200 @@ -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++) {
--- linux-5.2.orig/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c 2019-07-08 00:41:56.000000000 +0200 +++ linux-5.2/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c 2019-08-30 14:31:03.086421910 +0200 @@ -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) {
amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx

Jean Delvare

4 Sep 4 Sep

9:13 a.m.

New subject: [PATCH v2 2/3] drm/radeon: 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.

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

drivers/gpu/drm/radeon/radeon_audio.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

--- linux-5.2.orig/drivers/gpu/drm/radeon/radeon_audio.c 2019-08-30 18:04:15.125056697 +0200 +++ linux-5.2/drivers/gpu/drm/radeon/radeon_audio.c 2019-08-30 18:04:35.078311347 +0200 @@ -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)

-- Jean Delvare SUSE L3 Support

Jean Delvare

9:14 a.m.

New subject: [PATCH v2 3/3] drm/edid: no CEA v3 extension is not an error

It 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

Signed-off-by: Jean Delvare jdelvare@suse.de Reviewed-by: Ville Syrjälä ville.syrjala@linux.intel.com Cc: Maarten Lankhorst maarten.lankhorst@linux.intel.com Cc: Maxime Ripard maxime.ripard@bootlin.com Cc: Sean Paul sean@poorly.run Cc: David Airlie airlied@linux.ie Cc: Daniel Vetter daniel@ffwll.ch --- 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(-)

--- linux-5.2.orig/drivers/gpu/drm/drm_edid.c 2019-09-02 10:21:01.495525663 +0200 +++ linux-5.2/drivers/gpu/drm/drm_edid.c 2019-09-04 10:33:51.080273331 +0200 @@ -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)) {

-- Jean Delvare SUSE L3 Support

2063

Age (days ago)

2072

Last active (days ago)

dri-devel@lists.freedesktop.org

5 comments

3 participants

tags (0)

participants (3)

Alex Deucher
Harry Wentland
Jean Delvare