leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915/fbc: Extract {skl,glk}_fbc_program_cfb_stride()

Browse Source 
Declutter gen7_fbc_activate() by sucking the override
stride programming stuff into helpers.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211104144520.22605-3-ville.syrjala@linux.intel.com
Acked-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Mika Kahola <mika.kahola@intel.com>
This commit is contained in:
Ville Syrjälä 2021-11-04 16:45:05 +02:00
parent b50364af7a
commit 2013ab1849
1 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/gpu/drm/i915/display/intel_fbc.c
View File

@ -360,21 +360,23 @@ static bool ilk_fbc_is_active(struct drm_i915_private *dev_priv)
return intel_de_read(dev_priv, ILK_DPFC_CONTROL) & DPFC_CTL_EN; return intel_de_read(dev_priv, ILK_DPFC_CONTROL) & DPFC_CTL_EN;
} }
static void gen7_fbc_activate(struct drm_i915_private *dev_priv) static void glk_fbc_program_cfb_stride(struct drm_i915_private *i915)
{ {
struct intel_fbc *fbc = &dev_priv->fbc; struct intel_fbc *fbc = &i915->fbc;
const struct intel_fbc_reg_params *params = &fbc->params; const struct intel_fbc_reg_params *params = &fbc->params;
u32 dpfc_ctl;
if (DISPLAY_VER(dev_priv) >= 10) {
u32 val = 0; u32 val = 0;
if (params->override_cfb_stride) if (params->override_cfb_stride)
val |= FBC_STRIDE_OVERRIDE | val |= FBC_STRIDE_OVERRIDE |
FBC_STRIDE(params->override_cfb_stride / fbc->limit); FBC_STRIDE(params->override_cfb_stride / fbc->limit);
intel_de_write(dev_priv, GLK_FBC_STRIDE, val); intel_de_write(i915, GLK_FBC_STRIDE, val);
} else if (DISPLAY_VER(dev_priv) == 9) { }
static void skl_fbc_program_cfb_stride(struct drm_i915_private *i915)
{
struct intel_fbc *fbc = &i915->fbc;
const struct intel_fbc_reg_params *params = &fbc->params;
u32 val = 0; u32 val = 0;
/* Display WA #0529: skl, kbl, bxt. */ /* Display WA #0529: skl, kbl, bxt. */
@ -382,10 +384,21 @@ static void gen7_fbc_activate(struct drm_i915_private *dev_priv)
val |= CHICKEN_FBC_STRIDE_OVERRIDE | val |= CHICKEN_FBC_STRIDE_OVERRIDE |
CHICKEN_FBC_STRIDE(params->override_cfb_stride / fbc->limit); CHICKEN_FBC_STRIDE(params->override_cfb_stride / fbc->limit);
intel_de_rmw(dev_priv, CHICKEN_MISC_4, intel_de_rmw(i915, CHICKEN_MISC_4,
CHICKEN_FBC_STRIDE_OVERRIDE | CHICKEN_FBC_STRIDE_OVERRIDE |
CHICKEN_FBC_STRIDE_MASK, val); CHICKEN_FBC_STRIDE_MASK, val);
} }
static void gen7_fbc_activate(struct drm_i915_private *dev_priv)
{
struct intel_fbc *fbc = &dev_priv->fbc;
const struct intel_fbc_reg_params *params = &fbc->params;
u32 dpfc_ctl;
if (DISPLAY_VER(dev_priv) >= 10)
glk_fbc_program_cfb_stride(dev_priv);
else if (DISPLAY_VER(dev_priv) == 9)
skl_fbc_program_cfb_stride(dev_priv);
dpfc_ctl = 0; dpfc_ctl = 0;
if (IS_IVYBRIDGE(dev_priv)) if (IS_IVYBRIDGE(dev_priv))