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=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 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 36F8FC433DF for ; Fri, 3 Jul 2020 11:47:40 +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 1350620737 for ; Fri, 3 Jul 2020 11:47:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1350620737 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 640186EB5C; Fri, 3 Jul 2020 11:47:39 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id A99A26EB5C; Fri, 3 Jul 2020 11:47:37 +0000 (UTC) IronPort-SDR: ACPfc4qi6w2eEgkId7VCVHTgLzaxgmuBRKvxfQwIWZSbfJJ59pjyzsn7AqTONZyqbJa2g5GJy4 kYEveyJwB+zg== X-IronPort-AV: E=McAfee;i="6000,8403,9670"; a="145267434" X-IronPort-AV: E=Sophos;i="5.75,308,1589266800"; d="scan'208";a="145267434" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2020 04:47:37 -0700 IronPort-SDR: XnojOUXL4IwR6t3woKXYl3DvsPxu/ThYmAtQzKycV3zMNliNZuoEi4qODSWnujvUFCf8vqOudJ ReGd5Xg2ScAw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,308,1589266800"; d="scan'208";a="296191029" Received: from unknown (HELO intel.com) ([10.223.74.178]) by orsmga002.jf.intel.com with ESMTP; 03 Jul 2020 04:47:35 -0700 Date: Fri, 3 Jul 2020 17:06:04 +0530 From: Anshuman Gupta To: Sean Paul Subject: Re: [Intel-gfx] [PATCH v7 08/17] drm/i915: Clean up intel_hdcp_disable Message-ID: <20200703113603.GJ15183@intel.com> References: <20200623155907.22961-1-sean@poorly.run> <20200623155907.22961-9-sean@poorly.run> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200623155907.22961-9-sean@poorly.run> User-Agent: Mutt/1.9.4 (2018-02-28) X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "daniel.vetter@ffwll.ch" , "intel-gfx@lists.freedesktop.org" , Sean Paul , "dri-devel@lists.freedesktop.org" Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 2020-06-23 at 21:28:58 +0530, Sean Paul wrote: > From: Sean Paul > > Add an out label and un-indent hdcp disable in preparation for > hdcp_mutex. No functional changes LGTM Reviewed-by: Anshuman Gupta > > Signed-off-by: Sean Paul > Link: https://patchwork.freedesktop.org/patch/msgid/20200429195502.39919-9-sean@poorly.run #v6 > > Changes in v7: > -Split into separate patch (Ramalingam) > --- > drivers/gpu/drm/i915/display/intel_hdcp.c | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c > index 62cab3aea745..16bf0fbe5f17 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -2113,16 +2113,17 @@ int intel_hdcp_disable(struct intel_connector *connector) > > mutex_lock(&hdcp->mutex); > > - if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) { > - intel_hdcp_update_value(connector, > - DRM_MODE_CONTENT_PROTECTION_UNDESIRED, > - false); > - if (hdcp->hdcp2_encrypted) > - ret = _intel_hdcp2_disable(connector); > - else if (hdcp->hdcp_encrypted) > - ret = _intel_hdcp_disable(connector); > - } > + if (hdcp->value == DRM_MODE_CONTENT_PROTECTION_UNDESIRED) > + goto out; > > + intel_hdcp_update_value(connector, > + DRM_MODE_CONTENT_PROTECTION_UNDESIRED, false); > + if (hdcp->hdcp2_encrypted) > + ret = _intel_hdcp2_disable(connector); > + else if (hdcp->hdcp_encrypted) > + ret = _intel_hdcp_disable(connector); > + > +out: > mutex_unlock(&hdcp->mutex); > cancel_delayed_work_sync(&hdcp->check_work); > return ret; > -- > Sean Paul, Software Engineer, Google / Chromium OS > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel 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=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 6BD4DC433E0 for ; Fri, 3 Jul 2020 11:47:43 +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 4C28A20737 for ; Fri, 3 Jul 2020 11:47:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C28A20737 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 8F8C96EB5D; Fri, 3 Jul 2020 11:47:39 +0000 (UTC) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id A99A26EB5C; Fri, 3 Jul 2020 11:47:37 +0000 (UTC) IronPort-SDR: ACPfc4qi6w2eEgkId7VCVHTgLzaxgmuBRKvxfQwIWZSbfJJ59pjyzsn7AqTONZyqbJa2g5GJy4 kYEveyJwB+zg== X-IronPort-AV: E=McAfee;i="6000,8403,9670"; a="145267434" X-IronPort-AV: E=Sophos;i="5.75,308,1589266800"; d="scan'208";a="145267434" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2020 04:47:37 -0700 IronPort-SDR: XnojOUXL4IwR6t3woKXYl3DvsPxu/ThYmAtQzKycV3zMNliNZuoEi4qODSWnujvUFCf8vqOudJ ReGd5Xg2ScAw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,308,1589266800"; d="scan'208";a="296191029" Received: from unknown (HELO intel.com) ([10.223.74.178]) by orsmga002.jf.intel.com with ESMTP; 03 Jul 2020 04:47:35 -0700 Date: Fri, 3 Jul 2020 17:06:04 +0530 From: Anshuman Gupta To: Sean Paul Message-ID: <20200703113603.GJ15183@intel.com> References: <20200623155907.22961-1-sean@poorly.run> <20200623155907.22961-9-sean@poorly.run> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200623155907.22961-9-sean@poorly.run> User-Agent: Mutt/1.9.4 (2018-02-28) Subject: Re: [Intel-gfx] [PATCH v7 08/17] drm/i915: Clean up intel_hdcp_disable 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: "daniel.vetter@ffwll.ch" , "intel-gfx@lists.freedesktop.org" , Sean Paul , "dri-devel@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 2020-06-23 at 21:28:58 +0530, Sean Paul wrote: > From: Sean Paul > > Add an out label and un-indent hdcp disable in preparation for > hdcp_mutex. No functional changes LGTM Reviewed-by: Anshuman Gupta > > Signed-off-by: Sean Paul > Link: https://patchwork.freedesktop.org/patch/msgid/20200429195502.39919-9-sean@poorly.run #v6 > > Changes in v7: > -Split into separate patch (Ramalingam) > --- > drivers/gpu/drm/i915/display/intel_hdcp.c | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c > index 62cab3aea745..16bf0fbe5f17 100644 > --- a/drivers/gpu/drm/i915/display/intel_hdcp.c > +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c > @@ -2113,16 +2113,17 @@ int intel_hdcp_disable(struct intel_connector *connector) > > mutex_lock(&hdcp->mutex); > > - if (hdcp->value != DRM_MODE_CONTENT_PROTECTION_UNDESIRED) { > - intel_hdcp_update_value(connector, > - DRM_MODE_CONTENT_PROTECTION_UNDESIRED, > - false); > - if (hdcp->hdcp2_encrypted) > - ret = _intel_hdcp2_disable(connector); > - else if (hdcp->hdcp_encrypted) > - ret = _intel_hdcp_disable(connector); > - } > + if (hdcp->value == DRM_MODE_CONTENT_PROTECTION_UNDESIRED) > + goto out; > > + intel_hdcp_update_value(connector, > + DRM_MODE_CONTENT_PROTECTION_UNDESIRED, false); > + if (hdcp->hdcp2_encrypted) > + ret = _intel_hdcp2_disable(connector); > + else if (hdcp->hdcp_encrypted) > + ret = _intel_hdcp_disable(connector); > + > +out: > mutex_unlock(&hdcp->mutex); > cancel_delayed_work_sync(&hdcp->check_work); > return ret; > -- > Sean Paul, Software Engineer, Google / Chromium OS > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx