From patchwork Fri Jan 17 19:30:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11339649 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 43510921 for ; Fri, 17 Jan 2020 19:31:18 +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 223FA2072B for ; Fri, 17 Jan 2020 19:31:18 +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="YknXv6Cm" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 223FA2072B 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 A7F136F8D6; Fri, 17 Jan 2020 19:31:10 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yw1-xc44.google.com (mail-yw1-xc44.google.com [IPv6:2607:f8b0:4864:20::c44]) by gabe.freedesktop.org (Postfix) with ESMTPS id BDEAF6F8D7 for ; Fri, 17 Jan 2020 19:31:09 +0000 (UTC) Received: by mail-yw1-xc44.google.com with SMTP id l14so14845298ywj.9 for ; Fri, 17 Jan 2020 11:31:09 -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=vw0YZIzYilg4if3Ue4FJsV410z1mun8IqIxc6oGE2sI=; b=YknXv6CmaGJlLUkmJKe5oTsWYP5Id1i6aH7rpUWrV84LPkyuAfPKQiBFtNXGonUgzP NWDEdpFo1aBlBwrLIhwOAU7HBD7TwlQS86/ose80wQcGLBK7tjmzjRtnOKUIwZ3ebuwU coIxHDzV9MkrzdppMc1Uq1QTfO/3kNeOl14r9cKxrUbNRzTSM+69aMnaNo5kkJU9HUnO NP/+dsm7Pw3m94FubNMnuvWcLYleRgFB5awSmbp2S572iNiK83+eQjnxsrN7t0Y6mtjY 7L/+YMsbJKbLZmzSo80GuNu2B3+HgWDa1zwHcwpvfUU7Jr7a7lYapwyXyxKF0eewT3pL C48g== 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=vw0YZIzYilg4if3Ue4FJsV410z1mun8IqIxc6oGE2sI=; b=eaHLY+sBxrr9JPKjavfgc+DXl9E8LuJx4rP5FHMAZTh1Gvh3fvqK5JqgvIrUp77fdV 2dHNtfXymhFbPFpD/dGRAu47HSxpFby7KPvTbth7BycfF/aprpy6S0Rnwv2qYV2GaBWv phC1fsv7ejhBBLMhNjca4y3hw0bhg1FfMFJe4Ubemp4aJNrc/dizz9lmSqnNAqR0+KLt n7oH0du6bg3IroRaikZvda+KV5q2yW6eYYTRkbBh8BcvuemimKr9eaFrA2BQMRR3tbr5 is5GPpAJdirANjW4YG8xghVoJ0spTtpqau4KPqVfW5f2bsdKI1EGod7/vaWATE9O1++z BUfg== X-Gm-Message-State: APjAAAVQ0xO1uJOyzW/S6SK7ge60CNwb/UiFKqLILAVUjLI/u1f4BAKz aEo/CSgXDZpm2CHwBVJ3cvNW5hK39uh87Q== X-Google-Smtp-Source: APXvYqxUFFMmX7Sk67neg7EQaixXOc9A/7Ol/EjOgbpqQiC3UynFaBufPQN+Ojysm8p3m41C5MXX7Q== X-Received: by 2002:a81:1d09:: with SMTP id d9mr31029497ywd.146.1579289469007; Fri, 17 Jan 2020 11:31:09 -0800 (PST) Received: from localhost ([2620:0:1013:11:1e1:4760:6ce4:fc64]) by smtp.gmail.com with ESMTPSA id s3sm11710343ywf.22.2020.01.17.11.31.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jan 2020 11:31:08 -0800 (PST) From: Sean Paul To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Date: Fri, 17 Jan 2020 14:30:54 -0500 Message-Id: <20200117193103.156821-4-sean@poorly.run> X-Mailer: git-send-email 2.25.0.341.g760bfbb309-goog In-Reply-To: <20200117193103.156821-1-sean@poorly.run> References: <20200117193103.156821-1-sean@poorly.run> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v3 03/12] 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 Changes in v2: - Added to the set in lieu of just clearing the bit Changes in v3: - None --- 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 32ea3c7e8b62..87b8b347f682 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -1998,6 +1998,8 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state val = I915_READ(TRANS_DDI_FUNC_CTL(cpu_transcoder)); val &= ~TRANS_DDI_FUNC_ENABLE; + WARN_ON(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;