Merge tag 'drm-xe-next-2023-12-21-pr1-1' of https://gitlab.freedesktop.org/drm/xe...

[linux.git] / drivers / gpu / drm / amd / display / amdgpu_dm / amdgpu_dm_irq.c

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
index 51467f132c2604a81ea5cc2e9e30e408d9c2cb38..58b880acb087ae73352e9ac487d5ccd033f03f4d 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c
@@ -894,10 +894,15 @@ void amdgpu_dm_hpd_init(struct amdgpu_device *adev)
 
        drm_connector_list_iter_begin(dev, &iter);
        drm_for_each_connector_iter(connector, &iter) {
-               struct amdgpu_dm_connector *amdgpu_dm_connector =
-                               to_amdgpu_dm_connector(connector);
+               struct amdgpu_dm_connector *amdgpu_dm_connector;
+               const struct dc_link *dc_link;
 
-               const struct dc_link *dc_link = amdgpu_dm_connector->dc_link;
+               if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
+                       continue;
+
+               amdgpu_dm_connector = to_amdgpu_dm_connector(connector);
+
+               dc_link = amdgpu_dm_connector->dc_link;
 
                if (dc_link->irq_source_hpd != DC_IRQ_SOURCE_INVALID) {
                        dc_interrupt_set(adev->dm.dc,
@@ -930,9 +935,14 @@ void amdgpu_dm_hpd_fini(struct amdgpu_device *adev)
 
        drm_connector_list_iter_begin(dev, &iter);
        drm_for_each_connector_iter(connector, &iter) {
-               struct amdgpu_dm_connector *amdgpu_dm_connector =
-                               to_amdgpu_dm_connector(connector);
-               const struct dc_link *dc_link = amdgpu_dm_connector->dc_link;
+               struct amdgpu_dm_connector *amdgpu_dm_connector;
+               const struct dc_link *dc_link;
+
+               if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK)
+                       continue;
+
+               amdgpu_dm_connector = to_amdgpu_dm_connector(connector);
+               dc_link = amdgpu_dm_connector->dc_link;
 
                if (dc_link->irq_source_hpd != DC_IRQ_SOURCE_INVALID) {
                        dc_interrupt_set(adev->dm.dc,