Commit 11a6b88b authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915/fbc: s/gen7/ivb/

"gen7" in display code is not really sensible. We shall call
these things "ivb".
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211104144520.22605-9-ville.syrjala@linux.intel.comAcked-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarMika Kahola <mika.kahola@intel.com>
parent 0242cd3a
...@@ -462,7 +462,7 @@ static void skl_fbc_program_cfb_stride(struct drm_i915_private *i915) ...@@ -462,7 +462,7 @@ static void skl_fbc_program_cfb_stride(struct drm_i915_private *i915)
CHICKEN_FBC_STRIDE_MASK, val); CHICKEN_FBC_STRIDE_MASK, val);
} }
static u32 gen7_dpfc_ctl(struct drm_i915_private *i915) static u32 ivb_dpfc_ctl(struct drm_i915_private *i915)
{ {
const struct intel_fbc_reg_params *params = &i915->fbc.params; const struct intel_fbc_reg_params *params = &i915->fbc.params;
u32 dpfc_ctl; u32 dpfc_ctl;
...@@ -481,7 +481,7 @@ static u32 gen7_dpfc_ctl(struct drm_i915_private *i915) ...@@ -481,7 +481,7 @@ static u32 gen7_dpfc_ctl(struct drm_i915_private *i915)
return dpfc_ctl; return dpfc_ctl;
} }
static void gen7_fbc_activate(struct drm_i915_private *dev_priv) static void ivb_fbc_activate(struct drm_i915_private *dev_priv)
{ {
if (DISPLAY_VER(dev_priv) >= 10) if (DISPLAY_VER(dev_priv) >= 10)
glk_fbc_program_cfb_stride(dev_priv); glk_fbc_program_cfb_stride(dev_priv);
...@@ -492,10 +492,10 @@ static void gen7_fbc_activate(struct drm_i915_private *dev_priv) ...@@ -492,10 +492,10 @@ static void gen7_fbc_activate(struct drm_i915_private *dev_priv)
snb_fbc_program_fence(dev_priv); snb_fbc_program_fence(dev_priv);
intel_de_write(dev_priv, ILK_DPFC_CONTROL, intel_de_write(dev_priv, ILK_DPFC_CONTROL,
DPFC_CTL_EN | gen7_dpfc_ctl(dev_priv)); DPFC_CTL_EN | ivb_dpfc_ctl(dev_priv));
} }
static bool gen7_fbc_is_compressing(struct drm_i915_private *i915) static bool ivb_fbc_is_compressing(struct drm_i915_private *i915)
{ {
if (DISPLAY_VER(i915) >= 8) if (DISPLAY_VER(i915) >= 8)
return intel_de_read(i915, IVB_FBC_STATUS2) & BDW_FBC_COMP_SEG_MASK; return intel_de_read(i915, IVB_FBC_STATUS2) & BDW_FBC_COMP_SEG_MASK;
...@@ -503,11 +503,11 @@ static bool gen7_fbc_is_compressing(struct drm_i915_private *i915) ...@@ -503,11 +503,11 @@ static bool gen7_fbc_is_compressing(struct drm_i915_private *i915)
return intel_de_read(i915, IVB_FBC_STATUS2) & IVB_FBC_COMP_SEG_MASK; return intel_de_read(i915, IVB_FBC_STATUS2) & IVB_FBC_COMP_SEG_MASK;
} }
static const struct intel_fbc_funcs gen7_fbc_funcs = { static const struct intel_fbc_funcs ivb_fbc_funcs = {
.activate = gen7_fbc_activate, .activate = ivb_fbc_activate,
.deactivate = ilk_fbc_deactivate, .deactivate = ilk_fbc_deactivate,
.is_active = ilk_fbc_is_active, .is_active = ilk_fbc_is_active,
.is_compressing = gen7_fbc_is_compressing, .is_compressing = ivb_fbc_is_compressing,
.nuke = snb_fbc_nuke, .nuke = snb_fbc_nuke,
}; };
...@@ -1685,7 +1685,7 @@ void intel_fbc_init(struct drm_i915_private *dev_priv) ...@@ -1685,7 +1685,7 @@ void intel_fbc_init(struct drm_i915_private *dev_priv)
} }
if (DISPLAY_VER(dev_priv) >= 7) if (DISPLAY_VER(dev_priv) >= 7)
fbc->funcs = &gen7_fbc_funcs; fbc->funcs = &ivb_fbc_funcs;
else if (DISPLAY_VER(dev_priv) == 6) else if (DISPLAY_VER(dev_priv) == 6)
fbc->funcs = &snb_fbc_funcs; fbc->funcs = &snb_fbc_funcs;
else if (DISPLAY_VER(dev_priv) == 5) else if (DISPLAY_VER(dev_priv) == 5)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment