From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Date: Mon, 19 Apr 2021 18:01:03 +0000 (-0400)
Subject: Merge tag 'topic/intel-gen-to-ver-2021-04-19' of git://anongit.freedesktop.org/drm... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3def10f297f10e6cbd5dc03beb062ca0b31d37b6;p=linux.git

Merge tag 'topic/intel-gen-to-ver-2021-04-19' of git://anongit.freedesktop.org/drm/drm-intel into drm-intel-next

Gen to ver conversions across the driver

The main change is Lucas' series [1], with Ville's GLK fixes [2] and a
cherry-pick of Matt's commit [3] from drm-intel-next as a base to avoid
conflicts.

[1] https://patchwork.freedesktop.org/series/88825/
[2] https://patchwork.freedesktop.org/series/88938/
[3] 70bfb30743d5 ("drm/i915/display: Eliminate IS_GEN9_{BC,LP}")

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

# Conflicts:
#	drivers/gpu/drm/i915/display/intel_bios.c
#	drivers/gpu/drm/i915/display/intel_cdclk.c
#	drivers/gpu/drm/i915/display/intel_ddi.c
#	drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c
#	drivers/gpu/drm/i915/display/intel_display.c
#	drivers/gpu/drm/i915/display/intel_display_power.c
#	drivers/gpu/drm/i915/display/intel_dp.c
#	drivers/gpu/drm/i915/display/intel_dpll_mgr.c
#	drivers/gpu/drm/i915/display/intel_fbc.c
#	drivers/gpu/drm/i915/display/intel_gmbus.c
#	drivers/gpu/drm/i915/display/intel_hdcp.c
#	drivers/gpu/drm/i915/display/intel_hdmi.c
#	drivers/gpu/drm/i915/display/intel_pps.c
#	drivers/gpu/drm/i915/intel_pm.c
From: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/878s5ebny0.fsf@intel.com
---

3def10f297f10e6cbd5dc03beb062ca0b31d37b6
diff --cc drivers/gpu/drm/i915/display/skl_universal_plane.c
index 098636c811a86,b59636d898b97..75d3ca3dbb372
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@@ -2005,10 -1978,11 +2005,10 @@@ skl_universal_plane_create(struct drm_i
  	plane->disable_plane = skl_disable_plane;
  	plane->get_hw_state = skl_plane_get_hw_state;
  	plane->check_plane = skl_plane_check;
 -	plane->min_cdclk = skl_plane_min_cdclk;
  
  	if (plane_id == PLANE_PRIMARY) {
- 		plane->need_async_flip_disable_wa = IS_DISPLAY_RANGE(dev_priv,
- 								     9, 10);
+ 		plane->need_async_flip_disable_wa = IS_DISPLAY_VER(dev_priv,
+ 								   9, 10);
  		plane->async_flip = skl_plane_async_flip;
  		plane->enable_flip_done = skl_plane_enable_flip_done;
  		plane->disable_flip_done = skl_plane_disable_flip_done;