All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH v2 05/10] drm/i915: Pass intel_crtc to ironlake_fdi_disable()
Date: Mon, 18 Nov 2019 18:44:25 +0200	[thread overview]
Message-ID: <20191118164430.27265-6-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20191118164430.27265-1-ville.syrjala@linux.intel.com>

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Switch to intel_crtc from drm_crtc.

Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 084f94ec79a4..c873c85a69a7 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -5061,12 +5061,10 @@ static void ironlake_fdi_pll_disable(struct intel_crtc *intel_crtc)
 	udelay(100);
 }
 
-static void ironlake_fdi_disable(struct drm_crtc *crtc)
+static void ironlake_fdi_disable(struct intel_crtc *crtc)
 {
-	struct drm_device *dev = crtc->dev;
-	struct drm_i915_private *dev_priv = to_i915(dev);
-	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-	enum pipe pipe = intel_crtc->pipe;
+	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
+	enum pipe pipe = crtc->pipe;
 	i915_reg_t reg;
 	u32 temp;
 
@@ -6772,7 +6770,7 @@ static void ironlake_crtc_disable(struct intel_crtc_state *old_crtc_state,
 	ironlake_pfit_disable(old_crtc_state);
 
 	if (old_crtc_state->has_pch_encoder)
-		ironlake_fdi_disable(crtc);
+		ironlake_fdi_disable(intel_crtc);
 
 	intel_encoders_post_disable(state, intel_crtc);
 
-- 
2.23.0

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

WARNING: multiple messages have this Message-ID (diff)
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH v2 05/10] drm/i915: Pass intel_crtc to ironlake_fdi_disable()
Date: Mon, 18 Nov 2019 18:44:25 +0200	[thread overview]
Message-ID: <20191118164430.27265-6-ville.syrjala@linux.intel.com> (raw)
Message-ID: <20191118164425.XnPsBIsryAae3p_89Y8Ydtfb2foU_cWoCNl8wHIydkg@z> (raw)
In-Reply-To: <20191118164430.27265-1-ville.syrjala@linux.intel.com>

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

Switch to intel_crtc from drm_crtc.

Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 084f94ec79a4..c873c85a69a7 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -5061,12 +5061,10 @@ static void ironlake_fdi_pll_disable(struct intel_crtc *intel_crtc)
 	udelay(100);
 }
 
-static void ironlake_fdi_disable(struct drm_crtc *crtc)
+static void ironlake_fdi_disable(struct intel_crtc *crtc)
 {
-	struct drm_device *dev = crtc->dev;
-	struct drm_i915_private *dev_priv = to_i915(dev);
-	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-	enum pipe pipe = intel_crtc->pipe;
+	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
+	enum pipe pipe = crtc->pipe;
 	i915_reg_t reg;
 	u32 temp;
 
@@ -6772,7 +6770,7 @@ static void ironlake_crtc_disable(struct intel_crtc_state *old_crtc_state,
 	ironlake_pfit_disable(old_crtc_state);
 
 	if (old_crtc_state->has_pch_encoder)
-		ironlake_fdi_disable(crtc);
+		ironlake_fdi_disable(intel_crtc);
 
 	intel_encoders_post_disable(state, intel_crtc);
 
-- 
2.23.0

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

  parent reply	other threads:[~2019-11-18 16:44 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-18 16:44 [PATCH v2 00/10] drm/i915: Cleanups around .crtc_enable/disable() Ville Syrjala
2019-11-18 16:44 ` [Intel-gfx] " Ville Syrjala
2019-11-18 16:44 ` [PATCH v2 01/10] drm/i915: Change intel_encoders_<hook>() calling convention Ville Syrjala
2019-11-18 16:44   ` [Intel-gfx] " Ville Syrjala
2019-11-18 16:44 ` [PATCH v2 02/10] drm/i915: Add intel_crtc_vblank_off() Ville Syrjala
2019-11-18 16:44   ` [Intel-gfx] " Ville Syrjala
2019-11-18 16:44 ` [PATCH v2 03/10] drm/i915: Move assert_vblank_disabled() into intel_crtc_vblank_on() Ville Syrjala
2019-11-18 16:44   ` [Intel-gfx] " Ville Syrjala
2019-11-18 16:44 ` [PATCH v2 04/10] drm/i915: Move crtc_state to tighter scope Ville Syrjala
2019-11-18 16:44   ` [Intel-gfx] " Ville Syrjala
2019-11-18 16:44 ` Ville Syrjala [this message]
2019-11-18 16:44   ` [Intel-gfx] [PATCH v2 05/10] drm/i915: Pass intel_crtc to ironlake_fdi_disable() Ville Syrjala
2019-11-18 16:44 ` [PATCH v2 06/10] drm/i915: Change watermark hook calling convention Ville Syrjala
2019-11-18 16:44   ` [Intel-gfx] " Ville Syrjala
2019-11-18 16:44 ` [PATCH v2 07/10] drm/i915: Pass dev_priv to cpt_verify_modeset() Ville Syrjala
2019-11-18 16:44   ` [Intel-gfx] " Ville Syrjala
2019-11-18 16:44 ` [PATCH v2 08/10] drm/i915: s/intel_crtc/crtc/ in .crtc_enable() and .crtc_disable() Ville Syrjala
2019-11-18 16:44   ` [Intel-gfx] " Ville Syrjala
2019-11-18 16:44 ` [PATCH v2 09/10] drm/i915: s/pipe_config/new_crtc_state/ in .crtc_enable() Ville Syrjala
2019-11-18 16:44   ` [Intel-gfx] " Ville Syrjala
2019-11-18 16:44 ` [PATCH v2 10/10] drm/i915: Change .crtc_enable/disable() calling convention Ville Syrjala
2019-11-18 16:44   ` [Intel-gfx] " Ville Syrjala
2019-11-18 20:00 ` ✗ Fi.CI.BAT: failure for drm/i915: Cleanups around .crtc_enable/disable() (rev3) Patchwork
2019-11-18 20:00   ` [Intel-gfx] " Patchwork
2019-11-19 14:27   ` Ville Syrjälä
2019-11-19 14:27     ` [Intel-gfx] " Ville Syrjälä
2019-11-19 15:22 ` ✓ Fi.CI.BAT: success for drm/i915: Cleanups around .crtc_enable/disable() (rev4) Patchwork
2019-11-19 15:22   ` [Intel-gfx] " Patchwork
2019-11-20  0:02 ` ✗ Fi.CI.IGT: failure " Patchwork
2019-11-20  0:02   ` [Intel-gfx] " 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=20191118164430.27265-6-ville.syrjala@linux.intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /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.