Commit ad314fec authored Apr 12, 2021 by Ville Syrjälä Committed by Jani Nikula Apr 14, 2021

drm/i915: Remove a few redundant glk checks

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

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210412054607.18133-6-ville.syrjala@linux.intel.com

parent 6c51f288

drivers/gpu/drm/i915/display/intel_ddi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}

drivers/gpu/drm/i915/display/skl_universal_plane.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -829,7 +829,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;