From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA781C2D0DB for ; Wed, 29 Jan 2020 14:48:16 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 9F7DD206F0 for ; Wed, 29 Jan 2020 14:48:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9F7DD206F0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 13C506E3B5; Wed, 29 Jan 2020 14:48:16 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id 38DE86E3B5 for ; Wed, 29 Jan 2020 14:48:15 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jan 2020 06:48:14 -0800 X-IronPort-AV: E=Sophos;i="5.70,378,1574150400"; d="scan'208";a="222471503" Received: from jnikula-mobl3.fi.intel.com (HELO localhost) ([10.237.66.161]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jan 2020 06:48:12 -0800 From: Jani Nikula To: Anshuman Gupta In-Reply-To: <20200129134028.GA20877@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20200128163803.5954-1-jani.nikula@intel.com> <20200129134028.GA20877@intel.com> Date: Wed, 29 Jan 2020 16:48:09 +0200 Message-ID: <87imkub9p2.fsf@intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH] drm/i915/hdcp: move update pipe code to hdcp 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: , Cc: intel-gfx@lists.freedesktop.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, 29 Jan 2020, Anshuman Gupta wrote: > On 2020-01-28 at 18:38:03 +0200, Jani Nikula wrote: >> The DDI encoder code shouln't have to know about the guts of >> HDCP. Abstract the pipe update code to a new intel_hdcp_update_pipe() in >> intel_hdcp.c. No functional changes. >> >> Cc: Anshuman Gupta >> Signed-off-by: Jani Nikula >> --- >> drivers/gpu/drm/i915/display/intel_ddi.c | 34 +------------------ >> drivers/gpu/drm/i915/display/intel_hdcp.c | 40 +++++++++++++++++++++++ >> drivers/gpu/drm/i915/display/intel_hdcp.h | 5 +++ >> 3 files changed, 46 insertions(+), 33 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c >> index b1100950dd0d..142b2f5e5522 100644 >> --- a/drivers/gpu/drm/i915/display/intel_ddi.c >> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c >> @@ -4058,43 +4058,11 @@ static void intel_ddi_update_pipe(struct intel_encoder *encoder, >> const struct intel_crtc_state *crtc_state, >> const struct drm_connector_state *conn_state) >> { >> - struct intel_connector *connector = >> - to_intel_connector(conn_state->connector); >> - struct intel_hdcp *hdcp = &connector->hdcp; >> - bool content_protection_type_changed = >> - (conn_state->hdcp_content_type != hdcp->content_type && >> - conn_state->content_protection != >> - DRM_MODE_CONTENT_PROTECTION_UNDESIRED); >> >> if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) >> intel_ddi_update_pipe_dp(encoder, crtc_state, conn_state); >> >> - /* >> - * During the HDCP encryption session if Type change is requested, >> - * disable the HDCP and reenable it with new TYPE value. >> - */ >> - if (conn_state->content_protection == >> - DRM_MODE_CONTENT_PROTECTION_UNDESIRED || >> - content_protection_type_changed) >> - intel_hdcp_disable(connector); >> - >> - /* >> - * Mark the hdcp state as DESIRED after the hdcp disable of type >> - * change procedure. >> - */ >> - if (content_protection_type_changed) { >> - mutex_lock(&hdcp->mutex); >> - hdcp->value = DRM_MODE_CONTENT_PROTECTION_DESIRED; >> - schedule_work(&hdcp->prop_work); >> - mutex_unlock(&hdcp->mutex); >> - } >> - >> - if (conn_state->content_protection == >> - DRM_MODE_CONTENT_PROTECTION_DESIRED || >> - content_protection_type_changed) >> - intel_hdcp_enable(connector, >> - crtc_state->cpu_transcoder, >> - (u8)conn_state->hdcp_content_type); >> + intel_hdcp_update_pipe(encoder, crtc_state, conn_state); >> } >> >> static void >> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c >> index 33dc40a63fce..3cd74951a34c 100644 >> --- a/drivers/gpu/drm/i915/display/intel_hdcp.c >> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c >> @@ -2034,6 +2034,46 @@ int intel_hdcp_disable(struct intel_connector *connector) >> return ret; >> } >> >> +void intel_hdcp_update_pipe(struct intel_encoder *encoder, > encoder arg is not getting used in this function, it can be removed. > With above comment, > Reviewed-by: Anshuman Gupta Thanks for the review. I opted to include encoder to have the same function type (or "signature") as encoder->update_pipe hook. *shrug*. BR, Jani. > Thanks , > Anshuman Gupta. >> + const struct intel_crtc_state *crtc_state, >> + const struct drm_connector_state *conn_state) >> +{ >> + struct intel_connector *connector = >> + to_intel_connector(conn_state->connector); >> + struct intel_hdcp *hdcp = &connector->hdcp; >> + bool content_protection_type_changed = >> + (conn_state->hdcp_content_type != hdcp->content_type && >> + conn_state->content_protection != >> + DRM_MODE_CONTENT_PROTECTION_UNDESIRED); >> + >> + /* >> + * During the HDCP encryption session if Type change is requested, >> + * disable the HDCP and reenable it with new TYPE value. >> + */ >> + if (conn_state->content_protection == >> + DRM_MODE_CONTENT_PROTECTION_UNDESIRED || >> + content_protection_type_changed) >> + intel_hdcp_disable(connector); >> + >> + /* >> + * Mark the hdcp state as DESIRED after the hdcp disable of type >> + * change procedure. >> + */ >> + if (content_protection_type_changed) { >> + mutex_lock(&hdcp->mutex); >> + hdcp->value = DRM_MODE_CONTENT_PROTECTION_DESIRED; >> + schedule_work(&hdcp->prop_work); >> + mutex_unlock(&hdcp->mutex); >> + } >> + >> + if (conn_state->content_protection == >> + DRM_MODE_CONTENT_PROTECTION_DESIRED || >> + content_protection_type_changed) >> + intel_hdcp_enable(connector, >> + crtc_state->cpu_transcoder, >> + (u8)conn_state->hdcp_content_type); >> +} >> + >> void intel_hdcp_component_fini(struct drm_i915_private *dev_priv) >> { >> mutex_lock(&dev_priv->hdcp_comp_mutex); >> diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.h b/drivers/gpu/drm/i915/display/intel_hdcp.h >> index f3c3272e712a..1b2eacaf8949 100644 >> --- a/drivers/gpu/drm/i915/display/intel_hdcp.h >> +++ b/drivers/gpu/drm/i915/display/intel_hdcp.h >> @@ -14,6 +14,8 @@ struct drm_connector; >> struct drm_connector_state; >> struct drm_i915_private; >> struct intel_connector; >> +struct intel_crtc_state; >> +struct intel_encoder; >> struct intel_hdcp_shim; >> enum port; >> enum transcoder; >> @@ -26,6 +28,9 @@ int intel_hdcp_init(struct intel_connector *connector, >> int intel_hdcp_enable(struct intel_connector *connector, >> enum transcoder cpu_transcoder, u8 content_type); >> int intel_hdcp_disable(struct intel_connector *connector); >> +void intel_hdcp_update_pipe(struct intel_encoder *encoder, >> + const struct intel_crtc_state *crtc_state, >> + const struct drm_connector_state *conn_state); >> bool is_hdcp_supported(struct drm_i915_private *dev_priv, enum port port); >> bool intel_hdcp_capable(struct intel_connector *connector); >> bool intel_hdcp2_capable(struct intel_connector *connector); >> -- >> 2.20.1 >> -- Jani Nikula, Intel Open Source Graphics Center _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx