drm/radeon: be quiet when no SAD block is found
authorJean Delvare <jdelvare@suse.de>
Wed, 4 Sep 2019 09:13:37 +0000 (11:13 +0200)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 16 Sep 2019 15:42:56 +0000 (10:42 -0500)
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

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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/radeon/radeon_audio.c

index b9aea57..72db2b4 100644 (file)
@@ -367,10 +367,10 @@ static void radeon_audio_write_sad_regs(struct drm_encoder *encoder)
                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)