From patchwork Mon Jan 22 17:55:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 10178971 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 B0FFE60353 for ; Mon, 22 Jan 2018 17:55:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A2A2428397 for ; Mon, 22 Jan 2018 17:55:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 974EB283BB; Mon, 22 Jan 2018 17:55:21 +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 417F028397 for ; Mon, 22 Jan 2018 17:55:21 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9E7F36E279; Mon, 22 Jan 2018 17:55:19 +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 DBA246E282 for ; Mon, 22 Jan 2018 17:55:18 +0000 (UTC) Received: by mail-yw0-x241.google.com with SMTP id x62so3519629ywg.11 for ; Mon, 22 Jan 2018 09:55:18 -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; bh=6Ku65ej1NWCtsg+Y5COP/Xyc0m8YHN5lpMkvAgrnf80=; b=Fftw6fis/hxOxhx2e6GOO/01w8+WwBO8qiqWJ6r+4/9IvCDnyy7Zsmt3RPjEKi6QV5 puc0dB+KH4Uvkh2mghMb48CtKL3Xm5ghFOYQ13PsaD0FhpxgW4G0/Gw1ZsJesxZHCVHX lK+wWgGwi7KPhzmJHWMxwWKu7844gy+9NDiUo= 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; bh=6Ku65ej1NWCtsg+Y5COP/Xyc0m8YHN5lpMkvAgrnf80=; b=lNKMDAN51Bc5vUYB09TBXj6/pZQpuhkvSYiIwoAi9UcyG0219B2HXebrwPeWGw39eA FdoRIzAjY3fk7j8P0C8gl2jcVSEWiiYatKcXfgQGGx3WqFq/Sx2wwh6Hi0NlNY/9RSVA du1qu+gs17+Mjw2HuJym98YcCB8w6Bcbxstwu0x4HRORVddKz0uCAkTEZXKhcyL5WvZT t0sIExs2zgrb1/b8xRZkW7qx1MiOwvxtUW2YiZO5ewCmW6Bq+GX+szbSUtAmUg5RPHKw ezZGDFBMyJ0B29s23+9LwsFKV8viPQ7Nl62x6gkhYyYBqAXTv8ra18njp0ee/3vmWNDF Y4wA== X-Gm-Message-State: AKwxytcbE+bqPrE9s/+Nk1CVE4hpvBx+jBtET+fyLY8whiygTan7Doy7 v3Ri3VkhOaxCn08AQ9oeI7a0TLno3xM= X-Google-Smtp-Source: AH8x226exkYDk/DmOCowxEHyg84s3PWbr5hNSu5mtSV5rxYfPZGKfiWlM0kUssd8lmkeuNfp0H+PiA== X-Received: by 10.129.37.14 with SMTP id l14mr8434530ywl.412.1516643717939; Mon, 22 Jan 2018 09:55:17 -0800 (PST) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:d3af:69ac:1964:28e8]) by smtp.gmail.com with ESMTPSA id g37sm6580831ywk.84.2018.01.22.09.55.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Jan 2018 09:55:17 -0800 (PST) From: Sean Paul To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/i915: Restore HDCP DRM_INFO when with no downstream Date: Mon, 22 Jan 2018 12:55:00 -0500 Message-Id: <20180122175516.235313-1-seanpaul@chromium.org> X-Mailer: git-send-email 2.16.0.rc1.238.g530d649a79-goog Cc: intel-gfx@lists.freedesktop.org, Rodrigo Vivi 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 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. 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 Signed-off-by: Sean Paul Reviewed-by: Daniel Vetter --- 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..dd7dffd405d5 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 downstream devices)\n"); return 0; }