[4/4] drm/i915: only call intel_prepare_ddi if HAS_DDI

Commit Message

Paulo Zanoni Nov. 23, 2012, 5:30 p.m. UTC

From: Paulo Zanoni <[e-mail]>

In other words, move the check from inside the function to outside it.

Signed-off-by: Paulo Zanoni <[e-mail]>
---
 drivers/gpu/drm/i915/intel_ddi.c     | 16 +++++++---------
 drivers/gpu/drm/i915/intel_display.c |  3 ++-
 2 files changed, 9 insertions(+), 10 deletions(-)

Comments

Chris Wilson Nov. 23, 2012, 5:54 p.m. UTC | #1

On Fri, 23 Nov 2012 15:30:40 -0200, Paulo Zanoni <[e-mail]> wrote:
> From: Paulo Zanoni <[e-mail]>
> 
> In other words, move the check from inside the function to outside it.

Don't agree with this last step. You can make the function tidier with
an early return, but it is paramount that the high level sequence inside
intel_modeset_init_hw() be clear and comprehendable.
-Chris

Patch

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index 197dede..e53e6fb 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -115,16 +115,14 @@  void intel_prepare_ddi(struct drm_device *dev)
 {
 	int port;
 
-	if (HAS_DDI(dev)) {
-		for (port = PORT_A; port < PORT_E; port++)
-			intel_prepare_ddi_buffers(dev, port, false);
+	for (port = PORT_A; port < PORT_E; port++)
+		intel_prepare_ddi_buffers(dev, port, false);
 
-		/* DDI E is the suggested one to work in FDI mode, so program is as such by
-		 * default. It will have to be re-programmed in case a digital DP output
-		 * will be detected on it
-		 */
-		intel_prepare_ddi_buffers(dev, PORT_E, true);
-	}
+	/* DDI E is the suggested one to work in FDI mode, so program is as such
+	 * by default. It will have to be re-programmed in case a digital DP
+	 * output will be detected on it
+	 */
+	intel_prepare_ddi_buffers(dev, PORT_E, true);
 }
 
 static const long hsw_ddi_buf_ctl_values[] = {
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index d887cbc..2c3932e 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -8742,7 +8742,8 @@  void intel_modeset_init_hw(struct drm_device *dev)
 	 */
 	intel_init_power_wells(dev);
 
-	intel_prepare_ddi(dev);
+	if (HAS_DDI(dev))
+		intel_prepare_ddi(dev);
 
 	intel_init_clock_gating(dev);