Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: jani.nikula@intel.com
Subject: [PATCH v2 7/7] drm/i915/crt: simplify CRT VBT check on pre-VLV/DDI
Date: Tue, 22 Jan 2019 10:23:07 +0200	[thread overview]
Message-ID: <20190122082307.4003-7-jani.nikula@intel.com> (raw)
In-Reply-To: <20190122082307.4003-1-jani.nikula@intel.com>

The VBT int_crt_support can't be trusted on earlier platforms, and is
always set to true in intel_bios.c for pre-DDI and pre-VLV platforms. We
can simplify the output setup by unconditionally calling
intel_crt_init() for these platforms.

Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index ed3780f24638..d328599240cb 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14382,9 +14382,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
 		 * incorrect sharing of the PPS.
 		 */
 		intel_lvds_init(dev_priv);
-
-		if (dev_priv->vbt.int_crt_support)
-			intel_crt_init(dev_priv);
+		intel_crt_init(dev_priv);
 
 		dpd_is_edp = intel_dp_is_port_edp(dev_priv, PORT_D);
 
@@ -14461,17 +14459,14 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
 		vlv_dsi_init(dev_priv);
 	} else if (IS_PINEVIEW(dev_priv)) {
 		intel_lvds_init(dev_priv);
-
-		if (dev_priv->vbt.int_crt_support)
-			intel_crt_init(dev_priv);
+		intel_crt_init(dev_priv);
 	} else if (IS_GEN_RANGE(dev_priv, 3, 4)) {
 		bool found = false;
 
 		if (IS_MOBILE(dev_priv))
 			intel_lvds_init(dev_priv);
 
-		if (dev_priv->vbt.int_crt_support)
-			intel_crt_init(dev_priv);
+		intel_crt_init(dev_priv);
 
 		if (I915_READ(GEN3_SDVOB) & SDVO_DETECTED) {
 			DRM_DEBUG_KMS("probing SDVOB\n");
@@ -14511,9 +14506,7 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)
 		if (IS_I85X(dev_priv))
 			intel_lvds_init(dev_priv);
 
-		if (dev_priv->vbt.int_crt_support)
-			intel_crt_init(dev_priv);
-
+		intel_crt_init(dev_priv);
 		intel_dvo_init(dev_priv);
 	}
 
-- 
2.20.1

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

  parent reply	other threads:[~2019-01-22  8:21 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-01-22  8:23 [PATCH v2 1/7] drm/i915/crt: split out intel_crt_present() to platform specific setup Jani Nikula
2019-01-22  8:23 ` [PATCH v2 2/7] drm/i915/lvds: only call intel_lvds_init() on platforms that might have LVDS Jani Nikula
2019-01-22  8:23 ` [PATCH v2 3/7] drm/i915/lvds: nuke intel_lvds_supported() Jani Nikula
2019-01-22  8:23 ` [PATCH v2 4/7] drm/i915/tv: only call intel_tv_init() on platforms that might have TV Jani Nikula
2019-01-22  8:23 ` [PATCH v2 5/7] drm/i915: rename has_edp_a() to ilk_has_edp_a() Jani Nikula
2019-01-23 18:35   ` Ville Syrjälä
2019-01-22  8:23 ` [PATCH v2 6/7] drm/i915/lvds: simplify gen 2 lvds presence Jani Nikula
2019-01-23 18:36   ` Ville Syrjälä
2019-01-22  8:23 ` Jani Nikula [this message]
2019-01-23 18:36   ` [PATCH v2 7/7] drm/i915/crt: simplify CRT VBT check on pre-VLV/DDI Ville Syrjälä
2019-01-24  7:40     ` Jani Nikula
2019-01-22  9:01 ` ✓ Fi.CI.BAT: success for series starting with [v2,1/7] drm/i915/crt: split out intel_crt_present() to platform specific setup Patchwork
2019-01-22  9:50 ` ✓ 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=20190122082307.4003-7-jani.nikula@intel.com \
    --to=jani.nikula@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox