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: 11339655 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 C91F9921 for ; Fri, 17 Jan 2020 19:31:24 +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 A83342072B for ; Fri, 17 Jan 2020 19:31:24 +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 A83342072B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run 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 901BD6F8DB; Fri, 17 Jan 2020 19:31:11 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@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 E8EAE6F8D7 for ; Fri, 17 Jan 2020 19:31:09 +0000 (UTC) Received: by mail-yw1-xc41.google.com with SMTP id v126so14828981ywc.10 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=Pz7/n6ny6rvvSaP5494HE6r1B8Q2VdupfQSFQElWh1VI24tO/WxEm4ZXCRT7ic8U8q rtJXs0ZIZwR4gHB+4Nv0zV6n+R7Yi4qcx5OQdbgiGDdLodUUHpDjm57tpL6fOJ+lOdb5 dEoZYzY1FO93lKF3ImqYQ+SKTJ24v9xTos/AzGSW/RlmbcLj+f1m16k6MraIRzbFTCbd vcCWlk552ZMdtl6xu5ySKJ0hXNDF1Ims9yHhVLqVuanwYwuRA2Z4HUIN7LwnvbaLq2sH +Z7jnNjkemwfsVIcVPw1HTtXMZDVHaTXsEMYO6OaLCvSRUHiJMDLcvUopgdBp098BFrf 2LLA== X-Gm-Message-State: APjAAAVxG0fqZ2TeaMtWSYBdH3SaNekZd+QmFv0+/XeiVOJwIPCHpMDt mjucDlBJf1XF55zhhwzRbS2/oyiTrAmtNg== 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 Subject: [PATCH v3 03/12] drm/i915: WARN if HDCP signalling is enabled upon disable 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 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, rodrigo.vivi@intel.com, Sean Paul Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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;