Skip to contentSkip to conversation

drm/amdgpu/display: fix warning when CONFIG_DRM_AMD_DC_DCN is not set

PATCH In review Alex Deucher 2 participants 2 messages Nov 8, 2019 1 message not in the archive

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amdgpu/display: fix warning when CONFIG_DRM_AMD_DC_DCN is not set

dm_dcn_crtc_high_irq() is only used when CONFIG_DRM_AMD_DC_DCN is set.

---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +2 -1
index d2c236946909..ef40adf187f6 100644
@@ -485,7 +485,7 @@ static void dm_crtc_high_irq(void *interrupt_params)
 	}
 }
 
-
+#if defined(CONFIG_DRM_AMD_DC_DCN)
 /**
  * dm_dcn_crtc_high_irq() - Handles VStartup interrupt for DCN generation ASICs
  * @interrupt params - interrupt parameters
@@ -547,6 +547,7 @@ static void dm_dcn_crtc_high_irq(void *interrupt_params)
 
 	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
 }
+#endif
 
 static int dm_set_clockgating_state(void *handle,
 		  enum amd_clockgating_state state)
Signature · 6 lines
2.23.0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 20191108162425.2150451-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org

Reviewed-by Nicholas Kazlauskas
#2 lore raw
Quoted 3 lines · Alex Deucher

dm_dcn_crtc_high_irq() is only used when CONFIG_DRM_AMD_DC_DCN is set.

Thanks!

Quoted 19 lines
---
  drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -1
index d2c236946909..ef40adf187f6 100644
@@ -485,7 +485,7 @@ static void dm_crtc_high_irq(void *interrupt_params)
  	}
  }
 
-
+#if defined(CONFIG_DRM_AMD_DC_DCN)
  /**
   * dm_dcn_crtc_high_irq() - Handles VStartup interrupt for DCN generation ASICs
   * @interrupt params - interrupt parameters

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c static void dm_dcn_crtc_high_irq(void *interrupt_params) · line 553

Quoted 7 lines
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +1 -0
@@ -547,6 +547,7 @@ static void dm_dcn_crtc_high_irq(void *interrupt_params)
 
  	spin_unlock_irqrestore(&adev->ddev->event_lock, flags);
  }
+#endif
 
  static int dm_set_clockgating_state(void *handle,
  		  enum amd_clockgating_state state)

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx