From patchwork Fri May 17 14:53:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 13667122 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 DA58BC04FFE for ; Fri, 17 May 2024 14:54:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5891E10EEF3; Fri, 17 May 2024 14:54:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="PQacFntz"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 41EB310EEF3 for ; Fri, 17 May 2024 14:54: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=1715957642; x=1747493642; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=XRqDd0fc3yB7jysHrLKMnFeZnDKCMm/UzSYogQ2DM7c=; b=PQacFntz7WOs2RY59LVifQ7y4p6F1TYJXqjYehjvhbQzBRQEVdKsrS42 A6Vd/GqgFQ/ES8wnbkMbZLQJ5ferJQiyEKTKs1N3xStudUQviY+zdnquK omNMVJFQpqFvH33oXwrGYyzhv4sCxvZ3Oh0IypPibW81G8zDY/KSL9qH+ ljKl9Ebve7oW6wWZeDI1ASs17c2J/g5hDBUA6U4EPQLZbewAK3BDv6dFR JbvRPqNkb64y54Zo5qZw47+QA2zpjtbWiSmdwuEBSxeS2R3xvhV+yhFyn Fp9KiIPcR1tQW1hu+ws85edioHofd20mu4I9j1TEf/jbVxUPrlvJgPIlV A==; X-CSE-ConnectionGUID: 8E8PI+g6TD6fvwPLc44R3A== X-CSE-MsgGUID: XD/vydbYTfyxhf+9Q3Eagg== X-IronPort-AV: E=McAfee;i="6600,9927,11075"; a="12008024" X-IronPort-AV: E=Sophos;i="6.08,168,1712646000"; d="scan'208";a="12008024" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2024 07:54:02 -0700 X-CSE-ConnectionGUID: 1nR7kbtDT2eEpp69CnoKcw== X-CSE-MsgGUID: MnnPqKvCQMW59UqwLJ0w3w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,168,1712646000"; d="scan'208";a="31800950" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by fmviesa008.fm.intel.com with SMTP; 17 May 2024 07:54:00 -0700 Received: by stinkbox (sSMTP sendmail emulation); Fri, 17 May 2024 17:53:59 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 1/7] drm/i915: Drop redundant dsc_decompression_aux check Date: Fri, 17 May 2024 17:53:50 +0300 Message-ID: <20240517145356.26103-2-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.44.1 In-Reply-To: <20240517145356.26103-1-ville.syrjala@linux.intel.com> References: <20240517145356.26103-1-ville.syrjala@linux.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" From: Ville Syrjälä If we have no dsc_decompression_aux (only possible on MST) then we won't have the dsc_dpcd caps either. So checking both is not needed. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_dp.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index c0a3b6d50681..1e88449fe5f2 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1451,7 +1451,6 @@ static bool intel_dp_supports_dsc(const struct intel_connector *connector, return false; return intel_dsc_source_support(crtc_state) && - connector->dp.dsc_decompression_aux && drm_dp_sink_supports_dsc(connector->dp.dsc_dpcd); } From patchwork Fri May 17 14:53:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 13667124 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 006C4C25B7A for ; Fri, 17 May 2024 14:54:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 70D5710EEF8; Fri, 17 May 2024 14:54:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="B/q2cwpz"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id DBDA310EEF5 for ; Fri, 17 May 2024 14:54:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715957651; x=1747493651; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=KIcqWJWD5ntbikLN63K4z2+Kto0RbJB6GwcoC7gsW/g=; b=B/q2cwpz8NpDw4Cmkr0tTSHGb/BAX5ocEkDIXj01CPYXb7tyQOdRzp5a pgPUlF4vdMiQyspc9rdHfp3B25eUlrkm8c6tBvyfz3iVIpGmHFi3S/hT8 IodIfHOpXYeWkZDl+0RX5vvx3E02yfqtxt3MYK6EUTsCSKrRnix63e99G jHoaR1OkHyFv4ncdcBZHMWkqsTiXBd6RML4g0MWIYCCiEpnbRCZY4Tg5C ZdwfcaUYTetA2uT6esyIsH8jc7laA5NEx42k05uj3Q4CsaSBVgJ4TYxwI Jp08F2dGk0GDxShssjLg5uBct1qI4CLunQb/sUIt+0/jf625LP1ueluSs g==; X-CSE-ConnectionGUID: f1IAbUn3Q/qOqe/5tKLjSw== X-CSE-MsgGUID: TcYn7q14RTSoOjc/+sR6ug== X-IronPort-AV: E=McAfee;i="6600,9927,11075"; a="12008029" X-IronPort-AV: E=Sophos;i="6.08,168,1712646000"; d="scan'208";a="12008029" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2024 07:54:05 -0700 X-CSE-ConnectionGUID: pRB+tCgcR+ekYmjYjmLn6A== X-CSE-MsgGUID: dNjjqjjMRfGzMAuJMpSsJw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,168,1712646000"; d="scan'208";a="31800953" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by fmviesa008.fm.intel.com with SMTP; 17 May 2024 07:54:03 -0700 Received: by stinkbox (sSMTP sendmail emulation); Fri, 17 May 2024 17:54:02 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 2/7] drm/i915: Extract intel_dp_has_dsc() Date: Fri, 17 May 2024 17:53:51 +0300 Message-ID: <20240517145356.26103-3-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.44.1 In-Reply-To: <20240517145356.26103-1-ville.syrjala@linux.intel.com> References: <20240517145356.26103-1-ville.syrjala@linux.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" From: Ville Syrjälä Extract a helper to check whether the source+sink combo supports DSC. That basic check is needed both during mode validation and compute config. We'll also need to add extra checks to both places, so having a single place for it is nicer. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_dp.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 1e88449fe5f2..7bf283b4df7f 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1220,6 +1220,19 @@ bool intel_dp_need_bigjoiner(struct intel_dp *intel_dp, connector->force_bigjoiner_enable; } +static bool intel_dp_has_dsc(struct intel_connector *connector) +{ + struct drm_i915_private *i915 = to_i915(connector->base.dev); + + if (!HAS_DSC(i915)) + return false; + + if (!drm_dp_sink_supports_dsc(connector->dp.dsc_dpcd)) + return false; + + return true; +} + static enum drm_mode_status intel_dp_mode_valid(struct drm_connector *_connector, struct drm_display_mode *mode) @@ -1274,8 +1287,7 @@ intel_dp_mode_valid(struct drm_connector *_connector, mode_rate = intel_dp_link_required(target_clock, intel_dp_mode_min_output_bpp(connector, mode)); - if (HAS_DSC(dev_priv) && - drm_dp_sink_supports_dsc(connector->dp.dsc_dpcd)) { + if (intel_dp_has_dsc(connector)) { enum intel_output_format sink_format, output_format; int pipe_bpp; From patchwork Fri May 17 14:53:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 13667123 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 4748BC04FFE for ; Fri, 17 May 2024 14:54:12 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B8A2310EEF5; Fri, 17 May 2024 14:54:11 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="MwJagfLU"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1601110EEF8 for ; Fri, 17 May 2024 14:54:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715957651; x=1747493651; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=xfaJmIxn+4QUxHLChpChUSQea4DLYrFPr1pMkNwDfrk=; b=MwJagfLU5Ht1Gm0iBtKykoAGbP6sMsRGAEfqUDkvs0LrDuPMU6WENGDw qpS1N7lcETpwd4QREho8kZgM+p2lQaTF8i/bdNWN4WhQ0YZ50/rekaaol Mmw5PyMx7wLTwi0AR93UVYmPb4v1xRnP3HqI+Te8WIFOQ+/7zkH8XAd8O rHyD2R8o8+TmEmv+0I4gqpkxcyzYq9ScpShhZVvkq2/AT1/zBdZhZRFXP hM1BHRMQytjzPa49YoHl+cuf+8xzBG0wgvEvZFMqSN5f8/4ygHqps4MYK yS5kszLkgudcHLf2iXXnU69GL6Wxv+pS1xx8yLtE6TboeG9slZKUafKzK w==; X-CSE-ConnectionGUID: bD/pg2k4TR2iqdKSd08yFQ== X-CSE-MsgGUID: S+CGL27mRvKZKefCqvjBvg== X-IronPort-AV: E=McAfee;i="6600,9927,11075"; a="12008032" X-IronPort-AV: E=Sophos;i="6.08,168,1712646000"; d="scan'208";a="12008032" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2024 07:54:08 -0700 X-CSE-ConnectionGUID: cxPEdOjUS0yP2hAA36o5tQ== X-CSE-MsgGUID: ocw+BUVcRyyBOMZEQQHvQA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,168,1712646000"; d="scan'208";a="31800954" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by fmviesa008.fm.intel.com with SMTP; 17 May 2024 07:54:05 -0700 Received: by stinkbox (sSMTP sendmail emulation); Fri, 17 May 2024 17:54:05 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 3/7] drm/i915: Handle MST in intel_dp_has_dsc() Date: Fri, 17 May 2024 17:53:52 +0300 Message-ID: <20240517145356.26103-4-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.44.1 In-Reply-To: <20240517145356.26103-1-ville.syrjala@linux.intel.com> References: <20240517145356.26103-1-ville.syrjala@linux.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" From: Ville Syrjälä Utilize intel_dp_has_dsc() for MST as well. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_dp.c | 5 ++++- drivers/gpu/drm/i915/display/intel_dp.h | 1 + drivers/gpu/drm/i915/display/intel_dp_mst.c | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 7bf283b4df7f..a4703b71c498 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1220,13 +1220,16 @@ bool intel_dp_need_bigjoiner(struct intel_dp *intel_dp, connector->force_bigjoiner_enable; } -static bool intel_dp_has_dsc(struct intel_connector *connector) +bool intel_dp_has_dsc(struct intel_connector *connector) { struct drm_i915_private *i915 = to_i915(connector->base.dev); if (!HAS_DSC(i915)) return false; + if (connector->mst_port && !HAS_DSC_MST(i915)) + return false; + if (!drm_dp_sink_supports_dsc(connector->dp.dsc_dpcd)) return false; diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h index aad2223df2a3..c0d3e315559e 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.h +++ b/drivers/gpu/drm/i915/display/intel_dp.h @@ -90,6 +90,7 @@ bool intel_dp_has_hdmi_sink(struct intel_dp *intel_dp); bool intel_dp_is_edp(struct intel_dp *intel_dp); bool intel_dp_as_sdp_supported(struct intel_dp *intel_dp); bool intel_dp_is_uhbr(const struct intel_crtc_state *crtc_state); +bool intel_dp_has_dsc(struct intel_connector *connector); int intel_dp_link_symbol_size(int rate); int intel_dp_link_symbol_clock(int rate); bool intel_dp_is_port_edp(struct drm_i915_private *dev_priv, enum port port); diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index c772ba19c547..b57753d2d82c 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -1434,8 +1434,7 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector, return 0; } - if (HAS_DSC_MST(dev_priv) && - drm_dp_sink_supports_dsc(intel_connector->dp.dsc_dpcd)) { + if (intel_dp_has_dsc(intel_connector)) { /* * TBD pass the connector BPC, * for now U8_MAX so that max BPC on that platform would be picked From patchwork Fri May 17 14:53:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 13667125 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 C2216C25B79 for ; Fri, 17 May 2024 14:54:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F34FD10EEFA; Fri, 17 May 2024 14:54:12 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="hT/jGmMG"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5477910EEF5 for ; Fri, 17 May 2024 14:54:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715957651; x=1747493651; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=C7m2SPoImBnbL9nLWJhvCuXl/6ZIW7+ECDZOVaBPt7o=; b=hT/jGmMGcxWEUdI+vwpNzD8LLn7PCrwuoa5VcWDvU4T2u3VE458gZYQS Csoc9zxE6NysB7jStMxKAbf5BFZoOlOQNNZGXIDu9qXdEqWctWxtuBB/I vrrKHCDRosQpiRZxCt7AFgkT9GakmcNMYeWlHm9ky6yZFu3v2JHN0ZNRG 1Pae8k8P32++dvOGmHdh8ADeal31DYcOFpi5Esic/uyulRACTf0yIFr+o BWZasLwWSa/loHxXNipYq9cg15HZZ33IenNkraiQuANN68SMWE8SU1vMQ nf5x2LJgSqO370GurS8kC4Q3hafQyx4gNUosQ4X/mwkMTPWTds2BRfFdi g==; X-CSE-ConnectionGUID: L3Y4PnNKTVOGMgpfUcIZRQ== X-CSE-MsgGUID: xwasytcMS9KrpeCCXKyX2A== X-IronPort-AV: E=McAfee;i="6600,9927,11075"; a="12008037" X-IronPort-AV: E=Sophos;i="6.08,168,1712646000"; d="scan'208";a="12008037" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2024 07:54:11 -0700 X-CSE-ConnectionGUID: hAD+LlDDRsa075b1BOr0kQ== X-CSE-MsgGUID: m3acIvaaSUmCkUTpgcMFyA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,168,1712646000"; d="scan'208";a="31800973" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by fmviesa008.fm.intel.com with SMTP; 17 May 2024 07:54:09 -0700 Received: by stinkbox (sSMTP sendmail emulation); Fri, 17 May 2024 17:54:07 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 4/7] drm/i915: Use intel_dp_has_dsc() during .compute_config() Date: Fri, 17 May 2024 17:53:53 +0300 Message-ID: <20240517145356.26103-5-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.44.1 In-Reply-To: <20240517145356.26103-1-ville.syrjala@linux.intel.com> References: <20240517145356.26103-1-ville.syrjala@linux.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" From: Ville Syrjälä Reuse intel_dp_has_dsc() during .compute_config() instead of repeating some of the checks again by hand. We'll be adding more checks to intel_dp_has_dsc() and this will make sure we cover both .mode_valid() and .compute_config() with them. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_dp.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index a4703b71c498..6dfde22e5f9d 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1459,14 +1459,16 @@ bool intel_dp_supports_fec(struct intel_dp *intel_dp, drm_dp_sink_supports_fec(connector->dp.fec_capability); } -static bool intel_dp_supports_dsc(const struct intel_connector *connector, +static bool intel_dp_supports_dsc(struct intel_connector *connector, const struct intel_crtc_state *crtc_state) { + if (!intel_dp_has_dsc(connector)) + return false; + if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP) && !crtc_state->fec_enable) return false; - return intel_dsc_source_support(crtc_state) && - drm_dp_sink_supports_dsc(connector->dp.dsc_dpcd); + return intel_dsc_source_support(crtc_state); } static int intel_dp_hdmi_compute_bpc(struct intel_dp *intel_dp, @@ -2213,7 +2215,7 @@ int intel_dp_dsc_compute_config(struct intel_dp *intel_dp, { struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp); struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev); - const struct intel_connector *connector = + struct intel_connector *connector = to_intel_connector(conn_state->connector); const struct drm_display_mode *adjusted_mode = &pipe_config->hw.adjusted_mode; From patchwork Fri May 17 14:53:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 13667126 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 78D45C41513 for ; Fri, 17 May 2024 14:54:19 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C7F2D10EEFD; Fri, 17 May 2024 14:54:18 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="b6DiqLuA"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4151810EEFB for ; Fri, 17 May 2024 14:54:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715957654; x=1747493654; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=ljFHJp9pPggBvHJx0eb3/VO/hR5xhSdbOjzZVVLaYS0=; b=b6DiqLuABn5BhZhA1K410VoqOmlA89GuHjPBIDbxBV7KjI09JSMOxupC uMJHh7pqIwrpIGTRGUJ4dcSx499eqAszJNZf+TmeBRgv+5/2PdXn0StQt mYwgikKT0soyBaoDBs8WSjyz1YoMZ03icOjiUyGiPxBsGw0EQNOLpg/aJ ZvxG4xuKIvrmxa5JMpcto5DZt+yvSRux/GstuABoRwoSNBPCreCQrVZk2 ElxfhPcDao7bCxBFT677AyZrB4zJBJrHP66e92tU/3Hyr7ZBbG3+KNBJN VXROk8FqW9D04920HuIi9POy5qTbtWKFyohj0mqfpN97kydVkMXoxF7Vf g==; X-CSE-ConnectionGUID: 4QOnhJHXTr6Q4kOR7lqi2Q== X-CSE-MsgGUID: JRd5FViiQ0aW6aJN57H14g== X-IronPort-AV: E=McAfee;i="6600,9927,11075"; a="12008042" X-IronPort-AV: E=Sophos;i="6.08,168,1712646000"; d="scan'208";a="12008042" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2024 07:54:14 -0700 X-CSE-ConnectionGUID: 7jEVaC/1Qwu7ILWu678MEA== X-CSE-MsgGUID: LuYHBXksRrGpViiZUa2BtQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,168,1712646000"; d="scan'208";a="31800985" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by fmviesa008.fm.intel.com with SMTP; 17 May 2024 07:54:12 -0700 Received: by stinkbox (sSMTP sendmail emulation); Fri, 17 May 2024 17:54:11 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 5/7] drm/i915: Reuse intel_dp_supports_dsc() for MST Date: Fri, 17 May 2024 17:53:54 +0300 Message-ID: <20240517145356.26103-6-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.44.1 In-Reply-To: <20240517145356.26103-1-ville.syrjala@linux.intel.com> References: <20240517145356.26103-1-ville.syrjala@linux.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" From: Ville Syrjälä intel_dp_supports_dsc() now works for MST as well, reuse it. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_dp.c | 4 ++-- drivers/gpu/drm/i915/display/intel_dp.h | 3 +++ drivers/gpu/drm/i915/display/intel_dp_mst.c | 20 ++++---------------- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 6dfde22e5f9d..a15ef6c015c8 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1459,8 +1459,8 @@ bool intel_dp_supports_fec(struct intel_dp *intel_dp, drm_dp_sink_supports_fec(connector->dp.fec_capability); } -static bool intel_dp_supports_dsc(struct intel_connector *connector, - const struct intel_crtc_state *crtc_state) +bool intel_dp_supports_dsc(struct intel_connector *connector, + const struct intel_crtc_state *crtc_state) { if (!intel_dp_has_dsc(connector)) return false; diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h index c0d3e315559e..f1d90fc458d9 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.h +++ b/drivers/gpu/drm/i915/display/intel_dp.h @@ -170,6 +170,9 @@ bool intel_dp_supports_fec(struct intel_dp *intel_dp, const struct intel_connector *connector, const struct intel_crtc_state *pipe_config); +bool intel_dp_supports_dsc(struct intel_connector *connector, + const struct intel_crtc_state *crtc_state); + u32 intel_dp_dsc_nearest_valid_bpp(struct drm_i915_private *i915, u32 bpp, u32 pipe_bpp); void intel_ddi_update_pipe(struct intel_atomic_state *state, diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c index b57753d2d82c..4a624c826604 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c @@ -400,18 +400,6 @@ static int intel_dp_mst_update_slots(struct intel_encoder *encoder, return 0; } -static bool -intel_dp_mst_dsc_source_support(const struct intel_crtc_state *crtc_state) -{ - struct drm_i915_private *i915 = to_i915(crtc_state->uapi.crtc->dev); - - /* - * FIXME: Enabling DSC on ICL results in blank screen and FIFO pipe / - * transcoder underruns, re-enable DSC after fixing this issue. - */ - return DISPLAY_VER(i915) >= 12 && intel_dsc_source_support(crtc_state); -} - static int mode_hblank_period_ns(const struct drm_display_mode *mode) { return DIV_ROUND_CLOSEST_ULL(mul_u32_u32(mode->htotal - mode->hdisplay, @@ -443,7 +431,7 @@ hblank_expansion_quirk_needs_dsc(const struct intel_connector *connector, } static bool -adjust_limits_for_dsc_hblank_expansion_quirk(const struct intel_connector *connector, +adjust_limits_for_dsc_hblank_expansion_quirk(struct intel_connector *connector, const struct intel_crtc_state *crtc_state, struct link_config_limits *limits, bool dsc) @@ -456,7 +444,7 @@ adjust_limits_for_dsc_hblank_expansion_quirk(const struct intel_connector *conne return true; if (!dsc) { - if (intel_dp_mst_dsc_source_support(crtc_state)) { + if (intel_dp_supports_dsc(connector, crtc_state)) { drm_dbg_kms(&i915->drm, "[CRTC:%d:%s][CONNECTOR:%d:%s] DSC needed by hblank expansion quirk\n", crtc->base.base.id, crtc->base.name, @@ -503,7 +491,7 @@ adjust_limits_for_dsc_hblank_expansion_quirk(const struct intel_connector *conne static bool intel_dp_mst_compute_config_limits(struct intel_dp *intel_dp, - const struct intel_connector *connector, + struct intel_connector *connector, struct intel_crtc_state *crtc_state, bool dsc, struct link_config_limits *limits) @@ -602,7 +590,7 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder, str_yes_no(ret), str_yes_no(joiner_needs_dsc), str_yes_no(intel_dp->force_dsc_en)); - if (!intel_dp_mst_dsc_source_support(pipe_config)) + if (!intel_dp_supports_dsc(connector, pipe_config)) return -EINVAL; if (!intel_dp_mst_compute_config_limits(intel_dp, From patchwork Fri May 17 14:53:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 13667128 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 6F7EBC04FFE for ; Fri, 17 May 2024 14:54:22 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B31C910EEFF; Fri, 17 May 2024 14:54:21 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="IS9I2GNz"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id 000C510EEFB for ; Fri, 17 May 2024 14:54: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=1715957657; x=1747493657; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=FRhXMi3zM27rh8S59/vcAoKuj2jO1WfMuROjTkOt2ew=; b=IS9I2GNzWl9lUHg8GkhT+652zD4EP9Aqtk2RtpOEJEgVAQ3rYJNXxeuq aTNdQe1cPsb2T8Uk6Fn4GIOdDpDWveUuPr+hiDWCdrgCuvaODVO8xWHdG SwAjrsmeS8oHVQx26KCMN3Iu5pm/445UtlLaj+w83qChsC+2FJltEemr2 FxyoM/GE2aT105GG0AMywrRuVVq3tAtDUOefyTo+t+ypH7IajbUQaZD+Y EkxQDPDgBAcLyu6cHHzPk1VTUfsgBxnwuGKfBxO+SxEMLcqlMaDLhIVEs byOrcAvs5TA50/VdoxgPiFzcfeANRa63Tl6ktZR473wXJXQ6K+U143aG+ Q==; X-CSE-ConnectionGUID: OGD1q1O3SQOab2BelFi8rw== X-CSE-MsgGUID: EK7lP1mzQdWgfVG4JDSbCQ== X-IronPort-AV: E=McAfee;i="6600,9927,11075"; a="12008045" X-IronPort-AV: E=Sophos;i="6.08,168,1712646000"; d="scan'208";a="12008045" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2024 07:54:17 -0700 X-CSE-ConnectionGUID: 6K0bFiFkQK+Ht4lSCXKH8Q== X-CSE-MsgGUID: o5K5+sy3QE+Y/uKRy+MQeg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,168,1712646000"; d="scan'208";a="31801015" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by fmviesa008.fm.intel.com with SMTP; 17 May 2024 07:54:15 -0700 Received: by stinkbox (sSMTP sendmail emulation); Fri, 17 May 2024 17:54:14 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 6/7] drm/i915: Utilize edp_disable_dsc from VBT Date: Fri, 17 May 2024 17:53:55 +0300 Message-ID: <20240517145356.26103-7-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.44.1 In-Reply-To: <20240517145356.26103-1-ville.syrjala@linux.intel.com> References: <20240517145356.26103-1-ville.syrjala@linux.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" From: Ville Syrjälä Disable eDP DSC usage when instructed to do so by the VBT. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_bios.c | 4 ++++ drivers/gpu/drm/i915/display/intel_display_types.h | 1 + drivers/gpu/drm/i915/display/intel_dp.c | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c index b0a49b2f957f..97c6fcf0fe2b 100644 --- a/drivers/gpu/drm/i915/display/intel_bios.c +++ b/drivers/gpu/drm/i915/display/intel_bios.c @@ -1512,6 +1512,10 @@ parse_edp(struct drm_i915_private *i915, if (i915->display.vbt.version >= 244) panel->vbt.edp.max_link_rate = edp->edp_max_port_link_rate[panel_type] * 20; + + if (i915->display.vbt.version >= 251) + panel->vbt.edp.dsc_disable = + panel_bool(edp->edp_dsc_disable, panel_type); } static void diff --git a/drivers/gpu/drm/i915/display/intel_display_types.h b/drivers/gpu/drm/i915/display/intel_display_types.h index 9678c2b157f6..5e0372c14643 100644 --- a/drivers/gpu/drm/i915/display/intel_display_types.h +++ b/drivers/gpu/drm/i915/display/intel_display_types.h @@ -329,6 +329,7 @@ struct intel_vbt_panel_data { u8 drrs_msa_timing_delay; bool low_vswing; bool hobl; + bool dsc_disable; } edp; struct { diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index a15ef6c015c8..af298d5017d9 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1230,6 +1230,10 @@ bool intel_dp_has_dsc(struct intel_connector *connector) if (connector->mst_port && !HAS_DSC_MST(i915)) return false; + if (connector->base.connector_type == DRM_MODE_CONNECTOR_eDP && + connector->panel.vbt.edp.dsc_disable) + return false; + if (!drm_dp_sink_supports_dsc(connector->dp.dsc_dpcd)) return false; From patchwork Fri May 17 14:53:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= X-Patchwork-Id: 13667127 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 B66B3C25B79 for ; Fri, 17 May 2024 14:54:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 437C210EF00; Fri, 17 May 2024 14:54:21 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="LxuIpnL+"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.17]) by gabe.freedesktop.org (Postfix) with ESMTPS id D159110EEFF for ; Fri, 17 May 2024 14:54:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1715957660; x=1747493660; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=KabiJgJyWr8qZrePASfxx6Z3uANKcQucl2FQbZYedwA=; b=LxuIpnL+DlYXq9pLk6NnUnyfhuOrE4Uo19KITYtDZoS2DxA7QP0dfEuv HceGZUvNnoUDNbfQPpCMKolPyyqUnqgrYg29vrv3apT74fJ8BcoGZJQF+ zHHr34MENMvWePMcI2LgX/A6N0eqNQRT+WqQz0Ko0XVanZnw5PNF0zP44 l0WeINGtxAoeR8Reuc6L0ifLgNIH4MCaT29ck8kbhyEQs113wofTBG2kh nlmVFY0UqIis/QUqzyzRQWwUVQ5YgTv9kHaRmkXY6U4oZftPvNygqHl+C Pv3S2Q0283LHE5ggd85o8g+V0nbi9LtLxiApM6CRnHl7WBsVDyG9aemL0 A==; X-CSE-ConnectionGUID: SUxKxHAOREurVuUsXSYPew== X-CSE-MsgGUID: G4HZ3J81Qm+Tn7+DRhZcqQ== X-IronPort-AV: E=McAfee;i="6600,9927,11075"; a="12008051" X-IronPort-AV: E=Sophos;i="6.08,168,1712646000"; d="scan'208";a="12008051" Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa111.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 May 2024 07:54:20 -0700 X-CSE-ConnectionGUID: tL4D4Z58TdCnLxeClQ3IFQ== X-CSE-MsgGUID: U14bgcNATtaKfrxf20a4Jg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,168,1712646000"; d="scan'208";a="31801030" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.74]) by fmviesa008.fm.intel.com with SMTP; 17 May 2024 07:54:17 -0700 Received: by stinkbox (sSMTP sendmail emulation); Fri, 17 May 2024 17:54:17 +0300 From: Ville Syrjala To: intel-gfx@lists.freedesktop.org Subject: [PATCH 7/7] drm/i915: Remove bogus MST check in intel_dp_has_audio() Date: Fri, 17 May 2024 17:53:56 +0300 Message-ID: <20240517145356.26103-8-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 2.44.1 In-Reply-To: <20240517145356.26103-1-ville.syrjala@linux.intel.com> References: <20240517145356.26103-1-ville.syrjala@linux.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" From: Ville Syrjälä No idea what this MST checks is doing in intel_dp_has_audio(). Looks completely pointless, so get rid of it. Signed-off-by: Ville Syrjälä --- drivers/gpu/drm/i915/display/intel_dp.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index af298d5017d9..4a486bb6d48c 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -2806,7 +2806,6 @@ intel_dp_drrs_compute_config(struct intel_connector *connector, } static bool intel_dp_has_audio(struct intel_encoder *encoder, - struct intel_crtc_state *crtc_state, const struct drm_connector_state *conn_state) { struct drm_i915_private *i915 = to_i915(encoder->base.dev); @@ -2815,8 +2814,7 @@ static bool intel_dp_has_audio(struct intel_encoder *encoder, struct intel_connector *connector = to_intel_connector(conn_state->connector); - if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST) && - !intel_dp_port_has_audio(i915, encoder->port)) + if (!intel_dp_port_has_audio(i915, encoder->port)) return false; if (intel_conn_state->force_audio == HDMI_AUDIO_AUTO) @@ -2875,7 +2873,7 @@ intel_dp_audio_compute_config(struct intel_encoder *encoder, struct drm_connector_state *conn_state) { pipe_config->has_audio = - intel_dp_has_audio(encoder, pipe_config, conn_state) && + intel_dp_has_audio(encoder, conn_state) && intel_audio_compute_config(encoder, pipe_config, conn_state); pipe_config->sdp_split_enable = pipe_config->has_audio &&