From patchwork Fri Oct 25 06:01:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Kandpal X-Patchwork-Id: 13850068 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 13B0ED116F7 for ; Fri, 25 Oct 2024 06:01:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A7C1010E296; Fri, 25 Oct 2024 06:01:58 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="XofbEWur"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id EAD3010E280; Fri, 25 Oct 2024 06:01:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729836117; x=1761372117; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JljgrqF/O9UKnBr4XfOowQ0Bz/ijHlGNu9SKcGI+1zs=; b=XofbEWurfzq/gNCncArJv5DPHTy9eBckXirvXBbQGe07Q68sZJhbnQ2i jvImSt6jf0T7raa9lVkeFQ92oGD0cf61txpzSnMKJnO3wtGVSWLAxEu7d lumwis4JiIrAIoN+pGsKHEqj6+Tb4tQkANF8E2rrIpXHV87WN7YhCpGBC Ltc8BnlNJMz9OimQavBhSVVUoDPvewwaYQq5mczB1yE9cbpy35MosaKDO uQzgsajdLLJq01npjSO9QDudEn/bkWjIEja0CtdspzAozc4JGYFf9HJ8h GhA9583geA62RfoSNTHYnZsCxKvvZxYAN05F22DspjRJA4ycBGD2dYLv+ Q==; X-CSE-ConnectionGUID: Lrm5UZ4KTe+mXWbmmOLAFQ== X-CSE-MsgGUID: yVCeFCVyTv6Hk/NkGZ/Ykg== X-IronPort-AV: E=McAfee;i="6700,10204,11222"; a="29620677" X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="29620677" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Oct 2024 23:01:57 -0700 X-CSE-ConnectionGUID: TTGknhVgQCe5rXTsWdJTAA== X-CSE-MsgGUID: ZvBic3lkTXq0Q3NCdHq9sg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,231,1725346800"; d="scan'208";a="80734401" Received: from unknown (HELO kandpal-X299-UD4-Pro.iind.intel.com) ([10.190.239.10]) by orviesa009.jf.intel.com with ESMTP; 24 Oct 2024 23:01:55 -0700 From: Suraj Kandpal To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: ankit.k.nautiyal@intel.com, matthew.d.roper@intel.com, Suraj Kandpal Subject: [PATCH 1/5] drm/i915/display: Fix the plane max height and width limits Date: Fri, 25 Oct 2024 11:31:32 +0530 Message-Id: <20241025060136.9884-2-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241025060136.9884-1-suraj.kandpal@intel.com> References: <20241025060136.9884-1-suraj.kandpal@intel.com> MIME-Version: 1.0 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" Fix the plane max height and width limits taking into account the joined pipe limits too. Bspec: 28692, 49199, 68858 Fixes: 63dc014e37b9 ("drm/i915/dp: Allow big joiner modes in intel_dp_mode_valid(), v3.") Signed-off-by: Suraj Kandpal --- drivers/gpu/drm/i915/display/intel_display.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index ef1436146325..fc578af4f394 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -8450,9 +8450,22 @@ intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv, * plane so let's not advertize modes that are * too big for that. */ - if (DISPLAY_VER(dev_priv) >= 11) { - plane_width_max = 5120 * num_joined_pipes; - plane_height_max = 4320; + if (DISPLAY_VER(dev_priv) >= 20) { + if (num_joined_pipes > 1) { + plane_width_max = 8192; + plane_height_max = 4800; + } else { + plane_width_max = 5120; + plane_height_max = 4096; + } + } else if (DISPLAY_VER(dev_priv) >= 11) { + if (num_joined_pipes > 1) { + plane_width_max = 7680; + plane_height_max = 4320; + } else { + plane_width_max = 5120; + plane_height_max = 4096; + } } else { plane_width_max = 5120; plane_height_max = 4096; From patchwork Fri Oct 25 06:01:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Kandpal X-Patchwork-Id: 13850069 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 F2DD3D116F7 for ; Fri, 25 Oct 2024 06:02:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 993F110E2A9; Fri, 25 Oct 2024 06:02:01 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="BwISJcvE"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0CD8710E2A6; Fri, 25 Oct 2024 06:01:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729836120; x=1761372120; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=X7EvmaGzGdHg0RvAvvCrSuqXiaa9aa6Tz63S4fJDhck=; b=BwISJcvEVNy5sv5x3EjMqNYiqk4l+WtEv2b/vCSaciF0OqisAIicJT8s 5D8Yecq4AnZ63yVuLaOzMz8HDSm6H6QMkuURBM27/ynU+m4ALDkjKlO8B tBzJO9YqoWPBrEdhsXVHfKyskotfWoWh/qxgVPbjl2WRXOu6rCGUhcIot QhN1+Kl3HPVsSZ9yklQFY0CpUPb7jYXWfY0I34lDFT3+MknkmP2ZY8lTw ALW83Cw1UIpwnnicrm5q89e5xM8NX6WsPaRWYvjKYxGS6fwhmb3TKuO5E b5o58+BUtohGZHt7CUGeFV5qW79MJ+RsjBwXbELrnp8zJLAtX92JTNQnF A==; X-CSE-ConnectionGUID: WujUNxUaTGqHKIGcRKgsoA== X-CSE-MsgGUID: AikT3Gn+Qe++n+n/qzPR3w== X-IronPort-AV: E=McAfee;i="6700,10204,11222"; a="29620685" X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="29620685" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Oct 2024 23:01:59 -0700 X-CSE-ConnectionGUID: wSkwca48Tnu3p8jucohAOA== X-CSE-MsgGUID: vH2d7v5JRs68gQSK0x6BxA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,231,1725346800"; d="scan'208";a="80734408" Received: from unknown (HELO kandpal-X299-UD4-Pro.iind.intel.com) ([10.190.239.10]) by orviesa009.jf.intel.com with ESMTP; 24 Oct 2024 23:01:57 -0700 From: Suraj Kandpal To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: ankit.k.nautiyal@intel.com, matthew.d.roper@intel.com, Suraj Kandpal , Arun R Murthy Subject: [PATCH 2/5] drm/i915/xe3lpd: Increase resolution for plane to support 6k Date: Fri, 25 Oct 2024 11:31:33 +0530 Message-Id: <20241025060136.9884-3-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241025060136.9884-1-suraj.kandpal@intel.com> References: <20241025060136.9884-1-suraj.kandpal@intel.com> MIME-Version: 1.0 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" DISPLAY_VER >= 30 onwards CRTC can now support 6k resolution. Increase pipe and plane max width and height to reflect this increase in resolution. --v2 -Take care of the subsampling scenario sooner rather than later [Matt] --v3 -Take care of the joined pipe limits too [Ankit/Matt] Signed-off-by: Arun R Murthy Signed-off-by: Suraj Kandpal Reviewed-by: Ankit Nautiyal --- drivers/gpu/drm/i915/display/intel_display.c | 10 +++++++++- .../gpu/drm/i915/display/skl_universal_plane.c | 16 +++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index fc578af4f394..80092879ebcf 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -8450,7 +8450,15 @@ intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv, * plane so let's not advertize modes that are * too big for that. */ - if (DISPLAY_VER(dev_priv) >= 20) { + if (DISPLAY_VER(dev_priv) >= 30) { + if (num_joined_pipes > 1) { + plane_width_max = 8192; + plane_height_max = 4800; + } else { + plane_width_max = 6144; + plane_height_max = 4096; + } + } else if (DISPLAY_VER(dev_priv) >= 20) { if (num_joined_pipes > 1) { plane_width_max = 8192; plane_height_max = 4800; diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c index a0a7ed01415a..29e52af5f206 100644 --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c @@ -431,6 +431,16 @@ static int icl_plane_min_width(const struct drm_framebuffer *fb, } } +static int xe3_plane_max_width(const struct drm_framebuffer *fb, + int color_plane, + unsigned int rotation) +{ + if (intel_format_info_is_yuv_semiplanar(fb->format, fb->modifier)) + return 4096; + else + return 6144; +} + static int icl_hdr_plane_max_width(const struct drm_framebuffer *fb, int color_plane, unsigned int rotation) @@ -2584,7 +2594,11 @@ skl_universal_plane_create(struct drm_i915_private *dev_priv, intel_fbc_add_plane(skl_plane_fbc(dev_priv, pipe, plane_id), plane); - if (DISPLAY_VER(dev_priv) >= 11) { + if (DISPLAY_VER(dev_priv) >= 30) { + plane->max_width = xe3_plane_max_width; + plane->max_height = icl_plane_max_height; + plane->min_cdclk = icl_plane_min_cdclk; + } else if (DISPLAY_VER(dev_priv) >= 11) { plane->min_width = icl_plane_min_width; if (icl_is_hdr_plane(dev_priv, plane_id)) plane->max_width = icl_hdr_plane_max_width; From patchwork Fri Oct 25 06:01:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Kandpal X-Patchwork-Id: 13850070 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 981A8D116F6 for ; Fri, 25 Oct 2024 06:02:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3926410E2AB; Fri, 25 Oct 2024 06:02:02 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="M+xpjrn1"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id E328C10E2A9; Fri, 25 Oct 2024 06:02:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729836121; x=1761372121; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=9XJ+i2Hc2FA9E1ovsmjZtMztvZmTFwGCJD7KNIQQDVc=; b=M+xpjrn1GgGnR8tFsa8aJISEAsFQyE+xaN0hWJBNKbg8wW9vRHA5zlWS i/lCqR9gxyLkh8L9I/1Hn6iLGH9s3CY+pPg4UCPl9eFJpRuI4Obixy2kk oqtvAY6Xi5h5brcY4opulAdsgih1kmXN9NY3sRV5dbLbKHM3kdzHRJmdM fpMO9FVY/KxqcpCeBd/MCG0n7QyFxjN2QAOXG33C9FU4ngUxNplowQ+bK PsqqAVbLnejRBZeEPDjq+7xgAv5cQ+/lFk+OtbhfEOv53X+0GDETW8ldf GLyIivo/doCJhtPxm7UzW+e3coCxnVpeIL2Ji2Dgt0W1u5dA5H8tAXk5L g==; X-CSE-ConnectionGUID: sgW3j/1HQpC/FO6DGg1JmA== X-CSE-MsgGUID: lCv8uPZ9QRu0Gnv7/A33YA== X-IronPort-AV: E=McAfee;i="6700,10204,11222"; a="29620690" X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="29620690" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Oct 2024 23:02:01 -0700 X-CSE-ConnectionGUID: v6eISAV7Sc+TRWsAoeZV4w== X-CSE-MsgGUID: 6w3n+u3URceBqObY8AclqQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,231,1725346800"; d="scan'208";a="80734415" Received: from unknown (HELO kandpal-X299-UD4-Pro.iind.intel.com) ([10.190.239.10]) by orviesa009.jf.intel.com with ESMTP; 24 Oct 2024 23:01:59 -0700 From: Suraj Kandpal To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: ankit.k.nautiyal@intel.com, matthew.d.roper@intel.com, Suraj Kandpal Subject: [PATCH 3/5] drm/i915/psr: Increase psr size limits for Xe2 Date: Fri, 25 Oct 2024 11:31:34 +0530 Message-Id: <20241025060136.9884-4-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241025060136.9884-1-suraj.kandpal@intel.com> References: <20241025060136.9884-1-suraj.kandpal@intel.com> MIME-Version: 1.0 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" Increase the psr max_h limit to 4096. Bspec: 69885, 68858 Signed-off-by: Suraj Kandpal --- drivers/gpu/drm/i915/display/intel_psr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index 4176163ec19a..c22386a31a63 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1453,7 +1453,11 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp, return false; } - if (DISPLAY_VER(display) >= 12) { + if (DISPLAY_VER(display) >= 20) { + psr_max_h = 5120; + psr_max_v = 4096; + max_bpp = 30; + } else if (DISPLAY_VER(display) >= 12) { psr_max_h = 5120; psr_max_v = 3200; max_bpp = 30; From patchwork Fri Oct 25 06:01:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Kandpal X-Patchwork-Id: 13850072 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 89DBFD116F7 for ; Fri, 25 Oct 2024 06:02:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2A37C10E9F7; Fri, 25 Oct 2024 06:02:10 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="AO4myD6U"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id 00C8B10E9F2; Fri, 25 Oct 2024 06:02:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729836123; x=1761372123; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ygLf1qwjCGJnVMN2z4MEIWKbmlDCHscQUfhIZo+LoAw=; b=AO4myD6UV4GcXENhN3eJnWXhHpcaBRTUSkJ8KDAZ3rZdu5j0UDqnBqlP bOQeQ15/ViT7MTy8u/E/0JasTSB2Dfo2XaGWkmrB6W9dZWUx6/JG0QuGg Gc3LRBJOgE5LWnP7IgF7JJ8Vjkf9d/rJxbEY2/XmInTcMHI3eHM3se4y6 NLUmZOKBUxsw9Inn0lPbLWzvreeSxymdk+gH0CmA7luB6wfhsaFmAzZpp hRteCnMOdasfNDIl9RVMnL8GU6ZOGLMs1psiNLDDHI72qiIACTSngGOQL 6pE4vvnI5T4Alf0/s+KJZrAuaZSY5VvB2YWDGKWvbk8S/6IZVdRZCRIgX Q==; X-CSE-ConnectionGUID: et9/iYI8SWeQgJTyee4Omw== X-CSE-MsgGUID: 5cxV82PRQqG/MI/60ZUCeg== X-IronPort-AV: E=McAfee;i="6700,10204,11222"; a="29620700" X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="29620700" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Oct 2024 23:02:03 -0700 X-CSE-ConnectionGUID: vdAklypHQ4Wq98Yu5gXo6g== X-CSE-MsgGUID: McwnwT7DRsGp05wtMIttvw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,231,1725346800"; d="scan'208";a="80734425" Received: from unknown (HELO kandpal-X299-UD4-Pro.iind.intel.com) ([10.190.239.10]) by orviesa009.jf.intel.com with ESMTP; 24 Oct 2024 23:02:01 -0700 From: Suraj Kandpal To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: ankit.k.nautiyal@intel.com, matthew.d.roper@intel.com, Suraj Kandpal Subject: [PATCH 4/5] drm/i915/xe3lpd: Increase max_h max_v for PSR Date: Fri, 25 Oct 2024 11:31:35 +0530 Message-Id: <20241025060136.9884-5-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241025060136.9884-1-suraj.kandpal@intel.com> References: <20241025060136.9884-1-suraj.kandpal@intel.com> MIME-Version: 1.0 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" Spec states that PSR max active is same as max pipe active values. Now that each pipe supports 6k resolution increasing max_h and max_v for PSR too. Signed-off-by: Suraj Kandpal --- drivers/gpu/drm/i915/display/intel_psr.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c index c22386a31a63..a358beb39846 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1453,7 +1453,11 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp, return false; } - if (DISPLAY_VER(display) >= 20) { + if (DISPLAY_VER(dev_priv) >= 30) { + psr_max_h = 6144; + psr_max_v = 4096; + max_bpp = 30; + } else if (DISPLAY_VER(display) >= 20) { psr_max_h = 5120; psr_max_v = 4096; max_bpp = 30; From patchwork Fri Oct 25 06:01:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Kandpal X-Patchwork-Id: 13850071 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 D757FD116F7 for ; Fri, 25 Oct 2024 06:02:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 83A1C10E374; Fri, 25 Oct 2024 06:02:05 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="mnduXuoc"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id BCE3310E374; Fri, 25 Oct 2024 06:02:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1729836125; x=1761372125; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0+VnajePGJn0Rhz1VQ8RRir4y8c8EsosToMhEwOtdb4=; b=mnduXuocrEVy+0ESDjkm0W2tVlqU2KEhcsg4nL3AsDxpuAQeiiWD1/e4 mqG9j+te0lFIdPhaTUUH1Q9NaoX3sVwnKkpUYDfSw+tzzr+neBFuqMfeQ S2kOi30on2On0Ldyda9qTPE+CM4SULyrWJvV4acxnEtkeh8qV9qFlKNIp OjM5w3zGBqA4o5LgW+Im11H1dlyPdUYqe6sNX7PoIGqXJsagWZpY/GlO6 /YoSeMdUNbgeHN/u55a6MHn0Gz/01WjVSLpDEZflzcN78FthH0RaYdsOm sqEdzpFNnVgPri4W7r3s2oOAKak9eAiFBwbZinxdlmYUMvMvzCMX6khwl Q==; X-CSE-ConnectionGUID: QaqnLeHLS/6tgwdyvj6l7Q== X-CSE-MsgGUID: 9wlHBwi9RsmxJBURGTuOOw== X-IronPort-AV: E=McAfee;i="6700,10204,11222"; a="29620705" X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="29620705" Received: from orviesa009.jf.intel.com ([10.64.159.149]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Oct 2024 23:02:05 -0700 X-CSE-ConnectionGUID: tVBiqPUDSAmUsggctLn+5w== X-CSE-MsgGUID: oheKCwKJSOuM5Cy/xnx8kQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,231,1725346800"; d="scan'208";a="80734438" Received: from unknown (HELO kandpal-X299-UD4-Pro.iind.intel.com) ([10.190.239.10]) by orviesa009.jf.intel.com with ESMTP; 24 Oct 2024 23:02:03 -0700 From: Suraj Kandpal To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: ankit.k.nautiyal@intel.com, matthew.d.roper@intel.com, Suraj Kandpal Subject: [PATCH 5/5] drm/i914/xe3lpd: Increase bigjoiner limitations Date: Fri, 25 Oct 2024 11:31:36 +0530 Message-Id: <20241025060136.9884-6-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241025060136.9884-1-suraj.kandpal@intel.com> References: <20241025060136.9884-1-suraj.kandpal@intel.com> MIME-Version: 1.0 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" With 6k resolution support for a single crtc being added bigjoiner will only come into picture when hdisplay > 6144 Signed-off-by: Suraj Kandpal Reviewed-by: Ankit Nautiyal --- drivers/gpu/drm/i915/display/intel_dp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 7e29619ba040..9dd4610c749a 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1315,14 +1315,17 @@ bool intel_dp_needs_joiner(struct intel_dp *intel_dp, int num_joined_pipes) { struct drm_i915_private *i915 = dp_to_i915(intel_dp); + int hdisplay_limit; if (!intel_dp_has_joiner(intel_dp)) return false; num_joined_pipes /= 2; + hdisplay_limit = DISPLAY_VER(i915) >= 30 ? 6144 : 5120; + return clock > num_joined_pipes * i915->display.cdclk.max_dotclk_freq || - hdisplay > num_joined_pipes * 5120; + hdisplay > num_joined_pipes * hdisplay_limit; } int intel_dp_num_joined_pipes(struct intel_dp *intel_dp,