From patchwork Wed Aug 30 07:34:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kandpal, Suraj" X-Patchwork-Id: 13369989 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 C2CB5C83F15 for ; Wed, 30 Aug 2023 07:37:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 63B8C10E4C9; Wed, 30 Aug 2023 07:37:07 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id E863F10E4C9 for ; Wed, 30 Aug 2023 07:37: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=1693381020; x=1724917020; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ASDzbtG/O7y4+zncOtJFF/ks9D8FmxgiXQPeXRe9mqc=; b=RNRGijHWlMir/uThal2EmcdTRJknVcWQlGwl+zXtM2zrQC01fyHvpXDp jph4g2WmBiOWdmbQNPppz+0wNWVS1VYXE5n0RxZy+pb23LXl4zL3FXVfa 5SO1iNYfzRFGvYe0PsdXhgF4mOCvELCDDc2YEpsMU27NRFMTkqELT6u9m 6zZM0tsgOurlUQ869y7gEUwyKv2G9x3g/U+g3d9QEGqxBhBOKe8NcU5vq FWQKQcdBfYkM4gMD+efNuJXSQTdrfCAJc6ra2VIlOjcCcLU6IfzpkxG3M WVd9OcwWt/XCeZuwqhtUlyxxHqJeaUSH+hVvTsz679icET1+q5yjY2qDJ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10817"; a="379326143" X-IronPort-AV: E=Sophos;i="6.02,212,1688454000"; d="scan'208";a="379326143" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Aug 2023 00:37:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10817"; a="912692489" X-IronPort-AV: E=Sophos;i="6.02,212,1688454000"; d="scan'208";a="912692489" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.32]) by orsmga005.jf.intel.com with ESMTP; 30 Aug 2023 00:36:58 -0700 From: Suraj Kandpal To: intel-gfx@lists.freedesktop.org Date: Wed, 30 Aug 2023 13:04:38 +0530 Message-Id: <20230830073437.666263-3-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230830073437.666263-1-suraj.kandpal@intel.com> References: <20230830073437.666263-1-suraj.kandpal@intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH 2/2] drm/i915/hdcp: Use correct aux for capability check scenario 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" Send the correct aux rather than the one derived from intel_digital_port so that the HDCP version of both monitors are fetched rather than just the primary one's Signed-off-by: Suraj Kandpal Reviewed-by: Uma Shankar --- drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c index 3b579887bb99..3a595cd433d4 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_dp_hdcp.c @@ -651,12 +651,14 @@ static int intel_dp_hdcp2_capable(struct intel_connector *connector, bool *capable) { - struct intel_digital_port *dig_port = intel_attached_dig_port(connector); + struct drm_dp_aux *aux; u8 rx_caps[3]; int ret; + aux = intel_dp_hdcp_get_aux(connector); + *capable = false; - ret = drm_dp_dpcd_read(&dig_port->dp.aux, + ret = drm_dp_dpcd_read(aux, DP_HDCP_2_2_REG_RX_CAPS_OFFSET, rx_caps, HDCP_2_2_RXCAPS_LEN); if (ret != HDCP_2_2_RXCAPS_LEN)