From patchwork Tue Oct 15 06:10:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kandpal, Suraj" X-Patchwork-Id: 13835747 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 A0EE5CFC26D for ; Tue, 15 Oct 2024 06:12:50 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8C34710E503; Tue, 15 Oct 2024 06:12:49 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="jfpWz+xG"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0405F10E500; Tue, 15 Oct 2024 06:12:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1728972766; x=1760508766; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ykyfSO+ZbtQPXLkhEaXXH+kct7JROvY0a2VMTMywhws=; b=jfpWz+xGXCS/nE4NBBDiLnubwdHE89ZdgHSlLxuGoSyy/Qjeyikn6hyY bCyEqp1q8MWP8O4kyNR72rOHhh3Pp2zoRWh+SSRgzW8ieUbhgKv6IqxH2 o3NS29F1bCBYpMA+i+QECD4oZVgmicXNE2FtlYSnvfgN2urDe4Fhp1o6Z efQUpnTUKnl7i6s4hKA61NbINlNK0zJe2I3r1Jb9YiASMDiYIlVzJrWoq pdWnfpKjF6snpHp1F52Qxzv5QEFaGLTf95/TKfS4utwNfbfMSAgwqYOM1 TsmDq9L74CNIPXBXLE25EsbD0hs84kLWlz99OB5XOGaFbUmjzeSqUKfDH A==; X-CSE-ConnectionGUID: drtw2BJySXqzM0yBd9LREg== X-CSE-MsgGUID: EDeDcFZeRTG2dMfpbCrS5A== X-IronPort-AV: E=McAfee;i="6700,10204,11225"; a="28444822" X-IronPort-AV: E=Sophos;i="6.11,204,1725346800"; d="scan'208";a="28444822" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2024 23:12:46 -0700 X-CSE-ConnectionGUID: M99gviEER9m6VPLM7bafGA== X-CSE-MsgGUID: zXe9TSevQ5yQj9IC0JeSOg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="82564159" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.32]) by orviesa003.jf.intel.com with ESMTP; 14 Oct 2024 23:12:45 -0700 From: Suraj Kandpal To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: uma.shankar@intel.com, vandita.kulkarni@intel.com, Suraj Kandpal , Arun R Murthy Subject: [PATCH 1/4] drm/i915/xe3lpd: Increase resolution for plane to support 6k Date: Tue, 15 Oct 2024 11:40:08 +0530 Message-ID: <20241015061011.2087826-2-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241015061011.2087826-1-suraj.kandpal@intel.com> References: <20241015061011.2087826-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. Signed-off-by: Arun R Murthy Signed-off-by: Suraj Kandpal --- drivers/gpu/drm/i915/display/intel_display.c | 5 ++++- drivers/gpu/drm/i915/display/skl_universal_plane.c | 13 ++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c index e1f6255e918b..37bac53f996e 100644 --- a/drivers/gpu/drm/i915/display/intel_display.c +++ b/drivers/gpu/drm/i915/display/intel_display.c @@ -8432,7 +8432,10 @@ 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) { + if (DISPLAY_VER(dev_priv) >= 30) { + plane_width_max = 6144 * num_joined_pipes; + plane_height_max = 4096; + } else if (DISPLAY_VER(dev_priv) >= 11) { plane_width_max = 5120 * num_joined_pipes; plane_height_max = 4320; } else { diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c index 9557b08ca2e2..4dec9e693218 100644 --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c @@ -431,6 +431,13 @@ 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) +{ + return 6144; +} + static int icl_hdr_plane_max_width(const struct drm_framebuffer *fb, int color_plane, unsigned int rotation) @@ -2573,7 +2580,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 Tue Oct 15 06:10:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kandpal, Suraj" X-Patchwork-Id: 13835746 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 E72FECFC26C for ; Tue, 15 Oct 2024 06:12:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7FC6310E502; Tue, 15 Oct 2024 06:12:49 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="SCOq5qSE"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1D23B10E502; Tue, 15 Oct 2024 06:12:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1728972768; x=1760508768; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MU6P50+wEyljRGxYRUCkTx2hsGllQh48Wso/7mOK0o4=; b=SCOq5qSEafCnTg+0kXl60Q0doTXKLRePyR+Vpgjyu8Y+mB9RBIDi3/6P nzNJN1Z0s1OJ2UG8B95tujueDptuy80oUHnp1HwrbSXrmP8lDqdgUEaKe WIGCpDdC9/E2pdPinrDdnKK9D5VxI2f0x5n/a0piAuXdokFudyvZ01mU1 8VxNrR6OG61om5CK1MWFDp6mXNsRqC/zXAOPBTONP9uMcux5E4YuZzaqQ g/ONai5eXwdC9LnRcflcP13qSLYpTEiH+6eTN6V6BQPVyKopIWG7tMbA5 QEj23g6YvWabu6b7svzODYumFdqaYY5m0hAGflB0aM02GXYi5+ta4ugz6 Q==; X-CSE-ConnectionGUID: ypkFdJ25SWWDCHFftrjVDg== X-CSE-MsgGUID: +BNC2w/cQ9iPxIratFMyZA== X-IronPort-AV: E=McAfee;i="6700,10204,11225"; a="28444825" X-IronPort-AV: E=Sophos;i="6.11,204,1725346800"; d="scan'208";a="28444825" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2024 23:12:48 -0700 X-CSE-ConnectionGUID: Wo13KzDYQ9GdE9k6xHWr9Q== X-CSE-MsgGUID: o71AJ/C/R8SgGp+mkSPafA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="82564162" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.32]) by orviesa003.jf.intel.com with ESMTP; 14 Oct 2024 23:12:47 -0700 From: Suraj Kandpal To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: uma.shankar@intel.com, vandita.kulkarni@intel.com, Suraj Kandpal Subject: [PATCH 2/4] drm/i915/xe3lpd: Increase max_h max_v for PSR Date: Tue, 15 Oct 2024 11:40:09 +0530 Message-ID: <20241015061011.2087826-3-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241015061011.2087826-1-suraj.kandpal@intel.com> References: <20241015061011.2087826-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 3b20325b3f6a..8981a180285e 100644 --- a/drivers/gpu/drm/i915/display/intel_psr.c +++ b/drivers/gpu/drm/i915/display/intel_psr.c @@ -1451,7 +1451,11 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp, return false; } - if (DISPLAY_VER(display) >= 12) { + if (DISPLAY_VER(dev_priv) >= 30) { + psr_max_h = 6144; + psr_max_v = 4096; + max_bpp = 30; + } else if (DISPLAY_VER(dev_priv) >= 12) { psr_max_h = 5120; psr_max_v = 3200; max_bpp = 30; From patchwork Tue Oct 15 06:10:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kandpal, Suraj" X-Patchwork-Id: 13835749 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 D1BE3CFC26B for ; Tue, 15 Oct 2024 06:12:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 72AEA10E507; Tue, 15 Oct 2024 06:12:53 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="hSpbgf+P"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1055D10E504; Tue, 15 Oct 2024 06:12:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1728972770; x=1760508770; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=aTaa62lrBipflMuHDhRXYHbLUY0CN4jvQvSGofVzVeE=; b=hSpbgf+PTD/ItDmJBG1tBphbgm6sLfPpd/R+sg4/q/fZBEmmqFb9Zz1r 5SCuO06JKSlTBLoYRytvMpcTEA91buG0JStSHQ+8MTn3TC87E9SK74BDg xE+Uomy8qiyz7ypR8I1dXMT8XRZGmViugqd3iEsIWdHYnmfEecVLEQDy2 bLFgP11xVr7LSuhVDgd9bVWQ/yn/jZ+n0gQ4lShfGM0nfNFGYhHk43/mS Tp8xGOeKp+5stSjSgew3/p8vlYtS93MkbMDNcWNywOjaNCNRYZQ5/kGux ONMHAMIeTq0DT+Yn4p9ny57BKndfs1m0KowzOyc9cdpWKd60pBOJkeJYc A==; X-CSE-ConnectionGUID: oi4+qtrCSfq4Z2qnuurDcw== X-CSE-MsgGUID: ex5Ys8bOTo+GNJJgTOWveA== X-IronPort-AV: E=McAfee;i="6700,10204,11225"; a="28444827" X-IronPort-AV: E=Sophos;i="6.11,204,1725346800"; d="scan'208";a="28444827" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2024 23:12:50 -0700 X-CSE-ConnectionGUID: AXEVnGeWQGOmXzCmXmzcqA== X-CSE-MsgGUID: IXEkVnjDTVKLFwt07uV8Bw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="82564167" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.32]) by orviesa003.jf.intel.com with ESMTP; 14 Oct 2024 23:12:49 -0700 From: Suraj Kandpal To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: uma.shankar@intel.com, vandita.kulkarni@intel.com, Suraj Kandpal Subject: [PATCH 3/4] drm/i914/xe3lpd: Increase bigjoiner limitations Date: Tue, 15 Oct 2024 11:40:10 +0530 Message-ID: <20241015061011.2087826-4-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241015061011.2087826-1-suraj.kandpal@intel.com> References: <20241015061011.2087826-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 --- 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 6b27fabd61c3..6cdc968522df 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1314,14 +1314,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, From patchwork Tue Oct 15 06:10:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kandpal, Suraj" X-Patchwork-Id: 13835748 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 33B17CFC26E for ; Tue, 15 Oct 2024 06:12:53 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CCEAE10E506; Tue, 15 Oct 2024 06:12:52 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Llv87d/3"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 07D4510E506; Tue, 15 Oct 2024 06:12:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1728972772; x=1760508772; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0OS6D/rcaBPdkF/lLa9llDX4pb+lul+gVk32iUDocZg=; b=Llv87d/3vQRx1/89aN6k2WY519uFdfl2lGWiJxSs/INnFUv5A6wAcT53 ljFoB7HEWgID1whs2J5Ug+VpivaLpzxdO59QzhsxTiFbL4Sh0INjPjR6H nU8IeDf/XVcdQZFLZesSp1wvaaMkddJFgaQyTHttZ3DvVp5Gq96WC8pKj zVpke1KPiN/eO3RUoDCmIbSRo6qvLT47o73tFoBQ10LRIAS3TdM8gTKla U7fHC14tyD7uHb6l+43TvoI/w3GYb2wYSaeNKFws6WrQ5YEL+ZBI22ATP cCCUyapk97aaXMdLT+FAWR4X7kA+wdI13+ejrLQ8TBsoOzxnk55hCSC6m A==; X-CSE-ConnectionGUID: nWcWOD4/QSqTPm4u/vIsCQ== X-CSE-MsgGUID: NmS5j+UTQ0eH0KtHWSDO2A== X-IronPort-AV: E=McAfee;i="6700,10204,11225"; a="28444829" X-IronPort-AV: E=Sophos;i="6.11,204,1725346800"; d="scan'208";a="28444829" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa109.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2024 23:12:52 -0700 X-CSE-ConnectionGUID: 8Rqajw7yRt2Fqfed4Wvnyw== X-CSE-MsgGUID: yP1KyzX1R5O/uUHuM8Au4w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.11,199,1725346800"; d="scan'208";a="82564171" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.32]) by orviesa003.jf.intel.com with ESMTP; 14 Oct 2024 23:12:51 -0700 From: Suraj Kandpal To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: uma.shankar@intel.com, vandita.kulkarni@intel.com, Suraj Kandpal Subject: [PATCH 4/4] drm/i915/xe3lpd: Prune modes for YUV420 Date: Tue, 15 Oct 2024 11:40:11 +0530 Message-ID: <20241015061011.2087826-5-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241015061011.2087826-1-suraj.kandpal@intel.com> References: <20241015061011.2087826-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" We only support resolution up to 4k for single pipe when using YUV420 format so we prune these modes and restrict the plane size at src. Signed-off-by: Suraj Kandpal --- drivers/gpu/drm/i915/display/intel_dp.c | 6 ++++++ drivers/gpu/drm/i915/display/skl_universal_plane.c | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 6cdc968522df..1823b509cbfb 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1374,6 +1374,7 @@ intel_dp_mode_valid(struct drm_connector *_connector, { struct intel_connector *connector = to_intel_connector(_connector); struct intel_dp *intel_dp = intel_attached_dp(connector); + enum intel_output_format sink_format; struct drm_i915_private *dev_priv = to_i915(connector->base.dev); const struct drm_display_mode *fixed_mode; int target_clock = mode->clock; @@ -1408,6 +1409,11 @@ intel_dp_mode_valid(struct drm_connector *_connector, mode->hdisplay, target_clock); max_dotclk *= num_joined_pipes; + sink_format = intel_dp_sink_format(connector, mode); + if (sink_format == INTEL_OUTPUT_FORMAT_YCBCR420 && + mode->hdisplay > 4096) + return MODE_NO_420; + if (target_clock > max_dotclk) return MODE_CLOCK_HIGH; diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c index 4dec9e693218..5b1f6069e5da 100644 --- a/drivers/gpu/drm/i915/display/skl_universal_plane.c +++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c @@ -435,7 +435,10 @@ static int xe3_plane_max_width(const struct drm_framebuffer *fb, int color_plane, unsigned int rotation) { - return 6144; + 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,