From patchwork Tue Aug 18 15:38:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11721711 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 C695D14E3 for ; Tue, 18 Aug 2020 15:39:44 +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 A1F5D20786 for ; Tue, 18 Aug 2020 15:39:44 +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="c4rseK1U" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A1F5D20786 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 7B74A89F3B; Tue, 18 Aug 2020 15:39:42 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) by gabe.freedesktop.org (Postfix) with ESMTPS id A98A089DC9 for ; Tue, 18 Aug 2020 15:39:41 +0000 (UTC) Received: by mail-qk1-x742.google.com with SMTP id b14so18641253qkn.4 for ; Tue, 18 Aug 2020 08:39:41 -0700 (PDT) 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=QrdXawKN1vYgVXuBpsukVb/2j1buI9qyySYCMqiyAQg=; b=c4rseK1Upiatfpy7ZShUkBUsCo5QG6r1mgI1AVPm7yhuDncZGPFVZjyRmKFj1H3j1u QB0w1ILXTgnlzN+C8+ODERn77L3xGlv1F0GSv253f8hHUdQTgOob4q/OYD7b0GNK0lXS +BnDDDrDMgYhbk1qoSp/MPUvrwaD8PGI1DDdT58czCHatGb5/FI1G3J2H0jZaBzqsER2 tWxNIPDp6DNGz7nbYkDABlKwPw3V4spoCFXoqGabev782nXqW8jZTUQxl2HZGYMY+pVU 7fEzz9weRouR0FGugIBHHJ1M+v4m8p9PKALX/dhnwSHIV6AbiiH389kEQ7CibXavcoty Af4A== 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=QrdXawKN1vYgVXuBpsukVb/2j1buI9qyySYCMqiyAQg=; b=cAiuLcAqQ5HCcHo2vcLTV+7kky6dKb0VbVRwSlhZl/aCNlhuihrzGGO4dWkzSqMIXb vsrwMRHxIvBLZHnE0cCZRCKoWtIXn4+jt8T7xBEQfmg/w5JbvMRdQzTXlepCmUDOKPBX GxDtUtvRAwq/3PYoukiOeDbEcyxRIzSBdnzUJ9Nh2QKfhaA8mBi/azl+UsGIqY5PtAQI 9npa5Ii5H1XbNH1V7WXWaBSoa5ur2Ls7a9t5ASnhH3qO7San1ilX04Z7VQ0zrOHzPKD7 WHmhkCtzXwqe35RICOgYMvlkWLyWq7tER2uw8aZ3/QoBHy4Y6IECD5YoBf0S2Xcpiiai XjwQ== X-Gm-Message-State: AOAM530vK6roPgpuoH401A4iB3QX7QCHsa9+V5iPo7DwoUI/gkO5Iqh4 6FHdj0/QGcPUGbjsWIPtn2Bfkxgus6spJw== X-Google-Smtp-Source: ABdhPJwNLUgJz8TLZz3cTdFa3b5ebMsGeQL/E06BIm+YMOJH9a8E/rfrk8PpihSy5zZHYkFlA/eclg== X-Received: by 2002:a37:a28d:: with SMTP id l135mr18035520qke.247.1597765180654; Tue, 18 Aug 2020 08:39:40 -0700 (PDT) Received: from localhost (mobile-166-170-57-144.mycingular.net. [166.170.57.144]) by smtp.gmail.com with ESMTPSA id o21sm20663443qkk.94.2020.08.18.08.39.39 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 18 Aug 2020 08:39:40 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, juston.li@intel.com, jani.nikula@linux.intel.com, joonas.lahtinen@linux.intel.com, rodrigo.vivi@intel.com, anshuman.gupta@intel.com Subject: [PATCH v8 03/17] drm/i915: WARN if HDCP signalling is enabled upon disable Date: Tue, 18 Aug 2020 11:38:51 -0400 Message-Id: <20200818153910.27894-4-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200818153910.27894-1-sean@poorly.run> References: <20200818153910.27894-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: David Airlie , daniel.vetter@ffwll.ch, 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 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 Link: https://patchwork.freedesktop.org/patch/msgid/20200305201236.152307-4-sean@poorly.run #v5 Link: https://patchwork.freedesktop.org/patch/msgid/20200429195502.39919-4-sean@poorly.run #v6 Link: https://patchwork.freedesktop.org/patch/msgid/20200623155907.22961-4-sean@poorly.run #v7 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 Changes in v6: -None Changes in v7: -Rebased, variable name changed from 'ctl' to 'val' Changes in v8: -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 de5b216561d8..b02cd36647d6 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -1791,6 +1791,8 @@ void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state ctl = intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder)); + drm_WARN_ON(crtc->base.dev, ctl & TRANS_DDI_HDCP_SIGNALLING); + ctl &= ~TRANS_DDI_FUNC_ENABLE; if (IS_GEN_RANGE(dev_priv, 8, 10))