From patchwork Thu Mar 5 20:12:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11422541 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D7F5592A for ; Thu, 5 Mar 2020 20:12:56 +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 B647C207FD for ; Thu, 5 Mar 2020 20:12:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=poorly.run header.i=@poorly.run header.b="Q0tOol2N" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B647C207FD Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run 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 C86B66EC18; Thu, 5 Mar 2020 20:12:42 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yw1-xc41.google.com (mail-yw1-xc41.google.com [IPv6:2607:f8b0:4864:20::c41]) by gabe.freedesktop.org (Postfix) with ESMTPS id 144CD6EC16 for ; Thu, 5 Mar 2020 20:12:42 +0000 (UTC) Received: by mail-yw1-xc41.google.com with SMTP id p69so6868237ywh.10 for ; Thu, 05 Mar 2020 12:12:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YyfWwdgBnW/FW8BbaaGwDDLx+nnNecS1HvcyXNNLD2U=; b=Q0tOol2NLwb5ysUL/jKRX8G4ypf6MAH6IfIpJDI5ZVDnUgcFFqtscnbJYUOpGfHsK3 g8m9lcx/wA60V/nyXnSfyc3pU6T5NoyuFo1A6q0tIJTId83SxnZIdbiQaOW+4Bt/qa2h mTjb1C7B0pwOjPcEn53v+DH5LF4kDLOYyRl4H8SxIzwv3tKWjJoamgv0+q0YcdYXqP3X hQ7IzpDWNXLFaNX3JfYrHbL0BL4S+OLBFu/oV3+aadkJylI/KfZ1iHII2Me7PdtKQiEE LPgRi+/f2B+8hqJjVw3BPQe9lNQfRRQBAViBj4sLVjg7viphDHOEF9w3JKvdwMjc1yLx ZVYw== 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:mime-version:content-transfer-encoding; bh=YyfWwdgBnW/FW8BbaaGwDDLx+nnNecS1HvcyXNNLD2U=; b=JX347E6fL39k2phcoJ+C6H7LkYZjaUyMHpI1IEVR1gwWkYQzMm5qhFASeneU2wC16m eQyewl/pjnUpgVnM5BddhnQvx8u/VHyFubrZfLE2rvkg4VjUQaCv4yWqc0wIkRRyKJ1L 5npxSFGQg5dyHa3EU/y54TrAtL4n72Hxm5+MJmKl2foysuikmB2ksCUt93ha3w4LJD+N G7rDX/USujQxfNW0GWzaPn7VQIAUxGPkoWjVZDyzxHaK/Q74vJet9dyOfa+VxRylMQbX m43ojvlK6NOSJR2hqjShgvkvqXlHm876yp56wgN9qk6Eei5cBgtSRzjusdHzfIqp5q1y 9w3g== X-Gm-Message-State: ANhLgQ2tMqvqK9X8rXpFX5nU4tiaqW34oz+u+3tlLZQqxs9dSP8HWzRx l2tml75pMHiBTH1MlMZRG1YmVw== X-Google-Smtp-Source: ADFU+vvBwBOjKwxOSKIgRMyWwJZjfyUK4Cnh/+TOryCihgxjlrlMYSezkOXjcz8j4O+6FQaAGBIyDw== X-Received: by 2002:a25:6c0a:: with SMTP id h10mr9011061ybc.47.1583439161283; Thu, 05 Mar 2020 12:12:41 -0800 (PST) Received: from localhost ([2620:0:1013:11:1e1:4760:6ce4:fc64]) by smtp.gmail.com with ESMTPSA id v189sm3986794ywa.28.2020.03.05.12.12.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Mar 2020 12:12:40 -0800 (PST) From: Sean Paul To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Date: Thu, 5 Mar 2020 15:12:23 -0500 Message-Id: <20200305201236.152307-4-sean@poorly.run> X-Mailer: git-send-email 2.25.1.481.gfbce0eb801-goog In-Reply-To: <20200305201236.152307-1-sean@poorly.run> References: <20200305201236.152307-1-sean@poorly.run> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v5 03/16] drm/i915: WARN if HDCP signalling is enabled upon 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, Sean Paul Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Sean Paul HDCP signalling should not be left on, WARN if it is Cc: Ville Syrjälä Cc: Daniel Vetter Reviewed-by: Ramalingam C Signed-off-by: Sean Paul Link: https://patchwork.freedesktop.org/patch/msgid/20191212190230.188505-4-sean@poorly.run #v2 Link: https://patchwork.freedesktop.org/patch/msgid/20200117193103.156821-4-sean@poorly.run #v3 Link: https://patchwork.freedesktop.org/patch/msgid/20200218220242.107265-4-sean@poorly.run #v4 Changes in v2: -Added to the set in lieu of just clearing the bit Changes in v3: -None Changes in v4: -None Changes in v5: -Change WARN_ON to drm_WARN_ON --- drivers/gpu/drm/i915/display/intel_ddi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index 73d0f4648c06a..4aff5717e9428 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -1593,6 +1593,8 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state val = intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder)); val &= ~TRANS_DDI_FUNC_ENABLE; + drm_WARN_ON(crtc->base.dev, val & TRANS_DDI_HDCP_SIGNALLING); + if (INTEL_GEN(dev_priv) >= 12) { if (!intel_dp_mst_is_master_trans(crtc_state)) { val &= ~(TGL_TRANS_DDI_PORT_MASK |