From patchwork Sun Oct 1 11:31:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Govindapillai, Vinod" X-Patchwork-Id: 13405370 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 08E37E748F5 for ; Sun, 1 Oct 2023 11:32:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E636910E1FA; Sun, 1 Oct 2023 11:32:17 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3FF0110E1FA for ; Sun, 1 Oct 2023 11:32:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696159934; x=1727695934; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rxeBQOy+IsaHWnSDyPdF2YE6u5bOSwdmFRvon2k5dMQ=; b=H1HR6E80e0YfO/gLlyvuqhwOs4DdhTbQRizTSsLQjVnXbh4xDJb23+ar yAONg44v5qzQGvmlA+YuibSOoYV2KUottjcnkZI+aa5eGOE13iGFt8XVs s0Dpw/TPSBfeuA3Qgblj4mi7/mjfOZ7jcc/Q8NfV2VxHTmUkwk++Afi/e fNFdrICqJtmXDi3BLFtVW2WSAfgjmTasFVo11KUlsk5MFu+W3Vm/Hzo1q 1qQYPfmXKpdh0ptxFWXTHA+8aLl8k4ykHgclzxTaCU1GAabPsqhRREut8 2ywRAmiFB5HzddUIOutXXg96tvKF8i1laWHXAAz/E+StCz6ozM/w7QejO A==; X-IronPort-AV: E=McAfee;i="6600,9927,10849"; a="386386660" X-IronPort-AV: E=Sophos;i="6.03,191,1694761200"; d="scan'208";a="386386660" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2023 04:32:12 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10849"; a="753804726" X-IronPort-AV: E=Sophos;i="6.03,191,1694761200"; d="scan'208";a="753804726" Received: from catjim-mobl.ger.corp.intel.com (HELO vgovind2-mobl3.intel.com) ([10.249.34.14]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2023 04:32:10 -0700 From: Vinod Govindapillai To: intel-gfx@lists.freedesktop.org Date: Sun, 1 Oct 2023 14:31:53 +0300 Message-Id: <20231001113155.80659-2-vinod.govindapillai@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231001113155.80659-1-vinod.govindapillai@intel.com> References: <20231001113155.80659-1-vinod.govindapillai@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH v1 1/3] drm/i915/xe2lpd: display capability register definitions X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Register definitions to track the reported scalable display feature configurations Bspec: 71161 Signed-off-by: Vinod Govindapillai --- drivers/gpu/drm/i915/i915_reg.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index e0ea2dc13556..dc70c1777345 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -4678,6 +4678,13 @@ #define TGL_DFSM_PIPE_D_DISABLE (1 << 22) #define GLK_DFSM_DISPLAY_DSC_DISABLE (1 << 7) +#define XE2LPD_DE_CAP _MMIO(0x41100) +#define XE2LPD_DE_CAP_3DLUT_MASK REG_GENMASK(31, 30) +#define XE2LPD_DE_CAP_DSC_MASK REG_GENMASK(29, 28) +#define XE2LPD_DE_CAP_DSC_REMOVED 1 +#define XE2LPD_DE_CAP_SCALER_MASK REG_GENMASK(27, 26) +#define XE2LPD_DE_CAP_SCALER_SINGLE 1 + #define SKL_DSSM _MMIO(0x51004) #define ICL_DSSM_CDCLK_PLL_REFCLK_MASK (7 << 29) #define ICL_DSSM_CDCLK_PLL_REFCLK_24MHz (0 << 29) From patchwork Sun Oct 1 11:31:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Govindapillai, Vinod" X-Patchwork-Id: 13405371 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0D552E748E9 for ; Sun, 1 Oct 2023 11:32:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E398610E1FC; Sun, 1 Oct 2023 11:32:18 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0CB3710E1FA for ; Sun, 1 Oct 2023 11:32:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696159936; x=1727695936; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=6ds10U1uVdXBYwo0XLaiWcEgyOD7T3uAqn3f9UsV4xI=; b=Q4YquG95BlIBFnp4xOiOcxMVmXoO2SwTF7Df94EwVK9URlEBCBObaBn5 fmT48IIFbu/3U03y+EbbZ0uBMR0PUo+THE+Vatz35uMftxWgcjaePmdwz kTku5S0XvWpvdbP+muxGCh8/bBY15cJ14tPyi1KkErBUGdAKFWZl/Iw2w W+CVZuypdI4MjVMJ3ovfFCr3jF7X+IF8FMKJxtcl6bnCnEcWraAanxxLk HPxIF+VV3Z+Qiz7DnncS3i1SvVzyuwDD/8DUY9gys7dLwm4elo64dsis+ c89Qand73vCIWZUu4axPAm7igvMWSvkkSjYIm8bgriIb1Wm0P6bVzfNKs A==; X-IronPort-AV: E=McAfee;i="6600,9927,10849"; a="386386661" X-IronPort-AV: E=Sophos;i="6.03,191,1694761200"; d="scan'208";a="386386661" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2023 04:32:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10849"; a="753804734" X-IronPort-AV: E=Sophos;i="6.03,191,1694761200"; d="scan'208";a="753804734" Received: from catjim-mobl.ger.corp.intel.com (HELO vgovind2-mobl3.intel.com) ([10.249.34.14]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2023 04:32:13 -0700 From: Vinod Govindapillai To: intel-gfx@lists.freedesktop.org Date: Sun, 1 Oct 2023 14:31:54 +0300 Message-Id: <20231001113155.80659-3-vinod.govindapillai@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231001113155.80659-1-vinod.govindapillai@intel.com> References: <20231001113155.80659-1-vinod.govindapillai@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH v1 2/3] drm/i915/xe2lpd: update the dsc feature capability X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Update the global dsc flag based on the display capabilities reported. v1: define the field values instead of the magic number (JaniN) Bspec: 71161 Signed-off-by: Vinod Govindapillai --- drivers/gpu/drm/i915/display/intel_display_device.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c index a6a18eae7ae8..2c891fe4d74b 100644 --- a/drivers/gpu/drm/i915/display/intel_display_device.c +++ b/drivers/gpu/drm/i915/display/intel_display_device.c @@ -1065,6 +1065,14 @@ void intel_display_device_info_runtime_init(struct drm_i915_private *i915) display_runtime->has_dsc = 0; } + if (DISPLAY_VER(i915) >= 20) { + u32 cap = intel_de_read(i915, XE2LPD_DE_CAP); + + if (REG_FIELD_GET(XE2LPD_DE_CAP_DSC_MASK, cap) == + XE2LPD_DE_CAP_DSC_REMOVED) + display_runtime->has_dsc = 0; + } + return; display_fused_off: From patchwork Sun Oct 1 11:31:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Govindapillai, Vinod" X-Patchwork-Id: 13405372 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2CC72E748ED for ; Sun, 1 Oct 2023 11:32:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7774210E1FB; Sun, 1 Oct 2023 11:32:22 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id D434B10E1FB for ; Sun, 1 Oct 2023 11:32:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696159938; x=1727695938; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TZQi2wKtbEoNgUbx3S8R0ZbyHVZQxJTm/6XxepKvj8I=; b=dcgcMXcah8LN/gCJE/ocK6gEsj/Ni8C0obrRl55sLOhwXHRFa1Tm/8sm /4qc8zD7PChu+/A4S5LY+fINdGQcw9jzrEl3g1ebGdCDZ23hQcGaI6Q0q TbU+CisS8U2EYR9eB1AA+x8CbN2wlrz0AGx3CNSwBxYU4rjdzQbsx8NUp jP5VpwGqJySjPNdupylML+pfnPrA5drxo3X/3uOROikVLGOO3Uztzm4rO I18d/UylhDxsS2e/NqPKzXREFSpTg3Ay3G2DRGh4tvnv/9suH8yMcE2/J Zh8Oqp1FIP3Ib5B1O3ESDHS3kWiTUMjxs6uGU8dXlbk4ZWk7viiSz08u+ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10849"; a="386386666" X-IronPort-AV: E=Sophos;i="6.03,191,1694761200"; d="scan'208";a="386386666" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2023 04:32:18 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10849"; a="753804747" X-IronPort-AV: E=Sophos;i="6.03,191,1694761200"; d="scan'208";a="753804747" Received: from catjim-mobl.ger.corp.intel.com (HELO vgovind2-mobl3.intel.com) ([10.249.34.14]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Oct 2023 04:32:16 -0700 From: Vinod Govindapillai To: intel-gfx@lists.freedesktop.org Date: Sun, 1 Oct 2023 14:31:55 +0300 Message-Id: <20231001113155.80659-4-vinod.govindapillai@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231001113155.80659-1-vinod.govindapillai@intel.com> References: <20231001113155.80659-1-vinod.govindapillai@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH v1 3/3] drm/i915/xe2lpd: update the scaler feature capability X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Update the number of scalers per pipe based on the display capabilities reported. v1: define the field values instead of the magic number (JaniN) Bspec: 71161 Signed-off-by: Vinod Govindapillai --- drivers/gpu/drm/i915/display/intel_display_device.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c index 2c891fe4d74b..bb4fdfba138c 100644 --- a/drivers/gpu/drm/i915/display/intel_display_device.c +++ b/drivers/gpu/drm/i915/display/intel_display_device.c @@ -1071,6 +1071,13 @@ void intel_display_device_info_runtime_init(struct drm_i915_private *i915) if (REG_FIELD_GET(XE2LPD_DE_CAP_DSC_MASK, cap) == XE2LPD_DE_CAP_DSC_REMOVED) display_runtime->has_dsc = 0; + + if (REG_FIELD_GET(XE2LPD_DE_CAP_SCALER_MASK, cap) == + XE2LPD_DE_CAP_SCALER_SINGLE) { + for_each_pipe(i915, pipe) + if (display_runtime->num_scalers[pipe]) + display_runtime->num_scalers[pipe] = 1; + } } return;