From nobody Fri Dec 19 16:01:02 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61CFAC38A2D for ; Mon, 24 Oct 2022 13:56:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236800AbiJXN4P (ORCPT ); Mon, 24 Oct 2022 09:56:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236810AbiJXNyO (ORCPT ); Mon, 24 Oct 2022 09:54:14 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41007BD045; Mon, 24 Oct 2022 05:43:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D0E47612B1; Mon, 24 Oct 2022 12:40:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E309EC433C1; Mon, 24 Oct 2022 12:40:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615206; bh=RJBmdyzP/LnrpMS869Nw2Ok+b16pIUs3nLHfafTJDQw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eads1IjLuUjxxm94/PV25Y0hJCHPh/57f/ER624P6UWow2YZhvk31NOriIz8PFEai 0NRh4RehhojK+EZxyj7/ZUZeUrQm0MPPznTjQAxdeQUmzUIzKRhkmrjielod83Mv8F m4wnw8faDB2So9X6VotxptvExKZV35sPjfnYDI2s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Juha-Pekka Heikkila , =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Tvrtko Ursulin Subject: [PATCH 5.15 132/530] drm/i915: Fix watermark calculations for gen12+ CCS+CC modifier Date: Mon, 24 Oct 2022 13:27:56 +0200 Message-Id: <20221024113051.029959005@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ville Syrj=C3=A4l=C3=A4 commit 070a2855900de17b1e11a0dc35af9794e80f1a28 upstream. Take the gen12+ CCS+CC modifier into account when calculating the watermarks. Othwerwise we'll calculate the watermarks thinking this Y-tiled modifier is linear. The rc_surface part is actually a nop since that is not used for any glk+ platform. Cc: stable@vger.kernel.org Fixes: d1e2775e9b96 ("drm/i915/tgl: Add Clear Color support for TGL Render = Decompression") Reviewed-by: Juha-Pekka Heikkila Signed-off-by: Ville Syrj=C3=A4l=C3=A4 Link: https://patchwork.freedesktop.org/patch/msgid/20221003111544.8007-4-v= ille.syrjala@linux.intel.com (cherry picked from commit a627455bbe50a111475d7a42beb58fa64bd96c83) Signed-off-by: Tvrtko Ursulin Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/intel_pm.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -5404,12 +5404,14 @@ skl_compute_wm_params(const struct intel modifier =3D=3D I915_FORMAT_MOD_Y_TILED_CCS || modifier =3D=3D I915_FORMAT_MOD_Yf_TILED_CCS || modifier =3D=3D I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS || - modifier =3D=3D I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS; + modifier =3D=3D I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS || + modifier =3D=3D I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC; wp->x_tiled =3D modifier =3D=3D I915_FORMAT_MOD_X_TILED; wp->rc_surface =3D modifier =3D=3D I915_FORMAT_MOD_Y_TILED_CCS || modifier =3D=3D I915_FORMAT_MOD_Yf_TILED_CCS || modifier =3D=3D I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS || - modifier =3D=3D I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS; + modifier =3D=3D I915_FORMAT_MOD_Y_TILED_GEN12_MC_CCS || + modifier =3D=3D I915_FORMAT_MOD_Y_TILED_GEN12_RC_CCS_CC; wp->is_planar =3D intel_format_info_is_yuv_semiplanar(format, modifier); =20 wp->width =3D width;