From patchwork Wed Jul 12 08:28:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ramalingam C X-Patchwork-Id: 9836279 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 DC66460393 for ; Wed, 12 Jul 2017 08:31:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CEE981FF2D for ; Wed, 12 Jul 2017 08:31:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C3635284C7; Wed, 12 Jul 2017 08:31:02 +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 6AA511FF2D for ; Wed, 12 Jul 2017 08:31:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 18D2D6E39E; Wed, 12 Jul 2017 08:29:55 +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 32F156E399; Wed, 12 Jul 2017 08:29:53 +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:29:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.40,349,1496127600"; d="scan'208";a="126135097" Received: from mint-dev.iind.intel.com ([10.223.25.164]) by fmsmga006.fm.intel.com with ESMTP; 12 Jul 2017 01:29:50 -0700 From: Ramalingam C To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, daniel.vetter@intel.com Subject: [RFC v1 13/20] drm/hdcp: Updating DRM Property val with HDCP state Date: Wed, 12 Jul 2017 13:58:57 +0530 Message-Id: <1499848144-8456-14-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 Implemented drm_hdcp_update_change() for updating the current status to the hdcp_property value. This will update the error status flag incase of encryption failure. Whenever there is a HDCP state change KOBJ_UEVENT will be broadcasted to notify the awaiting userspace consumers. Signed-off-by: Ramalingam C --- drivers/gpu/drm/drm_hdcp.c | 40 ++++++++++++++++++++++++++++++++++++++++ include/drm/drm_hdcp.h | 3 +++ 2 files changed, 43 insertions(+) diff --git a/drivers/gpu/drm/drm_hdcp.c b/drivers/gpu/drm/drm_hdcp.c index 9b3bf92..9785ab6 100644 --- a/drivers/gpu/drm/drm_hdcp.c +++ b/drivers/gpu/drm/drm_hdcp.c @@ -30,6 +30,46 @@ #include #include +/* + * drm_hdcp_update_change: + * Updating the HDCP property val along with uevent + * + * @hdcp: ptr to hdcp instance + * @enabled: status of HDCP encryption + * @status: Error status bits, if auth failed. + * @mute: uevent is mute or not + */ +static void drm_hdcp_update_change(struct drm_hdcp *hdcp, bool enabled, + uint64_t status, bool mute) +{ + struct drm_connector *connector = hdcp->connector; + char event_str[30]; + uint64_t temp_state; + + /* Mutex has to be acquired before entering this function */ + WARN_ON(!mutex_is_locked(&hdcp->mutex)); + temp_state = connector->hdcp_state; + + if (enabled) { + temp_state &= ~(DRM_HDCP_ENABLE | DRM_HDCP_TYPE_MASK + | DRM_HDCP_STATUS_MASK); + temp_state |= hdcp->req_state; + } else { + temp_state &= DRM_HDCP_VER_SUPPORT_MASK; + temp_state |= (status & DRM_HDCP_STATUS_MASK); + } + + connector->hdcp_state = temp_state; + + if (!mute) { + sprintf(event_str, "HDCP=0x%llx", connector->hdcp_state); + + /* Generating the uevent with custom string */ + drm_sysfs_generate_uevent(hdcp->connector->dev, event_str); + } +} + + int drm_hdcp_enable(struct drm_connector *connector, uint8_t stream_type) { struct drm_hdcp *hdcp = connector->hdcp; diff --git a/include/drm/drm_hdcp.h b/include/drm/drm_hdcp.h index eb7149b..d5adbf5 100644 --- a/include/drm/drm_hdcp.h +++ b/include/drm/drm_hdcp.h @@ -163,6 +163,9 @@ struct drm_hdcp { #define DRM_HDCP_TYPE_SHIFT 4 #define DRM_HDCP_TYPE_MASK (0xFFULL<