From patchwork Tue Jun 23 15:58:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11620973 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 D8021618 for ; Tue, 23 Jun 2020 15:59:32 +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 B69C22073E for ; Tue, 23 Jun 2020 15:59:32 +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="ETUUU1uz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B69C22073E 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 7CFF86E9DA; Tue, 23 Jun 2020 15:59:26 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA62E6E9D5 for ; Tue, 23 Jun 2020 15:59:21 +0000 (UTC) Received: by mail-qt1-x842.google.com with SMTP id v19so13308985qtq.10 for ; Tue, 23 Jun 2020 08:59:21 -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=G0+zjquU6PUDClPRv003ZWBRqMKL1m7t4tFso7Nvivk=; b=ETUUU1uzCJZJLsW40GIDzcy+m74ikE/+5EmQBGBavMq/T2Qsjgb31i5N8qtUiXaONd FCeTTcfzANxIJQ5PTRKY0hBe6yQ0bdbGQN/E96p/lX+8fAST6OIL3CF1k6EuyMES0zLQ U7bnKUM+emvzjvtc1aynmiH+A1V/a6uZzeG48FDlMab+lIvIjIvix3hYt9cZ6ROxjr5O KvcIst0oft+ko+G1RpqxQ1/YE30XhxfQ5rwsREjfW6hUfJS34ITb2o1FHj+QOXxlAxl3 8nJxeRJPoqgtlhBVW3x74XMNIjNcbJeLpl3QY5o7ONdrXvpAHkZVrOzFb3iDKeNZeBfa j8cA== 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=G0+zjquU6PUDClPRv003ZWBRqMKL1m7t4tFso7Nvivk=; b=VWVSy+2agZUFDX78hLDOdRbSPGmBq/NldsNmtOc5bjILJoaVPDUkeOUEekXePm7ZxY Ucz54nJWFYViIAyDHPRrfgumRur7OPtmHKRipyfDUxZpiRrByfxzXV/M8lheACCnfQdK dkQFRGNP1n62bQTKxCgrcoVN8UZGBLCwTO3QMmCJ6vZJ/Gqdety7L/XPiphtWWyb+iiU gBKr7TYSd4OFQvFw0G5CXuPYchJlclRGbPaN4Nm+c+C2UeWD91nvupAjQ9EK9QmHpKWN gkQv9odZZHe5DoF9qNyrpWLZtWPvKtHo83nAYazc7TGEFw2DjyetSvSVXnp0KeRll5d0 03+w== X-Gm-Message-State: AOAM532waNDG+ty7pdA6vdHMtNxS+D3wvLwo0l9n9U//62Fdb3gUfg/T yBb+FUoEVIkqJh8K7+a6aml/H2ZfKho= X-Google-Smtp-Source: ABdhPJzbHe8koAUZFMdz+yjOmTqcVx6vNBgyQrc3FciQ9EjqfIOePlefrwnjOWozlXCRnCDR80QKbQ== X-Received: by 2002:ac8:24b3:: with SMTP id s48mr22488385qts.383.1592927960227; Tue, 23 Jun 2020 08:59:20 -0700 (PDT) Received: from localhost ([166.137.96.174]) by smtp.gmail.com with ESMTPSA id x30sm925715qte.70.2020.06.23.08.59.19 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Jun 2020 08:59:19 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH v7 03/17] drm/i915: WARN if HDCP signalling is enabled upon disable Date: Tue, 23 Jun 2020 11:58:53 -0400 Message-Id: <20200623155907.22961-4-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200623155907.22961-1-sean@poorly.run> References: <20200623155907.22961-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, Sean Paul , juston.li@intel.com, rodrigo.vivi@intel.com 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 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' --- 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 73d6cc29291a..8a03c58cbd31 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -1708,6 +1708,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))