Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH 5/5] drm/i915: Remove a few redundant glk checks
Date: Mon, 12 Apr 2021 08:46:07 +0300	[thread overview]
Message-ID: <20210412054607.18133-6-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20210412054607.18133-1-ville.syrjala@linux.intel.com>

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

Now that glk display version is 10 we can drop a few more glk checks.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_ddi.c           | 2 +-
 drivers/gpu/drm/i915/display/skl_universal_plane.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index e208ded9a688..79ece9e45d66 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -176,7 +176,7 @@ static void intel_wait_ddi_buf_active(struct drm_i915_private *dev_priv,
 				      enum port port)
 {
 	/* Wait > 518 usecs for DDI_BUF_CTL to be non idle */
-	if (DISPLAY_VER(dev_priv) < 10 && !IS_GEMINILAKE(dev_priv)) {
+	if (DISPLAY_VER(dev_priv) < 10) {
 		usleep_range(518, 1000);
 		return;
 	}
diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 098636c811a8..5926ed1094a4 100644
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -853,7 +853,7 @@ static u32 skl_plane_ctl(const struct intel_crtc_state *crtc_state,
 
 	plane_ctl = PLANE_CTL_ENABLE;
 
-	if (DISPLAY_VER(dev_priv) < 10 && !IS_GEMINILAKE(dev_priv)) {
+	if (DISPLAY_VER(dev_priv) < 10) {
 		plane_ctl |= skl_plane_ctl_alpha(plane_state);
 		plane_ctl |= PLANE_CTL_PLANE_GAMMA_DISABLE;
 
-- 
2.26.3

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

  parent reply	other threads:[~2021-04-12  5:46 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-12  5:46 [Intel-gfx] [PATCH 0/5] drm/i915: Fix glk display version regressions Ville Syrjala
2021-04-12  5:46 ` [Intel-gfx] [PATCH 1/5] drm/i915: Restore lost glk FBC 16bpp w/a Ville Syrjala
2021-04-14  9:14   ` Jani Nikula
2021-04-14  9:17     ` Jani Nikula
2021-04-12  5:46 ` [Intel-gfx] [PATCH 2/5] drm/i915: Restore lost glk ccs w/a Ville Syrjala
2021-04-14  9:18   ` Jani Nikula
2021-04-12  5:46 ` [Intel-gfx] [PATCH 3/5] drm/i915: Disable LTTPR detection on GLK once again Ville Syrjala
2021-04-14  9:19   ` Jani Nikula
2021-04-12  5:46 ` [Intel-gfx] [PATCH 4/5] drm/i915: Don't use {skl, cnl}_hpd_pin() for bxt/glk Ville Syrjala
2021-04-14  9:25   ` Jani Nikula
2021-04-12  5:46 ` Ville Syrjala [this message]
2021-04-14  9:26   ` [Intel-gfx] [PATCH 5/5] drm/i915: Remove a few redundant glk checks Jani Nikula
2021-04-12  6:18 ` [Intel-gfx] ✗ Fi.CI.DOCS: warning for drm/i915: Fix glk display version regressions Patchwork
2021-04-12  6:40 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2021-04-12  7:53 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2021-04-13 10:57 ` [Intel-gfx] [PATCH 0/5] " Jani Nikula
2021-04-14  9:34   ` Jani Nikula

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=20210412054607.18133-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox