From: Harry Wentland Date: Wed, 29 Oct 2025 14:28:14 +0000 (-0400) Subject: drm/amd/display: Fix null pointer on analog detection X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5e55fd9bc6bd5098ba963f6b3118549f2621bca5;p=thirdparty%2Fkernel%2Flinux.git drm/amd/display: Fix null pointer on analog detection Check if we have an amdgpu_dm_connector->dc_sink first before adding common modes for analog outputs. If we don't have a sink yet we can safely skip this. Fixes: 70181ad96ec2 ("drm/amd/display: Add common modes to analog displays without EDID") Signed-off-by: Harry Wentland Reviewed-by: Timur Kristóf Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index bb0fe91a16010..b798154768c85 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -8690,7 +8690,7 @@ static int amdgpu_dm_connector_get_modes(struct drm_connector *connector) amdgpu_dm_connector->num_modes += drm_add_modes_noedid(connector, 1920, 1080); - if (amdgpu_dm_connector->dc_sink->edid_caps.analog) { + if (amdgpu_dm_connector->dc_sink && amdgpu_dm_connector->dc_sink->edid_caps.analog) { /* Analog monitor connected by DAC load detection. * Add common modes. It will be up to the user to select one that works. */