drm/amd/display: Check writeback connectors in create_validate_stream_for_sink

[ Upstream commit dbf5d3d02987faa0eec3710dd687cd912362d7b5 ]

[WHY & HOW]
This is to check connector type to avoid
unhandled null pointer for writeback connectors.

Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Fixes: 60e034f28600 ("drm/amd/display: Revert "drm/amd/display: Use drm_connector in create_validate_stream_for_sink"")
Signed-off-by: Alex Hung <alex.hung@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

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 beacda24b4ef80c91ac32bd5af152ae5a128652a..a9bd020b165a14ffcf060cb8f21a671bcf453a7d 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -6649,6 +6649,9 @@ create_validate_stream_for_sink(struct amdgpu_dm_connector *aconnector,
                        break;
                }
 
+               if (aconnector->base.connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
+                       return stream;
+
                dc_result = dc_validate_stream(adev->dm.dc, stream);
                if (dc_result == DC_OK && stream->signal == SIGNAL_TYPE_DISPLAY_PORT_MST)
                        dc_result = dm_dp_mst_is_port_support_mode(aconnector, stream);
@@ -9373,7 +9376,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm,
        dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);
        acrtc = to_amdgpu_crtc(crtc);
        connector = amdgpu_dm_find_first_crtc_matching_connector(state, crtc);
-       if (connector && connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK)
+       if (connector)
                aconnector = to_amdgpu_dm_connector(connector);
 
        /* TODO This hack should go away */