From patchwork Tue Dec 3 17:36:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11271767 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 577E9930 for ; Tue, 3 Dec 2019 17:37:20 +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 3CFA920803 for ; Tue, 3 Dec 2019 17:37:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3CFA920803 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 985406EA44; Tue, 3 Dec 2019 17:37:18 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-yb1-xb44.google.com (mail-yb1-xb44.google.com [IPv6:2607:f8b0:4864:20::b44]) by gabe.freedesktop.org (Postfix) with ESMTPS id DCF1F6EA40 for ; Tue, 3 Dec 2019 17:37:16 +0000 (UTC) Received: by mail-yb1-xb44.google.com with SMTP id d95so1848141ybi.8 for ; Tue, 03 Dec 2019 09:37:16 -0800 (PST) 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=UBWGlnwv4Vv3lZO/zfX1A8+cvPWGrGOAfy9S3S5HX8I=; b=N27wD2gu8TUDmg9rj38pFMrQ0iK5YvemuHB3CXz48HX/2+L/nrBBkVmPocgGAPOXe6 gR2fNdndLDxE0OWjBnrup5OO3zvj/YY24oSpEcQu+t4Bs92r2DbjDrKFAkMgjZ2K17vQ ynhkBrWBfcfCV57jqa8IPyh5sdI2su0Q9nVzOHMIE+MXj5fPWt+Cq5MiTOcUJ72cmvQc UB1lvk73rXe4AlmPziMH7hQwXJ/j6yrVqVDGkzvNPjN3JA4uHpQeABM9XFJieIYGnLfL VhCA4Gfpuxzd5adGaW7iW+6K4eEfv64EhsubHsseLbxyfr8caPsOfeRVtXilwyS9bq3Z cBKw== X-Gm-Message-State: APjAAAWGY+PO1HNXg2uI6wrUDQBJsrXOX1cWovT/VXTLrdSgyQpoLhzL 2Q5CMzAs79dRja7Kgn4OoFXrEg== X-Google-Smtp-Source: APXvYqzKkH47uFrEbPlnVN2ni6vYohlGrLaKhFWLORav+baal7eEhNZjav1pddjTgLy/0PuQ4ChJ/g== X-Received: by 2002:a25:dec1:: with SMTP id v184mr5045858ybg.62.1575394636041; Tue, 03 Dec 2019 09:37:16 -0800 (PST) Received: from rosewood.cam.corp.google.com ([2620:0:1013:11:89c6:2139:5435:371d]) by smtp.gmail.com with ESMTPSA id g190sm1729426ywf.41.2019.12.03.09.37.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Dec 2019 09:37:15 -0800 (PST) From: Sean Paul To: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, ramalingm.c@intel.com Date: Tue, 3 Dec 2019 12:36:27 -0500 Message-Id: <20191203173638.94919-5-sean@poorly.run> X-Mailer: git-send-email 2.24.0.393.g34dc348eaf-goog In-Reply-To: <20191203173638.94919-1-sean@poorly.run> References: <20191203173638.94919-1-sean@poorly.run> MIME-Version: 1.0 X-Mailman-Original-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=UBWGlnwv4Vv3lZO/zfX1A8+cvPWGrGOAfy9S3S5HX8I=; b=bnkpDUyLuTywW2KNOURTlo5ZwpG4Anq4dv4h9mS5B5m0+zct+NLsuvMgkqgRA402q1 8/tOOWcYf4bsHybeYkUrm4J6CCHuJtJGrC2OxnmiAzhXTkV6Uvzs0jYM14tCM8yHHBCj ALMMEwftNBjPg1JooyQdqktcx4NZ257pjkbvElXerp2e+tQ/h0BVe2ow7HNZKysJY+/y Xfl+sJjqKUFht0+b5xob20EvMJYlE55EWCfqe5Y0+819vvztIVwic/fHgAGXz3kE40wK bdtJd/QOoBHf20YlT3RF2cX2twAbJqobsc3YWLSUEJHKODZmjtAgoyQRiwT72d5h/YWL XP6A== Subject: [Intel-gfx] [PATCH 04/11] drm/i915: Don't WARN on HDCP toggle if get_hw_state returns false X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , Sean Paul Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" From: Sean Paul Now that we can rely on transcoder disable to toggle signalling off, it's less of a catastrophe if get_hw_state() returns false. Once we enable MST, this will be a valid exit path and we want to make sure we're not spamming the logs needlessly. Signed-off-by: Sean Paul --- drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c index e8ac98a8ee7f..ca28913a4c9f 100644 --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -1983,7 +1983,7 @@ int intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder, if (WARN_ON(!wakeref)) return -ENXIO; - if (WARN_ON(!intel_encoder->get_hw_state(intel_encoder, &pipe))) { + if (!intel_encoder->get_hw_state(intel_encoder, &pipe)) { ret = -EIO; goto out; }