lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 187/862] drm/i915: Fix watermark calculations for DG2 CCS modifiers
    Date
    From: Ville Syrjälä <ville.syrjala@linux.intel.com>

    commit ccfa6d35f9233702c924316cdf40c05b6ce88113 upstream.

    Take the DG2 CCS modifiers into account when calculating the
    watermarks. Othwerwise we'll calculate the watermarks thinking these
    tile-4 modifiers are linear.

    The rc_surface part is actually a nop since that is not used
    for any glk+ platform.

    Cc: stable@vger.kernel.org
    Fixes: 4c3afa72138c ("drm/i915/dg2: Add support for DG2 render and media compression")
    Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
    Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
    Link: https://patchwork.freedesktop.org/patch/msgid/20221003111544.8007-5-ville.syrjala@linux.intel.com
    (cherry picked from commit f25d9f81a8e09ace4f04106995550bae1f522143)
    Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/gpu/drm/i915/intel_pm.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    --- a/drivers/gpu/drm/i915/intel_pm.c
    +++ b/drivers/gpu/drm/i915/intel_pm.c
    @@ -5311,13 +5311,17 @@ skl_compute_wm_params(const struct intel
    modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
    modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
    modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
    - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC;
    + modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
    + modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
    + modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS;
    wp->x_tiled = modifier == I915_FORMAT_MOD_X_TILED;
    wp->rc_surface = modifier == I915_FORMAT_MOD_Y_TILED_CCS ||
    modifier == I915_FORMAT_MOD_Yf_TILED_CCS ||
    modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS ||
    modifier == I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS ||
    - modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC;
    + modifier == I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC ||
    + modifier == I915_FORMAT_MOD_4_TILED_DG2_RC_CCS ||
    + modifier == I915_FORMAT_MOD_4_TILED_DG2_MC_CCS;
    wp->is_planar = intel_format_info_is_yuv_semiplanar(format, modifier);

    wp->width = width;

    \
     
     \ /
      Last update: 2022-10-19 14:01    [W:2.309 / U:1.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site