From patchwork Wed Feb 14 14:13:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramalingam C X-Patchwork-Id: 10219139 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 570E960467 for ; Wed, 14 Feb 2018 14:21:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48A6128FE4 for ; Wed, 14 Feb 2018 14:21:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3DA0728FEF; Wed, 14 Feb 2018 14:21:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E09F228FE4 for ; Wed, 14 Feb 2018 14:21:48 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5E0B36E436; Wed, 14 Feb 2018 14:21:29 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by gabe.freedesktop.org (Postfix) with ESMTPS id 894EF6E436 for ; Wed, 14 Feb 2018 14:21:28 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Feb 2018 06:21:28 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,512,1511856000"; d="scan'208";a="204077184" Received: from mint-dev.iind.intel.com ([10.223.25.164]) by fmsmga005.fm.intel.com with ESMTP; 14 Feb 2018 06:21:26 -0800 From: Ramalingam C To: seanpaul@chromium.org, intel-gfx@lists.freedesktop.org, rodrigo.vivi@intel.com, daniel.vetter@ffwll.ch Date: Wed, 14 Feb 2018 19:43:58 +0530 Message-Id: <1518617638-21684-44-git-send-email-ramalingam.c@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1518617638-21684-1-git-send-email-ramalingam.c@intel.com> References: <1518617638-21684-1-git-send-email-ramalingam.c@intel.com> Subject: [Intel-gfx] [PATCH 43/43] drm/i915: Invoke check link on CP_IRQ of DP X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tomas.winkler@intel.com MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP On DP HDCP1.4 and 2.2, when CP_IRQ is received, start the link integrity check for the HDCP version that is enabled. Signed-off-by: Ramalingam C --- drivers/gpu/drm/i915/intel_dp.c | 9 +++------ drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_hdcp.c | 11 ++++++++++- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index ec929b1ff0ae..46e1a0cce2d5 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -4438,8 +4438,10 @@ intel_dp_short_pulse(struct intel_dp *intel_dp) if (sink_irq_vector & DP_AUTOMATED_TEST_REQUEST) intel_dp_handle_test_request(intel_dp); if (sink_irq_vector & DP_CP_IRQ) { - if (connector->hdcp) + if (connector->hdcp) { + intel_hdcp_cp_irq_received(connector); complete(&connector->hdcp->cp_irq_recved); + } } if (sink_irq_vector & DP_SINK_SPECIFIC_IRQ) @@ -5799,11 +5801,6 @@ intel_dp_hpd_pulse(struct intel_digital_port *intel_dig_port, bool long_hpd) drm_modeset_acquire_fini(&ctx); WARN(iret, "Acquiring modeset locks failed with %i\n", iret); - /* Short pulse can signify loss of hdcp authentication */ - if (intel_dp->attached_connector->hdcp) - intel_hdcp_check_link( - intel_dp->attached_connector->hdcp); - if (!handled) { intel_dp->detect_done = false; goto put_power; diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 842a22502763..4b5fd92c115e 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1954,8 +1954,8 @@ int intel_hdcp_init(struct intel_connector *connector, const struct intel_hdcp2_shim *hdcp2_shim); int intel_hdcp_enable(struct intel_connector *connector); int intel_hdcp_disable(struct intel_connector *connector); -int intel_hdcp_check_link(struct intel_hdcp *hdcp); bool is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port); +void intel_hdcp_cp_irq_received(struct intel_connector *connector); /* intel_psr.c */ #define CAN_PSR(dev_priv) (HAS_PSR(dev_priv) && dev_priv->psr.sink_support) diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c index bb56e4e595d8..ab482082c5e4 100644 --- a/drivers/gpu/drm/i915/intel_hdcp.c +++ b/drivers/gpu/drm/i915/intel_hdcp.c @@ -27,6 +27,7 @@ static int _intel_hdcp2_disable(struct intel_hdcp *hdcp); static void intel_hdcp2_check_work(struct work_struct *work); static int intel_hdcp2_check_link(struct intel_hdcp *hdcp); static void intel_hdcp2_exit(struct intel_connector *connector); +static int intel_hdcp_check_link(struct intel_hdcp *hdcp); static inline bool intel_hdcp1_supported(struct intel_hdcp *hdcp) { @@ -1024,7 +1025,7 @@ void intel_hdcp_atomic_check(struct drm_connector *connector, } /* Implements Part 3 of the HDCP authorization procedure */ -int intel_hdcp_check_link(struct intel_hdcp *hdcp) +static int intel_hdcp_check_link(struct intel_hdcp *hdcp) { struct intel_connector *connector = hdcp->connector; struct drm_i915_private *dev_priv = connector->base.dev->dev_private; @@ -1789,3 +1790,11 @@ static int intel_hdcp2_check_link(struct intel_hdcp *hdcp) mutex_unlock(&hdcp->hdcp_mutex); return ret; } + +void intel_hdcp_cp_irq_received(struct intel_connector *connector) +{ + if (intel_hdcp_in_force(connector->hdcp)) + intel_hdcp_check_link(connector->hdcp); + else if (intel_hdcp2_in_force(connector->hdcp)) + intel_hdcp2_check_link(connector->hdcp); +}