All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matt Roper <matthew.d.roper@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Subject: [PATCH 1/3] drm/i915: Handle SDEISR according to PCH rather than platform
Date: Tue, 26 Nov 2019 13:07:30 -0800	[thread overview]
Message-ID: <20191126210732.407496-1-matthew.d.roper@intel.com> (raw)

The South Display is part of the PCH so we should technically be basing
our port detection logic off the PCH in use rather than the platform
generation.

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 3123958e2081..ddf5bad1b969 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -5487,7 +5487,7 @@ static bool icl_combo_port_connected(struct drm_i915_private *dev_priv,
 	return I915_READ(SDEISR) & SDE_DDI_HOTPLUG_ICP(port);
 }
 
-static bool icl_digital_port_connected(struct intel_encoder *encoder)
+static bool icp_digital_port_connected(struct intel_encoder *encoder)
 {
 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
 	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
@@ -5525,9 +5525,9 @@ static bool __intel_digital_port_connected(struct intel_encoder *encoder)
 			return g4x_digital_port_connected(encoder);
 	}
 
-	if (INTEL_GEN(dev_priv) >= 11)
-		return icl_digital_port_connected(encoder);
-	else if (IS_GEN(dev_priv, 10) || IS_GEN9_BC(dev_priv))
+	if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP)
+		return icp_digital_port_connected(encoder);
+	else if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT)
 		return spt_digital_port_connected(encoder);
 	else if (IS_GEN9_LP(dev_priv))
 		return bxt_digital_port_connected(encoder);
-- 
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: Matt Roper <matthew.d.roper@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Subject: [Intel-gfx] [PATCH 1/3] drm/i915: Handle SDEISR according to PCH rather than platform
Date: Tue, 26 Nov 2019 13:07:30 -0800	[thread overview]
Message-ID: <20191126210732.407496-1-matthew.d.roper@intel.com> (raw)
Message-ID: <20191126210730.rM7SWKM4IHyUBPm3O0bK8JpQMlxRb0pxQvFjtWrK7Ns@z> (raw)

The South Display is part of the PCH so we should technically be basing
our port detection logic off the PCH in use rather than the platform
generation.

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 3123958e2081..ddf5bad1b969 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -5487,7 +5487,7 @@ static bool icl_combo_port_connected(struct drm_i915_private *dev_priv,
 	return I915_READ(SDEISR) & SDE_DDI_HOTPLUG_ICP(port);
 }
 
-static bool icl_digital_port_connected(struct intel_encoder *encoder)
+static bool icp_digital_port_connected(struct intel_encoder *encoder)
 {
 	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
 	struct intel_digital_port *dig_port = enc_to_dig_port(&encoder->base);
@@ -5525,9 +5525,9 @@ static bool __intel_digital_port_connected(struct intel_encoder *encoder)
 			return g4x_digital_port_connected(encoder);
 	}
 
-	if (INTEL_GEN(dev_priv) >= 11)
-		return icl_digital_port_connected(encoder);
-	else if (IS_GEN(dev_priv, 10) || IS_GEN9_BC(dev_priv))
+	if (INTEL_PCH_TYPE(dev_priv) >= PCH_ICP)
+		return icp_digital_port_connected(encoder);
+	else if (INTEL_PCH_TYPE(dev_priv) >= PCH_SPT)
 		return spt_digital_port_connected(encoder);
 	else if (IS_GEN9_LP(dev_priv))
 		return bxt_digital_port_connected(encoder);
-- 
2.23.0

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

             reply	other threads:[~2019-11-26 21:07 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-26 21:07 Matt Roper [this message]
2019-11-26 21:07 ` [Intel-gfx] [PATCH 1/3] drm/i915: Handle SDEISR according to PCH rather than platform Matt Roper
2019-11-26 21:07 ` [PATCH 2/3] drm/i915/ehl: Make icp_digital_port_connected() use phy instead of port Matt Roper
2019-11-26 21:07   ` [Intel-gfx] " Matt Roper
2019-11-26 21:34   ` Souza, Jose
2019-11-26 21:34     ` [Intel-gfx] " Souza, Jose
2019-11-27 17:59   ` Lucas De Marchi
2019-11-27 17:59     ` [Intel-gfx] " Lucas De Marchi
2019-11-26 21:07 ` [PATCH 3/3] drm/i915: Program SHPD_FILTER_CNT on CNP+ Matt Roper
2019-11-26 21:07   ` [Intel-gfx] " Matt Roper
2019-11-26 21:41   ` Souza, Jose
2019-11-26 21:41     ` [Intel-gfx] " Souza, Jose
2019-11-26 21:50     ` Matt Roper
2019-11-26 21:50       ` [Intel-gfx] " Matt Roper
2019-11-26 21:57       ` Souza, Jose
2019-11-26 21:57         ` [Intel-gfx] " Souza, Jose
2019-11-26 21:29 ` [PATCH 1/3] drm/i915: Handle SDEISR according to PCH rather than platform Souza, Jose
2019-11-26 21:29   ` [Intel-gfx] " Souza, Jose
2019-11-26 23:20 ` ✗ Fi.CI.BAT: failure for series starting with [1/3] " Patchwork
2019-11-26 23:20   ` [Intel-gfx] " Patchwork
2019-11-26 23:38   ` Matt Roper
2019-11-26 23:38     ` [Intel-gfx] " Matt Roper
2019-11-27  2:35 ` ✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915: Handle SDEISR according to PCH rather than platform (rev2) Patchwork
2019-11-27  2:35   ` [Intel-gfx] " Patchwork
2019-11-27  7:19 ` ✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915: Handle SDEISR according to PCH rather than platform (rev3) Patchwork
2019-11-27  7:19   ` [Intel-gfx] " Patchwork
2019-11-27 16:38   ` Matt Roper
2019-11-27 16:38     ` [Intel-gfx] " Matt Roper
2019-11-27 18:00 ` [PATCH 1/3] drm/i915: Handle SDEISR according to PCH rather than platform Lucas De Marchi
2019-11-27 18:00   ` [Intel-gfx] " Lucas De Marchi
2019-11-27 21:17 ` ✗ Fi.CI.BAT: failure for series starting with [1/3] drm/i915: Handle SDEISR according to PCH rather than platform (rev4) Patchwork
2019-11-27 21:17   ` [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=20191126210732.407496-1-matthew.d.roper@intel.com \
    --to=matthew.d.roper@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=lucas.demarchi@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.