From patchwork Wed Apr 29 19:54:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11518203 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 EED6D14DD for ; Wed, 29 Apr 2020 19:55:29 +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 CD616206D9 for ; Wed, 29 Apr 2020 19:55:29 +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="SP/x0BkM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD616206D9 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 5D4CD6F39A; Wed, 29 Apr 2020 19:55:22 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by gabe.freedesktop.org (Postfix) with ESMTPS id 12FA46F39E for ; Wed, 29 Apr 2020 19:55:12 +0000 (UTC) Received: by mail-qk1-x741.google.com with SMTP id s63so3368352qke.4 for ; Wed, 29 Apr 2020 12:55:12 -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=4q6U9bQnNCsGSz0OpbbB1aaXw9FBRB2ZVtrZWl9IhSU=; b=SP/x0BkMwZpqM0y/UROarNzLq5L7flAHJIxrIT6BOkp8iKFksJqYo0PN/rw3Aad7tf 02P+QUbHIICSiO/22dSE+I899n3t0wNdf/t///9lu5mbRC1Ddbe4/j2uwP10O6cFTB6E rZnDKMIwzhe0SE1yKM2JkhEl8mKUZdI7ofkADhz1rbGn92ta6P91p5cSXDJ8V1P4xiHa vKyNVn3QI5kbCQd4ZA/rM7ggNbYbufcwohW1dkS0nM0ZCtJSTLrPHYJABt46aDr6bv2g maWyMX6GCqs3thpy+1mqu2jgl3+63VgFoofF4EYNrHMjyCHpga7cM8JQI0XjIHnKUNkv bROA== 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=4q6U9bQnNCsGSz0OpbbB1aaXw9FBRB2ZVtrZWl9IhSU=; b=ra24Nm55EI1lg8jyWTICXbAQPHwDNpGx4j6gz1DOq6jqDq/ovbZw1bP+/3C54T6P7d Xz+djh1O1HWKHJM5tEVhTTylG9+uTYjAc/UKQ2vTWe2xau7OyUoA/ONqOovzewrM5WuJ /DDnmzNcvrTM+ky8YTAar9o8tX460s4C1J7O+/td9XDMaxS83M23y22Xgm0HoU2qjbd3 7JLBMPMqxKW40/yt3yJRFLl6vJJ3h6tRpd2G6KtARxnnhY+Hrn3hmqM47T/1fqE09bkZ c/FpkMUJiJ2EGc3sDxyPQGfj1mZC4ld12dZZr7D1mntLGwWzP+mmdXMT5on6ekV1kaTg D08g== X-Gm-Message-State: AGi0PuaA8gbdioIwuBSdsPG55Qgf5thtecDqxLzQmofVZ2VpeO8JFf2J fcpmrDzcDDomNdnXLVz8TQYNrk+lEHg= X-Google-Smtp-Source: APiQypI76PolNXrJ/BpqdWa0H/H9CIVOQqumkq4vgTCAPgV2vCOuRTvedG6UGr+Xe+wYKz6RwVxaRg== X-Received: by 2002:a37:62d7:: with SMTP id w206mr106790qkb.406.1588190109538; Wed, 29 Apr 2020 12:55:09 -0700 (PDT) Received: from localhost (mobile-166-170-55-34.mycingular.net. [166.170.55.34]) by smtp.gmail.com with ESMTPSA id h6sm158820qtd.79.2020.04.29.12.55.08 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 29 Apr 2020 12:55:09 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Subject: [PATCH v6 03/16] drm/i915: WARN if HDCP signalling is enabled upon disable Date: Wed, 29 Apr 2020 15:54:49 -0400 Message-Id: <20200429195502.39919-4-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200429195502.39919-1-sean@poorly.run> References: <20200429195502.39919-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, seanpaul@chromium.org, 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 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 --- 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 5601673c3f30..08844ba9dcb5 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -1663,6 +1663,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))