All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mahesh Kumar <mahesh1.kumar@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@intel.com>,
	Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [PATCH v4] drm/i915: use for_each_pipe loop to assign crtc_mask
Date: Sat,  8 Sep 2018 11:40:48 +0530	[thread overview]
Message-ID: <20180908061048.29214-1-mahesh1.kumar@intel.com> (raw)
In-Reply-To: <20180907144957.GI5565@intel.com>

This cleanup patch makes changes to use for_each_pipe loop
during bit-mask assignment of allowed crtc with encoder.

changes:
 - use BIT(i) macro instead of (1 << i) (Chris)
changes from V2:
 - use int for consistency (Jani)
changes from V3:
 - instead use enum pipe (Ville)

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Mahesh Kumar <mahesh1.kumar@intel.com>
---
 drivers/gpu/drm/i915/intel_ddi.c  | 4 +++-
 drivers/gpu/drm/i915/intel_dp.c   | 5 ++++-
 drivers/gpu/drm/i915/intel_hdmi.c | 5 ++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_ddi.c b/drivers/gpu/drm/i915/intel_ddi.c
index cd01a09c5e0f..0ef2448fd350 100644
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@ -3751,6 +3751,7 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
 	struct intel_encoder *intel_encoder;
 	struct drm_encoder *encoder;
 	bool init_hdmi, init_dp, init_lspcon = false;
+	enum pipe pipe;
 
 
 	init_hdmi = (dev_priv->vbt.ddi_port_info[port].supports_dvi ||
@@ -3801,8 +3802,9 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
 	intel_encoder->type = INTEL_OUTPUT_DDI;
 	intel_encoder->power_domain = intel_port_to_power_domain(port);
 	intel_encoder->port = port;
-	intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
 	intel_encoder->cloneable = 0;
+	for_each_pipe(dev_priv, pipe)
+		intel_encoder->crtc_mask |= BIT(pipe);
 
 	if (INTEL_GEN(dev_priv) >= 11)
 		intel_dig_port->saved_port_bits = I915_READ(DDI_BUF_CTL(port)) &
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 436c22de33b6..7302b5807884 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -6709,7 +6709,10 @@ bool intel_dp_init(struct drm_i915_private *dev_priv,
 		else
 			intel_encoder->crtc_mask = (1 << 0) | (1 << 1);
 	} else {
-		intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
+		enum pipe pipe;
+
+		for_each_pipe(dev_priv, pipe)
+			intel_encoder->crtc_mask |= BIT(pipe);
 	}
 	intel_encoder->cloneable = 0;
 	intel_encoder->port = port;
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index a2dab0b6bde6..0d4c6f565d65 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -2468,7 +2468,10 @@ void intel_hdmi_init(struct drm_i915_private *dev_priv,
 		else
 			intel_encoder->crtc_mask = (1 << 0) | (1 << 1);
 	} else {
-		intel_encoder->crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
+		enum pipe pipe;
+
+		for_each_pipe(dev_priv, pipe)
+			intel_encoder->crtc_mask |= BIT(pipe);
 	}
 	intel_encoder->cloneable = 1 << INTEL_OUTPUT_ANALOG;
 	/*
-- 
2.16.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2018-09-08  6:09 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-07 12:40 [PATCH] drm/i915: use for_each_pipe loop to assign crtc_mask Mahesh Kumar
2018-09-07 12:45 ` Chris Wilson
2018-09-07 12:59   ` [PATCH v2] " Mahesh Kumar
2018-09-07 13:04     ` Jani Nikula
2018-09-07 13:11       ` Kumar, Mahesh
2018-09-07 13:34         ` [PATCH v3] " Mahesh Kumar
2018-09-07 14:49       ` [PATCH v2] " Ville Syrjälä
2018-09-08  6:10         ` Mahesh Kumar [this message]
2018-09-14  6:28           ` [PATCH v4] " Kumar, Mahesh
2018-09-14 12:38           ` Ville Syrjälä
2018-09-19  8:31             ` [PATCH v5] " Mahesh Kumar
2018-09-21 19:14               ` Lucas De Marchi
2018-09-25  9:21                 ` Jani Nikula
2018-09-10  9:04         ` [PATCH v2] " Jani Nikula
2018-09-07 13:25 ` ✓ Fi.CI.BAT: success for drm/i915: use for_each_pipe loop to assign crtc_mask (rev2) Patchwork
2018-09-07 14:03 ` ✓ Fi.CI.BAT: success for drm/i915: use for_each_pipe loop to assign crtc_mask (rev3) Patchwork
2018-09-07 15:50 ` ✓ Fi.CI.IGT: " Patchwork
2018-09-08  6:43 ` ✓ Fi.CI.BAT: success for drm/i915: use for_each_pipe loop to assign crtc_mask (rev4) Patchwork
2018-09-08  7:32 ` ✓ Fi.CI.IGT: " Patchwork
2018-09-19  9:36 ` ✓ Fi.CI.BAT: success for drm/i915: use for_each_pipe loop to assign crtc_mask (rev5) Patchwork
2018-09-19 11:55 ` ✓ Fi.CI.IGT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180908061048.29214-1-mahesh1.kumar@intel.com \
    --to=mahesh1.kumar@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=jani.nikula@intel.com \
    --cc=rodrigo.vivi@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.