From patchwork Wed Sep 27 10:17:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Govindapillai X-Patchwork-Id: 13400619 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 663F2E810BB for ; Wed, 27 Sep 2023 10:17:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CC95B10E4C9; Wed, 27 Sep 2023 10:17:52 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1670910E4C9 for ; Wed, 27 Sep 2023 10:17:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695809869; x=1727345869; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=RiORLjZNcKfbuEKMByvw/zQV34VIQefJ7XGQjY7yegc=; b=PQMdh1WPc4E8DW2C4FNEb/NZ8H1AQDMJGF4h/x8iQ4W5LOwGi3zqVBUS 3XcUrtQL90NfOLSC333ZxxsLctDD6u6FT9zhQFcAaqGb3IFzyDd9R+i+4 wHg6eRfALBM7LwsahmuhwBGW/kWNAQnCftYoDdvQR0AZRzUkKdGcxWwcs gNyavskX4/OKwLOB9RNRL1HkHuvmuUOk0OIh4JW+celJ7B0Odo2aoQ1w5 AVvbFSCgQYaqP2zTHPDeZqYuPf9A2k7p0PErYu8slejTBVOAO0Ts+ojSe oCR5eginDjwcy2z52L4iH3goyT8L0ZSGd6MyOPN/G60WhCepcGpFIUr4r g==; X-IronPort-AV: E=McAfee;i="6600,9927,10845"; a="372130177" X-IronPort-AV: E=Sophos;i="6.03,179,1694761200"; d="scan'208";a="372130177" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2023 03:17:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10845"; a="778488161" X-IronPort-AV: E=Sophos;i="6.03,179,1694761200"; d="scan'208";a="778488161" Received: from akorotox-mobl.ger.corp.intel.com (HELO vgovind2-mobl3.intel.com) ([10.252.52.218]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2023 03:17:46 -0700 From: Vinod Govindapillai To: intel-gfx@lists.freedesktop.org Date: Wed, 27 Sep 2023 13:17:27 +0300 Message-Id: <20230927101729.18681-2-vinod.govindapillai@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230927101729.18681-1-vinod.govindapillai@intel.com> References: <20230927101729.18681-1-vinod.govindapillai@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index e0ea2dc13556..afb0697eafa5 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -4678,6 +4678,11 @@ #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_SCALER_MASK REG_GENMASK(27, 26) + #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 Wed Sep 27 10:17:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Govindapillai X-Patchwork-Id: 13400620 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 1918BE810BE for ; Wed, 27 Sep 2023 10:18:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6C95710E4CA; Wed, 27 Sep 2023 10:18:00 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id C15F510E4C9 for ; Wed, 27 Sep 2023 10:17:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695809871; x=1727345871; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4vhPzqEB3Z7dY3Hr/bC49p+5GhGxWXmVtwalcJ8aG2M=; b=GcJ1QOKXMGKYzQ/gcoPv5hdq1ZWepb054eChr1xecMwgD94U7HEs0LYK eGshWaiwOmQ59FS/tywkOouFRQlfO1DxM+bkxuJdRDLAX671VpabGtpiZ WCMC/qYgTM2/lCxZf6sxax4BgVhYcGY+L9kw8osRf/213yxgcbed9/Dyq WEu74ZG5ObKMSxPOtX2uwQB5r9PbMyJLw/vp4TC3dBoatrdmm8imf+eJO dK42w1myiPhPfhJ3ulP43NYgSuB7KsOpPWiBQBHn8DpmKFWnGQ8rt+GXB gIN4TPDvobZs7scnJcfE1HHweiej6KY9/P6Zcp0/5uouyMj+w0xiZnip2 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10845"; a="372130183" X-IronPort-AV: E=Sophos;i="6.03,179,1694761200"; d="scan'208";a="372130183" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2023 03:17:51 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10845"; a="778488164" X-IronPort-AV: E=Sophos;i="6.03,179,1694761200"; d="scan'208";a="778488164" Received: from akorotox-mobl.ger.corp.intel.com (HELO vgovind2-mobl3.intel.com) ([10.252.52.218]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2023 03:17:49 -0700 From: Vinod Govindapillai To: intel-gfx@lists.freedesktop.org Date: Wed, 27 Sep 2023 13:17:28 +0300 Message-Id: <20230927101729.18681-3-vinod.govindapillai@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230927101729.18681-1-vinod.govindapillai@intel.com> References: <20230927101729.18681-1-vinod.govindapillai@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 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. 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 a6a18eae7ae8..e51506e37384 100644 --- a/drivers/gpu/drm/i915/display/intel_display_device.c +++ b/drivers/gpu/drm/i915/display/intel_display_device.c @@ -1065,6 +1065,13 @@ 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) == 1) + display_runtime->has_dsc = 0; + } + return; display_fused_off: From patchwork Wed Sep 27 10:17:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Govindapillai X-Patchwork-Id: 13400621 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 BF29CE810BD for ; Wed, 27 Sep 2023 10:18:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6DC7110E4CB; Wed, 27 Sep 2023 10:18:00 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.20]) by gabe.freedesktop.org (Postfix) with ESMTPS id CEEA010E4CB for ; Wed, 27 Sep 2023 10:17:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1695809874; x=1727345874; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NTMfVy4dr80zsDUir5gJ6CmEdJsMolF+b2iut/nCAck=; b=McZ9PSPJbOZ//u/dIGTYcN0HG/Fb/SzjlFAzWgFKqP+mtLl5ms+R30lZ cCgtNN/NWYfZnpum6XJT+mVy6Jm6DehhosTayEd03AhO3YF5uoeNO2pRO QcTUSuaYj7xeJY4EX4SWGpmnJdBIJN9KHcHNiapJ/701EhsISPzgm+z67 UHew4eWvLUoKfFJE+tm8v8B2fxIsOUVlHIMIWcKRNoNj9IYolLrhM7fmE AHfnqvVMo94mKIVYhtM1aPXYIdmE7f3yCWgNNx6/nuqEL6clG7K3eAYfU jmpdTT5FmOsAe7nnP6TIN/npsE5ElwbAchZpwEA4JgAixAA24MbhyjmWV g==; X-IronPort-AV: E=McAfee;i="6600,9927,10845"; a="372130194" X-IronPort-AV: E=Sophos;i="6.03,179,1694761200"; d="scan'208";a="372130194" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2023 03:17:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10845"; a="778488167" X-IronPort-AV: E=Sophos;i="6.03,179,1694761200"; d="scan'208";a="778488167" Received: from akorotox-mobl.ger.corp.intel.com (HELO vgovind2-mobl3.intel.com) ([10.252.52.218]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Sep 2023 03:17:51 -0700 From: Vinod Govindapillai To: intel-gfx@lists.freedesktop.org Date: Wed, 27 Sep 2023 13:17:29 +0300 Message-Id: <20230927101729.18681-4-vinod.govindapillai@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230927101729.18681-1-vinod.govindapillai@intel.com> References: <20230927101729.18681-1-vinod.govindapillai@intel.com> MIME-Version: 1.0 Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Subject: [Intel-gfx] [PATCH 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. Bspec: 71161 Signed-off-by: Vinod Govindapillai --- drivers/gpu/drm/i915/display/intel_display_device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_display_device.c b/drivers/gpu/drm/i915/display/intel_display_device.c index e51506e37384..dea9b6ab069e 100644 --- a/drivers/gpu/drm/i915/display/intel_display_device.c +++ b/drivers/gpu/drm/i915/display/intel_display_device.c @@ -1070,6 +1070,12 @@ void intel_display_device_info_runtime_init(struct drm_i915_private *i915) if (REG_FIELD_GET(XE2LPD_DE_CAP_DSC_MASK, cap) == 1) display_runtime->has_dsc = 0; + + if (REG_FIELD_GET(XE2LPD_DE_CAP_SCALER_MASK, cap) == 1) { + for_each_pipe(i915, pipe) + if (display_runtime->num_scalers[pipe]) + display_runtime->num_scalers[pipe] = 1; + } } return;