From patchwork Tue Jan 30 14:29:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 10191903 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 B3D2A60383 for ; Tue, 30 Jan 2018 14:29:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A32F228984 for ; Tue, 30 Jan 2018 14:29:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 97D08289DD; Tue, 30 Jan 2018 14:29:49 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 1337D28984 for ; Tue, 30 Jan 2018 14:29:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8FB6F89EB7; Tue, 30 Jan 2018 14:29:47 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-yw0-x241.google.com (mail-yw0-x241.google.com [IPv6:2607:f8b0:4002:c05::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4E31C6E756 for ; Tue, 30 Jan 2018 14:29:46 +0000 (UTC) Received: by mail-yw0-x241.google.com with SMTP id x190so4835446ywd.10 for ; Tue, 30 Jan 2018 06:29:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MOOnl76bmwKinXShS3wgerm8qZbGXxIXQ1wPTsgPtgc=; b=kUCiAHOkqCMfezHg/G508JzaDsk7b0irdb57XioYfJ3GyQ9sVLejTt/5TSA3OUqq8J BTh6gPfUZh03tsIlkd8Gluk3vQyiLY5ju0xDTEtuEg07NmCNDJAzUJ0Y/FrC3fe00Dq+ D/U6oddmnFqqXum9w+A+wlJQLSmFnvDxCgxzs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MOOnl76bmwKinXShS3wgerm8qZbGXxIXQ1wPTsgPtgc=; b=py2ePJ/EPyy+1kmwlKOI6mG2LgVcE5h93R1ZWtZavykoN4Rx9Fk1C6SaUFBn26WxMf 5/VsIKQQJ3d5ca6GHtCcOqlj/oLSTwc02rKTC3vu7Oh9J+fM/Yfv8HGN3qlgQfuE4+kh x8fesJv9XF46IykeMDq74y4jKACmPFBY91rU9rTVuB6XwmH9ZGP8dPZPI2XVM7nEBBy0 Sy5sH0vzULLUIHKk6cFjEVIwFJ7kmbM/8sxH14SpUfNI272zllpAuexBMFxbQrk38XJP oYO9CII4DfRv0BkQD5H0qe0GXFPs7Sy5L6WSOkVI4AeCWoDxksLo5mDQGZD6RtUfbn9D rDzw== X-Gm-Message-State: AKwxytcBfBwMq8JKZ1VdXVctAxcjU5D4dzC28WxAJIHg451VQSnYInqu T1zQhZcZyJi2lZDz7IPBr/rf4swSZiE= X-Google-Smtp-Source: AH8x224c0pDCgypeSx0x8CfJP8jlCc0UKHO206cMrknGreyxPW0pCQgTi/NPaC7oLZp2knb4Z9UR+w== X-Received: by 10.37.187.145 with SMTP id y17mr17940484ybg.64.1517322585174; Tue, 30 Jan 2018 06:29:45 -0800 (PST) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:d3af:69ac:1964:28e8]) by smtp.gmail.com with ESMTPSA id w69sm5406912yww.13.2018.01.30.06.29.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jan 2018 06:29:44 -0800 (PST) From: Sean Paul To: dri-devel@lists.freedesktop.org Subject: [PATCH v2] drm/i915: Restore HDCP DRM_INFO when with no downstream Date: Tue, 30 Jan 2018 09:29:34 -0500 Message-Id: <20180130142943.168314-1-seanpaul@chromium.org> X-Mailer: git-send-email 2.16.0.rc1.238.g530d649a79-goog In-Reply-To: References: X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: intel-gfx@lists.freedesktop.org, Rodrigo Vivi MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP The commit below returned earlier than before, but failed to move the info message when authenticating without downstream devices. This patch restores the message on authentication success. Changes in v2: - s/no downstream devices/no repeater present/ (Ram) Fixes: 87eb3ec818fa ("drm/i915: II stage HDCP auth for repeater only") Cc: Ramalingam C Cc: Sean Paul Cc: Jani Nikula Cc: Joonas Lahtinen Cc: Rodrigo Vivi Cc: intel-gfx@lists.freedesktop.org Reviewed-by: Daniel Vetter Signed-off-by: Sean Paul --- drivers/gpu/drm/i915/intel_hdcp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_hdcp.c b/drivers/gpu/drm/i915/intel_hdcp.c index db9527173a1e..9fc9da030514 100644 --- a/drivers/gpu/drm/i915/intel_hdcp.c +++ b/drivers/gpu/drm/i915/intel_hdcp.c @@ -168,10 +168,8 @@ int intel_hdcp_auth_downstream(struct intel_digital_port *intel_dig_port, /* If there are no downstream devices, we're all done. */ num_downstream = DRM_HDCP_NUM_DOWNSTREAM(bstatus[0]); - if (num_downstream == 0) { - DRM_INFO("HDCP is enabled (no downstream devices)\n"); + if (num_downstream == 0) return 0; - } ksv_fifo = kzalloc(num_downstream * DRM_HDCP_KSV_LEN, GFP_KERNEL); if (!ksv_fifo) @@ -502,6 +500,7 @@ static int intel_hdcp_auth(struct intel_digital_port *intel_dig_port, if (repeater_present) return intel_hdcp_auth_downstream(intel_dig_port, shim); + DRM_INFO("HDCP is enabled (no repeater present)\n"); return 0; }