From patchwork Fri Jan 3 08:45:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kandpal, Suraj" X-Patchwork-Id: 13925369 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 7035AE7718F for ; Fri, 3 Jan 2025 08:45:37 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 18FB310E293; Fri, 3 Jan 2025 08:45:37 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="IvMZapQZ"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by gabe.freedesktop.org (Postfix) with ESMTPS id A98FC10E0E5; Fri, 3 Jan 2025 08:45:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1735893935; x=1767429935; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=iULYKYeqWMhmzysf9Hdi+9/vgEw1/lxgJDXZX7md4l0=; b=IvMZapQZl0/rwpjiPsZZkRFtDIzEKKdhvUd7CMQOazZ/ns+w2401XY9e j23364OnaAXecRQOJaHBegS+jQ/27BdQGWHf8/u+s/YH4ivLpoYRnCn7p 4guJhvfXTbUQ7cqTuID/vkJ5c/3nyGalNmDaZGGScxQpaYkc6fsYWkRDO fe8a2mrmMbwfhvsvc/WaYy/ALUrICVEiWx/O0kDYFp/k+zTi7OZCL77nv bXkczOpJ3IMK4x51fqFWlzkTTLI8llTKyGbYPrRWH3oLUisnIlpP7g4MB hUv95e5CMTYMIoHm+lZaoSBfcs8N+E3hCwt6DpksBMFYFpL+HKbYI2s1C Q==; X-CSE-ConnectionGUID: VYG+5Id6RZOqhiJx9oixTQ== X-CSE-MsgGUID: z+sVk/Y/SlWK9ZJKbISYng== X-IronPort-AV: E=McAfee;i="6700,10204,11303"; a="35442936" X-IronPort-AV: E=Sophos;i="6.12,286,1728975600"; d="scan'208";a="35442936" Received: from fmviesa007.fm.intel.com ([10.60.135.147]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jan 2025 00:45:35 -0800 X-CSE-ConnectionGUID: x1NVkpbxTWmwG9R3AJixTw== X-CSE-MsgGUID: FVvO349jTcqd+cEc6cVkhQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,286,1728975600"; d="scan'208";a="101601322" Received: from kandpal-x299-ud4-pro.iind.intel.com ([10.190.239.10]) by fmviesa007.fm.intel.com with ESMTP; 03 Jan 2025 00:45:34 -0800 From: Suraj Kandpal To: intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: dnyaneshwar.bhadane@intel.com, Suraj Kandpal Subject: [PATCH] Revert "drm/i915/hdcp: Don't enable HDCP1.4 directly from check_link" Date: Fri, 3 Jan 2025 14:15:17 +0530 Message-Id: <20250103084517.239998-1-suraj.kandpal@intel.com> X-Mailer: git-send-email 2.34.1 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" This reverts commit 483f7d94a0453564ad9295288c0242136c5f36a0. This needs to be reverted since HDCP even after updating the connector state HDCP property we don't reenable HDCP until the next commit in which the CP Property is set causing compliance to fail. --v2 -Fix build issue [Dnyaneshwar] Signed-off-by: Suraj Kandpal Reviewed-by: Dnyaneshwar Bhadane --- drivers/gpu/drm/i915/display/intel_hdcp.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index f6e68a0e3b6d..7464b44c8bb3 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -1166,9 +1166,15 @@ static int intel_hdcp_check_link(struct intel_connector *connector) goto out; } - intel_hdcp_update_value(connector, - DRM_MODE_CONTENT_PROTECTION_DESIRED, - true); + ret = intel_hdcp1_enable(connector); + if (ret) { + drm_err(display->drm, "Failed to enable hdcp (%d)\n", ret); + intel_hdcp_update_value(connector, + DRM_MODE_CONTENT_PROTECTION_DESIRED, + true); + goto out; + } + out: mutex_unlock(&dig_port->hdcp_mutex); mutex_unlock(&hdcp->mutex);