On Mon, Mar 22, 2021 at 04:38:40PM -0700, Matt Roper wrote:
> GLK has always been a bit of a special case since it reports INTEL_GEN()
> as 9, but has version 10 display IP. Now we can properly represent the
> display version as 10 and simplify the display generation tests
> throughout the display code.
>
> Aside from manually adding the version to the glk_info structure, the
> rest of this patch is generated with a Coccinelle semantic patch. Note
> that we also need to switch any code that matches gen10 today but *not*
> GLK to be CNL-specific:
>
> @@ expression dev_priv; @@
> - DISPLAY_VER(dev_priv) > 9
> + DISPLAY_VER(dev_priv) >= 10
>
> @@ expression dev_priv, E; @@
> (
> - DISPLAY_VER(dev_priv) >= 10 && E
> + (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)) && E
> |
> - DISPLAY_VER(dev_priv) >= 10
> + DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)
> |
> - IS_DISPLAY_RANGE(dev_priv, 10, E)
> + IS_DISPLAY_RANGE(dev_priv, 11, E) || IS_CANNONLAKE(dev_priv)
> )
>
> @@ expression dev_priv, E, E2; @@
> (
> - (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
> + IS_DISPLAY_VER(dev_priv, 10)
> |
> - E || IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)
> + E || IS_DISPLAY_VER(dev_priv, 10)
> |
> - (IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv))
> + IS_DISPLAY_VER(dev_priv, 10)
> |
> - IS_GEMINILAKE(dev_priv) || E || IS_CANNONLAKE(dev_priv)
> + E || IS_DISPLAY_VER(dev_priv, 10)
> |
> - E || IS_GEMINILAKE(dev_priv) || E2 || IS_CANNONLAKE(dev_priv)
> + E || E2 || IS_DISPLAY_VER(dev_priv, 10)
> |
> - (IS_DISPLAY_VER(dev_priv, 10) || IS_GEMINILAKE(dev_priv))
> + IS_DISPLAY_VER(dev_priv, 10)
> |
> - (IS_GEMINILAKE(dev_priv) || IS_DISPLAY_VER(dev_priv, 10))
> + IS_DISPLAY_VER(dev_priv, 10)
> )
>
> @@ expression dev_priv; @@
> - (IS_DISPLAY_VER(dev_priv, 9) && !IS_GEMINILAKE(dev_priv))
> + IS_DISPLAY_VER(dev_priv, 9)
>
> @@ expression dev_priv; @@
> (
> - !(DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10))
> + DISPLAY_VER(dev_priv) < 10
> |
> - (DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10))
> + DISPLAY_VER(dev_priv) >= 10
> )
>
> @@ expression dev_priv, E; @@
> - E || DISPLAY_VER(dev_priv) >= 11 || IS_DISPLAY_VER(dev_priv, 10)
> + E || DISPLAY_VER(dev_priv) >= 10
>
> @@ expression dev_priv, E; @@
> - (IS_DISPLAY_RANGE(dev_priv, 11, E) || IS_DISPLAY_VER(dev_priv, 10))
> + IS_DISPLAY_RANGE(dev_priv, 10, E)
>
> @@ expression dev_priv; @@
> (
> - DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv) ||
> IS_GEN9_LP(dev_priv)
> + DISPLAY_VER(dev_priv) >= 10 || IS_GEN9_LP(dev_priv)
> |
> - IS_GEN9_LP(dev_priv) || DISPLAY_VER(dev_priv) >= 11 ||
> IS_CANNONLAKE(dev_priv)
> + IS_GEN9_LP(dev_priv) || DISPLAY_VER(dev_priv) >= 10
> )
>
> @@ expression dev_priv, E; @@
> - !(DISPLAY_VER(dev_priv) >= E)
> + DISPLAY_VER(dev_priv) < E
>
> v2:
> - Convert gen10 conditions that don't include GLK into CNL conditions.
> (Ville)
>
> v3:
> - Rework coccinelle rules so that "ver>=10" turns into "ver>=11||is_cnl."
> (Ville)
>
> v3.1:
> - Manually re-add the ".display.version = 10" to glk_info after
> regenerating patch via Coccinelle.
>
> v4:
> - Also apply cocci rules to intel_pm.c and i915_irq.c! (CI)
Ugh. One thing that occurred to me when looking at i915_irq.c is that
IS_GEN9_LP() is now maybe broken on glk? So seems to me all uses of
IS_GEN9_LP() need to be reviewed and potentially changed.
>
> Cc: Ville Syrjälä <ville.syrj...@intel.com>
> Signed-off-by: Matt Roper <matthew.d.ro...@intel.com>
> Reviewed-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_atomic.c | 7 ++--
> drivers/gpu/drm/i915/display/intel_audio.c | 2 +-
> drivers/gpu/drm/i915/display/intel_bios.c | 3 +-
> drivers/gpu/drm/i915/display/intel_cdclk.c | 26 +++++++------
> drivers/gpu/drm/i915/display/intel_color.c | 8 ++--
> drivers/gpu/drm/i915/display/intel_crtc.c | 2 +-
> drivers/gpu/drm/i915/display/intel_display.c | 9 ++---
> .../drm/i915/display/intel_display_debugfs.c | 5 +--
> .../drm/i915/display/intel_display_power.c | 2 +-
> drivers/gpu/drm/i915/display/intel_dp.c | 6 +--
> drivers/gpu/drm/i915/display/intel_fbc.c | 4 +-
> drivers/gpu/drm/i915/display/intel_hdcp.c | 1 -
> drivers/gpu/drm/i915/display/intel_hdmi.c | 13 +++----
> drivers/gpu/drm/i915/display/intel_psr.c | 7 ++--
> drivers/gpu/drm/i915/display/intel_vdsc.c | 6 +--
> .../drm/i915/display/skl_universal_plane.c | 37 +++++++++----------
> drivers/gpu/drm/i915/i915_pci.c | 1 +
> drivers/gpu/drm/i915/intel_pm.c | 16 ++++----
> 18 files changed, 71 insertions(+), 84 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_atomic.c
> b/drivers/gpu/drm/i915/display/intel_atomic.c
> index 2b928795755e..4fa389fce8cb 100644
> --- a/drivers/gpu/drm/i915/display/intel_atomic.c
> +++ b/drivers/gpu/drm/i915/display/intel_atomic.c
> @@ -332,8 +332,7 @@ static void intel_atomic_setup_scaler(struct
> intel_crtc_scaler_state *scaler_sta
> plane_state->hw.fb->format->is_yuv &&
> plane_state->hw.fb->format->num_planes > 1) {
> struct intel_plane *plane =
> to_intel_plane(plane_state->uapi.plane);
> - if (IS_DISPLAY_VER(dev_priv, 9) &&
> - !IS_GEMINILAKE(dev_priv)) {
> + if (IS_DISPLAY_VER(dev_priv, 9)) {
> mode = SKL_PS_SCALER_MODE_NV12;
> } else if (icl_is_hdr_plane(dev_priv, plane->id)) {
> /*
> @@ -351,7 +350,7 @@ static void intel_atomic_setup_scaler(struct
> intel_crtc_scaler_state *scaler_sta
> if (linked)
> mode |= PS_PLANE_Y_SEL(linked->id);
> }
> - } else if (DISPLAY_VER(dev_priv) > 9 || IS_GEMINILAKE(dev_priv)) {
> + } else if (DISPLAY_VER(dev_priv) >= 10) {
> mode = PS_SCALER_MODE_NORMAL;
> } else if (num_scalers_need == 1 && intel_crtc->num_scalers > 1) {
> /*
> @@ -460,7 +459,7 @@ int intel_atomic_setup_scalers(struct drm_i915_private
> *dev_priv,
> * isn't necessary to change between HQ and dyn
> mode
> * on those platforms.
> */
> - if (DISPLAY_VER(dev_priv) >= 10 ||
> IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> continue;
>
> plane = drm_plane_from_index(&dev_priv->drm, i);
> diff --git a/drivers/gpu/drm/i915/display/intel_audio.c
> b/drivers/gpu/drm/i915/display/intel_audio.c
> index 7ab9d1669f09..3ea20c857440 100644
> --- a/drivers/gpu/drm/i915/display/intel_audio.c
> +++ b/drivers/gpu/drm/i915/display/intel_audio.c
> @@ -1022,7 +1022,7 @@ static unsigned long
> i915_audio_component_get_power(struct device *kdev)
> if (IS_GEMINILAKE(dev_priv))
> glk_force_audio_cdclk(dev_priv, true);
>
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> intel_de_write(dev_priv, AUD_PIN_BUF_CTL,
> (intel_de_read(dev_priv,
> AUD_PIN_BUF_CTL) | AUD_PIN_BUF_ENABLE));
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_bios.c
> b/drivers/gpu/drm/i915/display/intel_bios.c
> index 182db9de03c3..3d0c035b5e38 100644
> --- a/drivers/gpu/drm/i915/display/intel_bios.c
> +++ b/drivers/gpu/drm/i915/display/intel_bios.c
> @@ -917,8 +917,7 @@ parse_psr(struct drm_i915_private *i915, const struct
> bdb_header *bdb)
> * Old decimal value is wake up time in multiples of 100 us.
> */
> if (bdb->version >= 205 &&
> - (IS_GEN9_BC(i915) || IS_GEMINILAKE(i915) ||
> - DISPLAY_VER(i915) >= 10)) {
> + (IS_GEN9_BC(i915) || DISPLAY_VER(i915) >= 10)) {
> switch (psr_table->tp1_wakeup_time) {
> case 0:
> i915->vbt.psr.tp1_wakeup_time_us = 500;
> diff --git a/drivers/gpu/drm/i915/display/intel_cdclk.c
> b/drivers/gpu/drm/i915/display/intel_cdclk.c
> index 4be848d0d156..3f43ad4d7362 100644
> --- a/drivers/gpu/drm/i915/display/intel_cdclk.c
> +++ b/drivers/gpu/drm/i915/display/intel_cdclk.c
> @@ -1397,7 +1397,7 @@ static void bxt_de_pll_readout(struct drm_i915_private
> *dev_priv,
> * CNL+ have the ratio directly in the PLL enable register, gen9lp had
> * it in a separate PLL control register.
> */
> - if (DISPLAY_VER(dev_priv) >= 10)
> + if (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv))
> ratio = val & CNL_CDCLK_PLL_RATIO_MASK;
> else
> ratio = intel_de_read(dev_priv, BXT_DE_PLL_CTL) &
> BXT_DE_PLL_RATIO_MASK;
> @@ -1433,7 +1433,7 @@ static void bxt_get_cdclk(struct drm_i915_private
> *dev_priv,
> break;
> case BXT_CDCLK_CD2X_DIV_SEL_1_5:
> drm_WARN(&dev_priv->drm,
> - IS_GEMINILAKE(dev_priv) || DISPLAY_VER(dev_priv) >= 10,
> + DISPLAY_VER(dev_priv) >= 10,
> "Unsupported divider\n");
> div = 3;
> break;
> @@ -1441,7 +1441,8 @@ static void bxt_get_cdclk(struct drm_i915_private
> *dev_priv,
> div = 4;
> break;
> case BXT_CDCLK_CD2X_DIV_SEL_4:
> - drm_WARN(&dev_priv->drm, DISPLAY_VER(dev_priv) >= 10,
> + drm_WARN(&dev_priv->drm,
> + DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv),
> "Unsupported divider\n");
> div = 8;
> break;
> @@ -1558,7 +1559,7 @@ static void bxt_set_cdclk(struct drm_i915_private
> *dev_priv,
> int ret;
>
> /* Inform power controller of upcoming frequency change. */
> - if (DISPLAY_VER(dev_priv) >= 10)
> + if (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv))
> ret = skl_pcode_request(dev_priv, SKL_PCODE_CDCLK_CONTROL,
> SKL_CDCLK_PREPARE_FOR_CHANGE,
> SKL_CDCLK_READY_FOR_CHANGE,
> @@ -1591,7 +1592,7 @@ static void bxt_set_cdclk(struct drm_i915_private
> *dev_priv,
> break;
> case 3:
> drm_WARN(&dev_priv->drm,
> - IS_GEMINILAKE(dev_priv) || DISPLAY_VER(dev_priv) >= 10,
> + DISPLAY_VER(dev_priv) >= 10,
> "Unsupported divider\n");
> divider = BXT_CDCLK_CD2X_DIV_SEL_1_5;
> break;
> @@ -1599,13 +1600,14 @@ static void bxt_set_cdclk(struct drm_i915_private
> *dev_priv,
> divider = BXT_CDCLK_CD2X_DIV_SEL_2;
> break;
> case 8:
> - drm_WARN(&dev_priv->drm, DISPLAY_VER(dev_priv) >= 10,
> + drm_WARN(&dev_priv->drm,
> + DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv),
> "Unsupported divider\n");
> divider = BXT_CDCLK_CD2X_DIV_SEL_4;
> break;
> }
>
> - if (DISPLAY_VER(dev_priv) >= 10) {
> + if (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)) {
> if (dev_priv->cdclk.hw.vco != 0 &&
> dev_priv->cdclk.hw.vco != vco)
> cnl_cdclk_pll_disable(dev_priv);
> @@ -1636,7 +1638,7 @@ static void bxt_set_cdclk(struct drm_i915_private
> *dev_priv,
> if (pipe != INVALID_PIPE)
> intel_wait_for_vblank(dev_priv, pipe);
>
> - if (DISPLAY_VER(dev_priv) >= 10) {
> + if (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)) {
> ret = sandybridge_pcode_write(dev_priv, SKL_PCODE_CDCLK_CONTROL,
> cdclk_config->voltage_level);
> } else {
> @@ -1661,7 +1663,7 @@ static void bxt_set_cdclk(struct drm_i915_private
> *dev_priv,
>
> intel_update_cdclk(dev_priv);
>
> - if (DISPLAY_VER(dev_priv) >= 10)
> + if (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv))
> /*
> * Can't read out the voltage level :(
> * Let's just assume everything is as expected.
> @@ -1998,7 +2000,7 @@ static int intel_pixel_rate_to_cdclk(const struct
> intel_crtc_state *crtc_state)
> struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
> int pixel_rate = crtc_state->pixel_rate;
>
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> return DIV_ROUND_UP(pixel_rate, 2);
> else if (IS_DISPLAY_VER(dev_priv, 9) ||
> IS_BROADWELL(dev_priv) || IS_HASWELL(dev_priv))
> @@ -2048,7 +2050,7 @@ int intel_crtc_compute_min_cdclk(const struct
> intel_crtc_state *crtc_state)
> crtc_state->has_audio &&
> crtc_state->port_clock >= 540000 &&
> crtc_state->lane_count == 4) {
> - if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)) {
> + if (IS_DISPLAY_VER(dev_priv, 10)) {
> /* Display WA #1145: glk,cnl */
> min_cdclk = max(316800, min_cdclk);
> } else if (IS_DISPLAY_VER(dev_priv, 9) ||
> IS_BROADWELL(dev_priv)) {
> @@ -2588,7 +2590,7 @@ static int intel_compute_max_dotclk(struct
> drm_i915_private *dev_priv)
> {
> int max_cdclk_freq = dev_priv->max_cdclk_freq;
>
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> return 2 * max_cdclk_freq;
> else if (IS_DISPLAY_VER(dev_priv, 9) ||
> IS_BROADWELL(dev_priv) || IS_HASWELL(dev_priv))
> diff --git a/drivers/gpu/drm/i915/display/intel_color.c
> b/drivers/gpu/drm/i915/display/intel_color.c
> index 37e275509a36..c75d7124d57a 100644
> --- a/drivers/gpu/drm/i915/display/intel_color.c
> +++ b/drivers/gpu/drm/i915/display/intel_color.c
> @@ -737,7 +737,7 @@ static void ivb_load_lut_ext_max(const struct
> intel_crtc_state *crtc_state)
> * ToDo: Extend the ABI to be able to program values
> * from 3.0 to 7.0
> */
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {
> + if (DISPLAY_VER(dev_priv) >= 10) {
> intel_dsb_reg_write(crtc_state, PREC_PAL_EXT2_GC_MAX(pipe, 0),
> 1 << 16);
> intel_dsb_reg_write(crtc_state, PREC_PAL_EXT2_GC_MAX(pipe, 1),
> @@ -1711,7 +1711,7 @@ int intel_color_get_gamma_bit_precision(const struct
> intel_crtc_state *crtc_stat
> } else {
> if (DISPLAY_VER(dev_priv) >= 11)
> return icl_gamma_precision(crtc_state);
> - else if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
> + else if (IS_DISPLAY_VER(dev_priv, 10))
> return glk_gamma_precision(crtc_state);
> else if (IS_IRONLAKE(dev_priv))
> return ilk_gamma_precision(crtc_state);
> @@ -2119,7 +2119,7 @@ void intel_color_init(struct intel_crtc *crtc)
> } else {
> if (DISPLAY_VER(dev_priv) >= 11)
> dev_priv->display.color_check = icl_color_check;
> - else if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + else if (DISPLAY_VER(dev_priv) >= 10)
> dev_priv->display.color_check = glk_color_check;
> else if (DISPLAY_VER(dev_priv) >= 7)
> dev_priv->display.color_check = ivb_color_check;
> @@ -2136,7 +2136,7 @@ void intel_color_init(struct intel_crtc *crtc)
> if (DISPLAY_VER(dev_priv) >= 11) {
> dev_priv->display.load_luts = icl_load_luts;
> dev_priv->display.read_luts = icl_read_luts;
> - } else if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv)) {
> + } else if (IS_DISPLAY_VER(dev_priv, 10)) {
> dev_priv->display.load_luts = glk_load_luts;
> dev_priv->display.read_luts = glk_read_luts;
> } else if (DISPLAY_VER(dev_priv) >= 8) {
> diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c
> b/drivers/gpu/drm/i915/display/intel_crtc.c
> index 004ace523970..39358076c05b 100644
> --- a/drivers/gpu/drm/i915/display/intel_crtc.c
> +++ b/drivers/gpu/drm/i915/display/intel_crtc.c
> @@ -335,7 +335,7 @@ int intel_crtc_init(struct drm_i915_private *dev_priv,
> enum pipe pipe)
> dev_priv->plane_to_crtc_mapping[i9xx_plane] = crtc;
> }
>
> - if (DISPLAY_VER(dev_priv) >= 10)
> + if (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv))
> drm_crtc_create_scaling_filter_property(&crtc->base,
> BIT(DRM_SCALING_FILTER_DEFAULT)
> |
>
> BIT(DRM_SCALING_FILTER_NEAREST_NEIGHBOR));
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index 8a5014f4b3f4..a1fb5a101942 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -3259,7 +3259,7 @@ static bool needs_nv12_wa(const struct intel_crtc_state
> *crtc_state)
> return false;
>
> /* WA Display #0827: Gen9:all */
> - if (IS_DISPLAY_VER(dev_priv, 9) && !IS_GEMINILAKE(dev_priv))
> + if (IS_DISPLAY_VER(dev_priv, 9))
> return true;
>
> return false;
> @@ -3989,7 +3989,7 @@ static void hsw_crtc_enable(struct intel_atomic_state
> *state,
> crtc->active = true;
>
> /* Display WA #1180: WaDisableScalarClockGating: glk, cnl */
> - psl_clkgate_wa = (IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv)) &&
> + psl_clkgate_wa = IS_DISPLAY_VER(dev_priv, 10) &&
> new_crtc_state->pch_pfit.enabled;
> if (psl_clkgate_wa)
> glk_pipe_scaler_clock_gating_wa(dev_priv, pipe, true);
> @@ -13329,8 +13329,7 @@ static void intel_modeset_readout_hw_state(struct
> drm_device *dev)
> * use plane->min_cdclk() :(
> */
> if (plane_state->uapi.visible && plane->min_cdclk) {
> - if (crtc_state->double_wide ||
> - DISPLAY_VER(dev_priv) >= 10 ||
> IS_GEMINILAKE(dev_priv))
> + if (crtc_state->double_wide ||
> DISPLAY_VER(dev_priv) >= 10)
> crtc_state->min_cdclk[plane->id] =
>
> DIV_ROUND_UP(crtc_state->pixel_rate, 2);
> else
> @@ -13421,7 +13420,7 @@ static void intel_early_display_was(struct
> drm_i915_private *dev_priv)
> * Display WA #1185 WaDisableDARBFClkGating:cnl,glk,icl,ehl,tgl
> * Also known as Wa_14010480278.
> */
> - if (IS_DISPLAY_RANGE(dev_priv, 10, 12) || IS_GEMINILAKE(dev_priv))
> + if (IS_DISPLAY_RANGE(dev_priv, 10, 12))
> intel_de_write(dev_priv, GEN9_CLKGATE_DIS_0,
> intel_de_read(dev_priv, GEN9_CLKGATE_DIS_0) |
> DARBF_GATING_DIS);
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> index 1666aa23092b..564509a4e666 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> @@ -2416,10 +2416,7 @@ int intel_connector_debugfs_add(struct drm_connector
> *connector)
> connector, &i915_hdcp_sink_capability_fops);
> }
>
> - if (DISPLAY_VER(dev_priv) >= 10 &&
> - ((connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
> - !to_intel_connector(connector)->mst_port) ||
> - connector->connector_type == DRM_MODE_CONNECTOR_eDP))
> + if ((DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)) &&
> ((connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort &&
> !to_intel_connector(connector)->mst_port) || connector->connector_type ==
> DRM_MODE_CONNECTOR_eDP))
> debugfs_create_file("i915_dsc_fec_support", S_IRUGO, root,
> connector, &i915_dsc_fec_support_fops);
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display_power.c
> b/drivers/gpu/drm/i915/display/intel_display_power.c
> index 1eb16bad677a..cef177208e68 100644
> --- a/drivers/gpu/drm/i915/display/intel_display_power.c
> +++ b/drivers/gpu/drm/i915/display/intel_display_power.c
> @@ -4537,7 +4537,7 @@ static u32 get_allowed_dc_mask(const struct
> drm_i915_private *dev_priv,
> max_dc = 3;
> else if (DISPLAY_VER(dev_priv) >= 12)
> max_dc = 4;
> - else if (DISPLAY_VER(dev_priv) >= 10 || IS_GEN9_BC(dev_priv))
> + else if (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv) ||
> IS_GEN9_BC(dev_priv))
> max_dc = 2;
> else if (IS_GEN9_LP(dev_priv))
> max_dc = 1;
> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c
> b/drivers/gpu/drm/i915/display/intel_dp.c
> index 4ba5e37f17d2..d81b8d238163 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
> @@ -292,7 +292,7 @@ intel_dp_set_source_rates(struct intel_dp *intel_dp)
> drm_WARN_ON(&dev_priv->drm,
> intel_dp->source_rates || intel_dp->num_source_rates);
>
> - if (DISPLAY_VER(dev_priv) >= 10) {
> + if (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)) {
> source_rates = cnl_rates;
> size = ARRAY_SIZE(cnl_rates);
> if (IS_DISPLAY_VER(dev_priv, 10))
> @@ -776,7 +776,7 @@ intel_dp_mode_valid(struct drm_connector *connector,
> * Output bpp is stored in 6.4 format so right shift by 4 to get the
> * integer value since we support only integer values of bpp.
> */
> - if ((DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) &&
> + if (DISPLAY_VER(dev_priv) >= 10 &&
> drm_dp_sink_supports_dsc(intel_dp->dsc_dpcd)) {
> if (intel_dp_is_edp(intel_dp)) {
> dsc_max_output_bpp =
> @@ -2523,7 +2523,7 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp)
> intel_dp_set_common_rates(intel_dp);
>
> /* Read the eDP DSC DPCD registers */
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> intel_dp_get_dsc_sink_cap(intel_dp);
>
> /*
> diff --git a/drivers/gpu/drm/i915/display/intel_fbc.c
> b/drivers/gpu/drm/i915/display/intel_fbc.c
> index 58f603066700..88e02ee3a631 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbc.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbc.c
> @@ -653,7 +653,7 @@ static bool intel_fbc_hw_tracking_covers_screen(struct
> intel_crtc *crtc)
> struct intel_fbc *fbc = &dev_priv->fbc;
> unsigned int effective_w, effective_h, max_w, max_h;
>
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {
> + if (DISPLAY_VER(dev_priv) >= 10) {
> max_w = 5120;
> max_h = 4096;
> } else if (DISPLAY_VER(dev_priv) >= 8 || IS_HASWELL(dev_priv)) {
> @@ -1036,7 +1036,7 @@ bool intel_fbc_pre_update(struct intel_atomic_state
> *state,
> * if at least one frame has already passed.
> */
> if (fbc->activated &&
> - (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)))
> + DISPLAY_VER(dev_priv) >= 10)
> need_vblank_wait = true;
> fbc->activated = false;
> }
> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c
> b/drivers/gpu/drm/i915/display/intel_hdcp.c
> index fe0bfabdbb5d..d8570e14fe60 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c
> @@ -2206,7 +2206,6 @@ static bool is_hdcp2_supported(struct drm_i915_private
> *dev_priv)
> return false;
>
> return (DISPLAY_VER(dev_priv) >= 10 ||
> - IS_GEMINILAKE(dev_priv) ||
> IS_KABYLAKE(dev_priv) ||
> IS_COFFEELAKE(dev_priv) ||
> IS_COMETLAKE(dev_priv));
> diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c
> b/drivers/gpu/drm/i915/display/intel_hdmi.c
> index ef766a7b6c71..d69f0a6dc26d 100644
> --- a/drivers/gpu/drm/i915/display/intel_hdmi.c
> +++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
> @@ -564,7 +564,7 @@ static u32 hsw_infoframes_enabled(struct intel_encoder
> *encoder,
> VIDEO_DIP_ENABLE_GCP_HSW | VIDEO_DIP_ENABLE_VS_HSW |
> VIDEO_DIP_ENABLE_GMP_HSW | VIDEO_DIP_ENABLE_SPD_HSW);
>
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> mask |= VIDEO_DIP_ENABLE_DRM_GLK;
>
> return val & mask;
> @@ -820,7 +820,7 @@ intel_hdmi_compute_drm_infoframe(struct intel_encoder
> *encoder,
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> int ret;
>
> - if (!(DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)))
> + if (DISPLAY_VER(dev_priv) < 10)
> return true;
>
> if (!crtc_state->has_infoframe)
> @@ -1775,7 +1775,7 @@ static int intel_hdmi_source_max_tmds_clock(struct
> intel_encoder *encoder)
> struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
> int max_tmds_clock, vbt_max_tmds_clock;
>
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> max_tmds_clock = 594000;
> else if (DISPLAY_VER(dev_priv) >= 8 || IS_HASWELL(dev_priv))
> max_tmds_clock = 300000;
> @@ -2164,8 +2164,7 @@ int intel_hdmi_compute_config(struct intel_encoder
> *encoder,
>
> pipe_config->lane_count = 4;
>
> - if (scdc->scrambling.supported && (DISPLAY_VER(dev_priv) >= 10 ||
> - IS_GEMINILAKE(dev_priv))) {
> + if (scdc->scrambling.supported && DISPLAY_VER(dev_priv) >= 10) {
> if (scdc->scrambling.low_rates)
> pipe_config->hdmi_scrambling = true;
>
> @@ -2460,7 +2459,7 @@ intel_hdmi_add_properties(struct intel_hdmi
> *intel_hdmi, struct drm_connector *c
> intel_attach_hdmi_colorspace_property(connector);
> drm_connector_attach_content_type_property(connector);
>
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> drm_object_attach_property(&connector->base,
>
> connector->dev->mode_config.hdr_output_metadata_property, 0);
>
> @@ -2815,7 +2814,7 @@ void intel_hdmi_init_connector(struct
> intel_digital_port *dig_port,
> connector->doublescan_allowed = 0;
> connector->stereo_allowed = 1;
>
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> connector->ycbcr_420_allowed = true;
>
> intel_connector->polled = DRM_CONNECTOR_POLL_HPD;
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c
> b/drivers/gpu/drm/i915/display/intel_psr.c
> index 4ab568f82ddf..d05f9aaa8c06 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -524,7 +524,7 @@ static void hsw_activate_psr2(struct intel_dp *intel_dp)
> val = psr_compute_idle_frames(intel_dp) << EDP_PSR2_IDLE_FRAME_SHIFT;
>
> val |= EDP_PSR2_ENABLE | EDP_SU_TRACK_ENABLE;
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> val |= EDP_Y_COORDINATE_ENABLE;
>
> val |= EDP_PSR2_FRAME_BEFORE_SU(intel_dp->psr.sink_sync_latency + 1);
> @@ -765,7 +765,7 @@ static bool intel_psr2_config_valid(struct intel_dp
> *intel_dp,
> psr_max_h = 5120;
> psr_max_v = 3200;
> max_bpp = 30;
> - } else if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {
> + } else if (DISPLAY_VER(dev_priv) >= 10) {
> psr_max_h = 4096;
> psr_max_v = 2304;
> max_bpp = 24;
> @@ -909,8 +909,7 @@ static void intel_psr_enable_source(struct intel_dp
> *intel_dp,
> if (IS_HASWELL(dev_priv) || IS_BROADWELL(dev_priv))
> hsw_psr_setup_aux(intel_dp);
>
> - if (intel_dp->psr.psr2_enabled && (IS_DISPLAY_VER(dev_priv, 9) &&
> - !IS_GEMINILAKE(dev_priv))) {
> + if (intel_dp->psr.psr2_enabled && IS_DISPLAY_VER(dev_priv, 9)) {
> i915_reg_t reg = CHICKEN_TRANS(cpu_transcoder);
> u32 chicken = intel_de_read(dev_priv, reg);
>
> diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.c
> b/drivers/gpu/drm/i915/display/intel_vdsc.c
> index 1ccef159a9a0..5272bc80ce04 100644
> --- a/drivers/gpu/drm/i915/display/intel_vdsc.c
> +++ b/drivers/gpu/drm/i915/display/intel_vdsc.c
> @@ -346,11 +346,7 @@ bool intel_dsc_source_support(const struct
> intel_crtc_state *crtc_state)
> if (DISPLAY_VER(i915) >= 12)
> return true;
>
> - if (DISPLAY_VER(i915) >= 10 &&
> - (pipe != PIPE_A ||
> - (cpu_transcoder == TRANSCODER_EDP ||
> - cpu_transcoder == TRANSCODER_DSI_0 ||
> - cpu_transcoder == TRANSCODER_DSI_1)))
> + if ((DISPLAY_VER(i915) >= 11 || IS_CANNONLAKE(i915)) && (pipe != PIPE_A
> || (cpu_transcoder == TRANSCODER_EDP || cpu_transcoder == TRANSCODER_DSI_0 ||
> cpu_transcoder == TRANSCODER_DSI_1)))
> return true;
>
> return false;
> diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> index 89b2475a3d60..c6d7b6c054b5 100644
> --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
> +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
> @@ -294,7 +294,7 @@ skl_plane_ratio(const struct intel_crtc_state *crtc_state,
> const struct drm_framebuffer *fb = plane_state->hw.fb;
>
> if (fb->format->cpp[0] == 8) {
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {
> + if (DISPLAY_VER(dev_priv) >= 10) {
> *num = 10;
> *den = 8;
> } else {
> @@ -317,7 +317,7 @@ static int skl_plane_min_cdclk(const struct
> intel_crtc_state *crtc_state,
> skl_plane_ratio(crtc_state, plane_state, &num, &den);
>
> /* two pixels per clock on glk+ */
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> den *= 2;
>
> return DIV_ROUND_UP(pixel_rate * num, den);
> @@ -810,7 +810,7 @@ static u32 skl_plane_ctl_crtc(const struct
> intel_crtc_state *crtc_state)
> struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
> u32 plane_ctl = 0;
>
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> return plane_ctl;
>
> if (crtc_state->gamma_enable)
> @@ -849,7 +849,7 @@ static u32 skl_plane_ctl(const struct intel_crtc_state
> *crtc_state,
> plane_ctl |= skl_plane_ctl_tiling(fb->modifier);
> plane_ctl |= skl_plane_ctl_rotate(rotation & DRM_MODE_ROTATE_MASK);
>
> - if (DISPLAY_VER(dev_priv) >= 10)
> + if (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv))
> plane_ctl |= cnl_plane_ctl_flip(rotation &
> DRM_MODE_REFLECT_MASK);
>
> @@ -976,7 +976,7 @@ skl_program_plane(struct intel_plane *plane,
>
> plane_ctl |= skl_plane_ctl_crtc(crtc_state);
>
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> plane_color_ctl = plane_state->color_ctl |
> glk_plane_color_ctl_crtc(crtc_state);
>
> @@ -1017,7 +1017,7 @@ skl_program_plane(struct intel_plane *plane,
> intel_de_write_fw(dev_priv, PLANE_CUS_CTL(pipe, plane_id),
> plane_state->cus_ctl);
>
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> intel_de_write_fw(dev_priv, PLANE_COLOR_CTL(pipe, plane_id),
> plane_color_ctl);
>
> @@ -1222,7 +1222,7 @@ static int skl_plane_check_dst_coordinates(const struct
> intel_crtc_state *crtc_s
> * than the cursor ending less than 4 pixels from the left edge of the
> * screen may cause FIFO underflow and display corruption.
> */
> - if ((IS_GEMINILAKE(dev_priv) || IS_CANNONLAKE(dev_priv)) &&
> + if (IS_DISPLAY_VER(dev_priv, 10) &&
> (crtc_x + crtc_w < 4 || crtc_x > pipe_src_w - 4)) {
> drm_dbg_kms(&dev_priv->drm,
> "requested plane X %s position %d invalid (valid
> range %d-%d)\n",
> @@ -1262,7 +1262,7 @@ static int skl_plane_max_scale(struct drm_i915_private
> *dev_priv,
> * the best case.
> * FIXME need to properly check this later.
> */
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv) ||
> + if (DISPLAY_VER(dev_priv) >= 10 ||
> !intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier))
> return 0x30000 - 1;
> else
> @@ -1687,7 +1687,7 @@ static int skl_plane_check(struct intel_crtc_state
> *crtc_state,
>
> plane_state->ctl = skl_plane_ctl(crtc_state, plane_state);
>
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> plane_state->color_ctl = glk_plane_color_ctl(crtc_state,
> plane_state);
>
> @@ -1719,7 +1719,7 @@ static bool skl_plane_has_planar(struct
> drm_i915_private *dev_priv,
> if (IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv))
> return false;
>
> - if (IS_DISPLAY_VER(dev_priv, 9) && !IS_GEMINILAKE(dev_priv) && pipe ==
> PIPE_C)
> + if (IS_DISPLAY_VER(dev_priv, 9) && pipe == PIPE_C)
> return false;
>
> if (plane_id != PLANE_PRIMARY && plane_id != PLANE_SPRITE0)
> @@ -1776,7 +1776,7 @@ static bool skl_plane_has_ccs(struct drm_i915_private
> *dev_priv,
> if (plane_id == PLANE_CURSOR)
> return false;
>
> - if (DISPLAY_VER(dev_priv) >= 10)
> + if (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv))
> return true;
>
> if (IS_GEMINILAKE(dev_priv))
> @@ -2013,7 +2013,7 @@ skl_universal_plane_create(struct drm_i915_private
> *dev_priv,
> plane->min_width = icl_plane_min_width;
> plane->max_width = icl_plane_max_width;
> plane->max_height = icl_plane_max_height;
> - } else if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {
> + } else if (DISPLAY_VER(dev_priv) >= 10) {
> plane->max_width = glk_plane_max_width;
> plane->max_height = skl_plane_max_height;
> } else {
> @@ -2039,7 +2039,7 @@ skl_universal_plane_create(struct drm_i915_private
> *dev_priv,
> if (DISPLAY_VER(dev_priv) >= 11)
> formats = icl_get_plane_formats(dev_priv, pipe,
> plane_id, &num_formats);
> - else if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + else if (DISPLAY_VER(dev_priv) >= 10)
> formats = glk_get_plane_formats(dev_priv, pipe,
> plane_id, &num_formats);
> else
> @@ -2076,7 +2076,7 @@ skl_universal_plane_create(struct drm_i915_private
> *dev_priv,
> DRM_MODE_ROTATE_0 | DRM_MODE_ROTATE_90 |
> DRM_MODE_ROTATE_180 | DRM_MODE_ROTATE_270;
>
> - if (DISPLAY_VER(dev_priv) >= 10)
> + if (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv))
> supported_rotations |= DRM_MODE_REFLECT_X;
>
> drm_plane_create_rotation_property(&plane->base,
> @@ -2085,7 +2085,7 @@ skl_universal_plane_create(struct drm_i915_private
> *dev_priv,
>
> supported_csc = BIT(DRM_COLOR_YCBCR_BT601) | BIT(DRM_COLOR_YCBCR_BT709);
>
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> supported_csc |= BIT(DRM_COLOR_YCBCR_BT2020);
>
> drm_plane_create_color_properties(&plane->base,
> @@ -2106,7 +2106,7 @@ skl_universal_plane_create(struct drm_i915_private
> *dev_priv,
> if (DISPLAY_VER(dev_priv) >= 12)
> drm_plane_enable_fb_damage_clips(&plane->base);
>
> - if (DISPLAY_VER(dev_priv) >= 10)
> + if (DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv))
> drm_plane_create_scaling_filter_property(&plane->base,
> BIT(DRM_SCALING_FILTER_DEFAULT)
> |
>
> BIT(DRM_SCALING_FILTER_NEAREST_NEIGHBOR));
> @@ -2165,7 +2165,7 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
> else
> pixel_format = val & PLANE_CTL_FORMAT_MASK;
>
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv)) {
> + if (DISPLAY_VER(dev_priv) >= 10) {
> alpha = intel_de_read(dev_priv,
> PLANE_COLOR_CTL(pipe, plane_id));
> alpha &= PLANE_COLOR_ALPHA_MASK;
> @@ -2227,8 +2227,7 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
> break;
> }
>
> - if (DISPLAY_VER(dev_priv) >= 10 &&
> - val & PLANE_CTL_FLIP_HORIZONTAL)
> + if ((DISPLAY_VER(dev_priv) >= 11 || IS_CANNONLAKE(dev_priv)) && val &
> PLANE_CTL_FLIP_HORIZONTAL)
> plane_config->rotation |= DRM_MODE_REFLECT_X;
>
> /* 90/270 degree rotation would require extra work */
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index d327882d6d4b..480553746794 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -723,6 +723,7 @@ static const struct intel_device_info bxt_info = {
> static const struct intel_device_info glk_info = {
> GEN9_LP_FEATURES,
> PLATFORM(INTEL_GEMINILAKE),
> + .display.version = 10,
> .ddb_size = 1024,
> GLK_COLORS,
> };
> diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
> index f847752f3512..820f850d5cbb 100644
> --- a/drivers/gpu/drm/i915/intel_pm.c
> +++ b/drivers/gpu/drm/i915/intel_pm.c
> @@ -3660,7 +3660,7 @@ static bool skl_needs_memory_bw_wa(struct
> drm_i915_private *dev_priv)
> static bool
> intel_has_sagv(struct drm_i915_private *dev_priv)
> {
> - return (IS_GEN9_BC(dev_priv) || DISPLAY_VER(dev_priv) >= 10) &&
> + return (IS_GEN9_BC(dev_priv) || DISPLAY_VER(dev_priv) >= 11 ||
> IS_CANNONLAKE(dev_priv)) &&
> dev_priv->sagv_status != I915_SAGV_NOT_CONTROLLED;
> }
>
> @@ -5030,7 +5030,7 @@ skl_wm_method1(const struct drm_i915_private *dev_priv,
> u32 pixel_rate,
> wm_intermediate_val = latency * pixel_rate * cpp;
> ret = div_fixed16(wm_intermediate_val, 1000 * dbuf_block_size);
>
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> ret = add_fixed16_u32(ret, 1);
>
> return ret;
> @@ -5144,7 +5144,7 @@ skl_compute_wm_params(const struct intel_crtc_state
> *crtc_state,
> wp->y_min_scanlines,
> wp->dbuf_block_size);
>
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> interm_pbpl++;
>
> wp->plane_blocks_per_line = div_fixed16(interm_pbpl,
> @@ -5153,8 +5153,7 @@ skl_compute_wm_params(const struct intel_crtc_state
> *crtc_state,
> interm_pbpl = DIV_ROUND_UP(wp->plane_bytes_per_line,
> wp->dbuf_block_size);
>
> - if (!wp->x_tiled ||
> - DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (!wp->x_tiled || DISPLAY_VER(dev_priv) >= 10)
> interm_pbpl++;
>
> wp->plane_blocks_per_line = u32_to_fixed16(interm_pbpl);
> @@ -5193,7 +5192,7 @@ skl_compute_plane_wm_params(const struct
> intel_crtc_state *crtc_state,
>
> static bool skl_wm_has_lines(struct drm_i915_private *dev_priv, int level)
> {
> - if (DISPLAY_VER(dev_priv) >= 10 || IS_GEMINILAKE(dev_priv))
> + if (DISPLAY_VER(dev_priv) >= 10)
> return true;
>
> /* The number of lines are ignored for the level 0 watermark. */
> @@ -5246,8 +5245,7 @@ static void skl_compute_plane_wm(const struct
> intel_crtc_state *crtc_state,
> (wp->plane_bytes_per_line / wp->dbuf_block_size < 1)) {
> selected_result = method2;
> } else if (latency >= wp->linetime_us) {
> - if (IS_DISPLAY_VER(dev_priv, 9) &&
> - !IS_GEMINILAKE(dev_priv))
> + if (IS_DISPLAY_VER(dev_priv, 9))
> selected_result = min_fixed16(method1, method2);
> else
> selected_result = method2;
> @@ -5386,7 +5384,7 @@ static void skl_compute_transition_wm(struct
> drm_i915_private *dev_priv,
> trans_min = 14;
>
> /* Display WA #1140: glk,cnl */
> - if (IS_CANNONLAKE(dev_priv) || IS_GEMINILAKE(dev_priv))
> + if (IS_DISPLAY_VER(dev_priv, 10))
> trans_amount = 0;
> else
> trans_amount = 10; /* This is configurable amount */
> --
> 2.25.4
--
Ville Syrjälä
Intel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
