From patchwork Wed Jul 12 08:29:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramalingam C X-Patchwork-Id: 9836291 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 613C260393 for ; Wed, 12 Jul 2017 08:31:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 532191FF2D for ; Wed, 12 Jul 2017 08:31:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 47E71284C7; Wed, 12 Jul 2017 08:31:25 +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=unavailable 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 0F5CE1FF2D for ; Wed, 12 Jul 2017 08:31:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9EB426E3D5; Wed, 12 Jul 2017 08:30:01 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id DD1A36E394; Wed, 12 Jul 2017 08:30:00 +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:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,349,1496127600"; d="scan'208";a="126135120" Received: from mint-dev.iind.intel.com ([10.223.25.164]) by fmsmga006.fm.intel.com with ESMTP; 12 Jul 2017 01:29:58 -0700 From: Ramalingam C To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, daniel.vetter@intel.com Subject: [RFC v1 16/20] drm/hdcp2.2: HDCP2.2 Initialization Date: Wed, 12 Jul 2017 13:59:00 +0530 Message-Id: <1499848144-8456-17-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> Cc: Ramalingam C , uma.shankar@intel.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP drm_hdcp_init is extended to support HDCP spec Ver2.2. Signed-off-by: Ramalingam C --- drivers/gpu/drm/drm_hdcp.c | 37 +++++++++++++++++++++++++++++++++++++ include/drm/drm_hdcp.h | 6 ++++++ 2 files changed, 43 insertions(+) diff --git a/drivers/gpu/drm/drm_hdcp.c b/drivers/gpu/drm/drm_hdcp.c index 9785ab6..5441b55 100644 --- a/drivers/gpu/drm/drm_hdcp.c +++ b/drivers/gpu/drm/drm_hdcp.c @@ -198,6 +198,36 @@ void drm_hdcp_connector_state_change_handler(struct drm_connector *connector) } EXPORT_SYMBOL(drm_hdcp_connector_state_change_handler); +static inline int drm_hdcp2_init(struct drm_connector *connector, + struct drm_hdcp *hdcp, + uint8_t spec_supported) +{ + if (!hdcp->hdcp2_funcs) { + DRM_ERROR("Callback functions are missing\n"); + return -EINVAL; + } + + /* No of streams transmitted on the port */ + /* + * TODO: For DP, in case of MST we need to figure out a way to + * configure this value on the run. on HDMI it is always 1. + */ + hdcp->k = 1; + + hdcp->streams = kmalloc_array(hdcp->k, + sizeof(struct wired_streamid_type), GFP_KERNEL); + if (!hdcp->streams) + return -ENOMEM; + + /* For HDMI this is forced to be 0x0 */ + hdcp->streams[0].stream_id = 0; + + /* Setting it to Type 0 by default */ + hdcp->streams[0].stream_type = HDCP_STREAM_TYPE0_CODE; + + return 0; +} + /** * @drm_hdcp_init: * Initialization of the HDCP stack of the DRM @@ -209,6 +239,7 @@ int drm_hdcp_init(struct drm_connector *connector, uint8_t spec_supported) { struct drm_mode_config *config = &connector->dev->mode_config; + int ret; if (!hdcp) return -EINVAL; @@ -227,6 +258,12 @@ int drm_hdcp_init(struct drm_connector *connector, if (!hdcp->hdcp_funcs->link_write || !hdcp->hdcp_funcs->link_read) return -EINVAL; + if (spec_supported & HDCP_2_2_SUPPORT) { + ret = drm_hdcp2_init(connector, hdcp, spec_supported); + if (ret < 0) + return ret; + } + hdcp->ver_support_on_plat = spec_supported; connector->hdcp = hdcp; diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h index 94acd8d..47862a7 100644 --- a/include/drm/drm_hdcp.h +++ b/include/drm/drm_hdcp.h @@ -320,6 +320,12 @@ struct drm_hdcp_funcs { struct drm_hdcp { struct drm_connector *connector; + /* No of streams transmitted on the port. 1 incase of HDMI & DP SST */ + uint16_t k; + + /* k no of structures of wired_streamid_type */ + struct wired_streamid_type *streams; + /* HDCP Specifications support flag */ uint32_t ver_support_on_plat; uint32_t ver_support_on_panel;