From: Alex Hung <alex.h...@amd.com>

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

Fixes: 310b5f1a3c9e ("drm/amd/display: Revert "drm/amd/display: Use 
drm_connector in create_validate_stream_for_sink"")
Signed-off-by: Alex Hung <alex.h...@amd.com>
Reviewed-by: Harry Wentland <harry.wentl...@amd.com>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 09ce6de09039..eb9f9d77127a 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -6658,6 +6658,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);
@@ -9406,7 +9409,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 */
-- 
2.42.0

Reply via email to