From patchwork Wed Jul 12 08:29:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramalingam C X-Patchwork-Id: 9836297 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 09B3160393 for ; Wed, 12 Jul 2017 08:31:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EFE472766D for ; Wed, 12 Jul 2017 08:31:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4C2628450; Wed, 12 Jul 2017 08:31:35 +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 A6DA827FB3 for ; Wed, 12 Jul 2017 08:31:35 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CC5AF6E3C2; Wed, 12 Jul 2017 08:30:06 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1769D6E3C2; Wed, 12 Jul 2017 08:30:06 +0000 (UTC) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Jul 2017 01:30:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,349,1496127600"; d="scan'208";a="126135214" Received: from mint-dev.iind.intel.com ([10.223.25.164]) by fmsmga006.fm.intel.com with ESMTP; 12 Jul 2017 01:30:03 -0700 From: Ramalingam C To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, daniel.vetter@intel.com Date: Wed, 12 Jul 2017 13:59:02 +0530 Message-Id: <1499848144-8456-19-git-send-email-ramalingam.c@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1499848144-8456-1-git-send-email-ramalingam.c@intel.com> References: <1499848144-8456-1-git-send-email-ramalingam.c@intel.com> Subject: [Intel-gfx] [RFC v1 18/20] drm/hdcp2.2: Late_init: Capability probing on panel X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP When the platform support HDCP2.2, HDCP2.2 capability is probed on panel from late_init. If platform and panel support HDCP2.2, DRM_HDCP2_SUPPORTED bit of HDCP property will be set. Signed-off-by: Ramalingam C --- drivers/gpu/drm/drm_hdcp.c | 41 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/drm_hdcp.c b/drivers/gpu/drm/drm_hdcp.c index 5441b55..cb20cc9 100644 --- a/drivers/gpu/drm/drm_hdcp.c +++ b/drivers/gpu/drm/drm_hdcp.c @@ -162,6 +162,42 @@ int drm_hdcp_set_property(struct drm_connector *connector, return 0; } +static void drm_hdcp_2_2_late_init(struct drm_hdcp *hdcp) +{ + uint8_t hdcp2version; + void *buf; + ssize_t receiv, size; + unsigned int offset; + + if (hdcp->protocol == WIRED_PROTOCOL_HDMI) { + offset = HDMI_HDCP2_REG_VER_OFFSET; + buf = (void *)&hdcp2version; + size = sizeof(hdcp2version); + } else { + DRM_ERROR("Unsupported Protocol\n"); + return; + } + + receiv = hdcp->hdcp_funcs->link_read(hdcp, offset, buf, size); + if (receiv == size) { + mutex_lock(&hdcp->mutex); + if (hdcp2version & HDMI_HDCP_2_2_SUPPORT_MASK) { + hdcp->ver_support_on_panel |= HDCP_2_2_SUPPORT; + hdcp->connector->hdcp_state |= DRM_HDCP2_SUPPORTED; + + DRM_DEBUG("HDMI with HDCP 2.2\n"); + } else { + hdcp->ver_support_on_panel &= ~HDCP_2_2_SUPPORT; + hdcp->connector->hdcp_state &= ~DRM_HDCP2_SUPPORTED; + + DRM_DEBUG("HDMI without HDCP 2.2\n"); + } + mutex_unlock(&hdcp->mutex); + } else { + DRM_ERROR("HDCP Link read failed. Error: %d\n", (int)receiv); + } +} + void drm_hdcp_late_init(struct drm_connector *connector) { struct drm_hdcp *hdcp = connector->hdcp; @@ -169,9 +205,8 @@ void drm_hdcp_late_init(struct drm_connector *connector) if (hdcp->hdcp_funcs->late_init) hdcp->hdcp_funcs->late_init(hdcp); - /* - * TODO: Invoke the Version specific late_init - */ + if (hdcp->ver_support_on_plat & HDCP_2_2_SUPPORT) + drm_hdcp_2_2_late_init(hdcp); } /**