From patchwork Fri Dec 13 17:26:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11291867 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 0CDC914DB for ; Fri, 13 Dec 2019 22:31:02 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 E57B420706 for ; Fri, 13 Dec 2019 22:31:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="eKEBQOdn"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="OfSrV5Vi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E57B420706 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=jTCiKKDxtXTa0xnF0VRqflpFmZ2astXaPayXFA/VtvQ=; b=eKEBQOdnAqSQNe c8tnlQe1GKNKWyejWoCfEzBoXNsjqzpoY0HiUJDjq+RC8kT2ZkrLDNng3riIaGlwIdWfosyrmHuBS SlpZeB07F2UKuEH0NXla2wMoBae3EaD8/3ZoczlGslI9aN0CSVjl9lJjxO+McyCmg8Fkp0ihRHD6L dfDHMJ+CD6pR8t0xKlqylrwzty4XA5G0zWkwrazHnwstgJm0ZBvEoUO1s/4ZSVvniu4+zuFepQWOn yCM3WpaujhHWtjHQRvG97YO0eHXdB2Ox/sa6FkMMOMYhENardpD+W6p52d1akT6bZHhLIPUXQMxwK 0BSa1HExhmZxvEjXkElg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ifohu-0005Yu-5L; Fri, 13 Dec 2019 17:26:26 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ifohq-0005XF-W7 for linux-arm-kernel@lists.infradead.org; Fri, 13 Dec 2019 17:26:24 +0000 Received: by mail-wr1-x441.google.com with SMTP id q10so232386wrm.11 for ; Fri, 13 Dec 2019 09:26:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZKp83AbaxIS+4w7GqVdl0VoZ9O2XyHrFAUMYGF70UwE=; b=OfSrV5Vil2g/TEwGoE+9+3zrqIds/h9UcxYpcO1Rn6hlmJQNDcktKtFsUPESJyEuWw +44liXSdOqrdzz8uO3ia8fbjHat8SVJOYBEhnMsHPYuljCSpeHGKY96EolZPtUKyC2xk Q84vr2pn+WG67t6AEv1w/BZ7r2BjZKVc3qLDo= 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=ZKp83AbaxIS+4w7GqVdl0VoZ9O2XyHrFAUMYGF70UwE=; b=Yjsh1zdrjI8Ky0r+OoCib54Yhql3Y/3auIfuD+2Wz0orYoDLFkZxcMcDfbHYrD4ShD tnhyPxjnQVoGhRC17N67pFmtxZ+qBtx5WanpkGYa+387GB/7co/JCQyHMkGpc5+xZS1l h3nNSNaIbLUK1XaXoTCXRTliTD8yRTdjVapD4odDmjETXI1gOj4ibGYo8eVy6b6b1e3a HeMaTdEZuY7gNcZxNJcEa0cBRJbmSWjqY0lwr3d4lkKuwv3mRO0XeYKyZtf2EZvVpp9V 2i03JqedOHY1gFPKjKSpJNRUbp2P7ll+Vrh3g2x6WhAbk0NPKCQVuSqzVUyeQz31l1e0 64BQ== X-Gm-Message-State: APjAAAWz8jAdwY/hUC6MoI0GLSyqpTs0J0JEBqHsxmLIi4WSRq/EdIo9 eZRJntmZowqc02hyHkpfEe2uqA== X-Google-Smtp-Source: APXvYqxvAUdSOy0yUEjbwxNRm3JdVfrjHXjQ+h8EaoHNogxjjVS/vLJfUI+ItOofVgpZ02EmtD3iaw== X-Received: by 2002:adf:ef8b:: with SMTP id d11mr13513872wro.45.1576257980601; Fri, 13 Dec 2019 09:26:20 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:564b:0:7567:bb67:3d7f:f863]) by smtp.gmail.com with ESMTPSA id q15sm10689669wrr.11.2019.12.13.09.26.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2019 09:26:19 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 03/10] drm/atmel: plane_state->fb iff plane_state->crtc Date: Fri, 13 Dec 2019 18:26:05 +0100 Message-Id: <20191213172612.1514842-3-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191213172612.1514842-1-daniel.vetter@ffwll.ch> References: <20191213172612.1514842-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191213_092623_100038_AD966CF6 X-CRM114-Status: GOOD ( 11.70 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:441 listed in] [list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , Boris Brezillon , Daniel Vetter , Ludovic Desroches , Daniel Vetter , Sam Ravnborg , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Checking both is one too much, so wrap a WARN_ON around it to stope the copypasta. Signed-off-by: Daniel Vetter Cc: Sam Ravnborg Cc: Boris Brezillon Cc: Nicolas Ferre Cc: Alexandre Belloni Cc: Ludovic Desroches Cc: linux-arm-kernel@lists.infradead.org --- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c index 034f202dfe8f..40800ec5700a 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c @@ -604,7 +604,7 @@ static int atmel_hlcdc_plane_atomic_check(struct drm_plane *p, int ret; int i; - if (!state->base.crtc || !fb) + if (!state->base.crtc || WARN_ON(!fb)) return 0; crtc_state = drm_atomic_get_existing_crtc_state(s->state, s->crtc); From patchwork Fri Dec 13 17:26:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11291627 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 F1650109A for ; Fri, 13 Dec 2019 22:22:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 D6C6720706 for ; Fri, 13 Dec 2019 22:22:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mtbuacyU"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="kzPdtp7J" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D6C6720706 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=3ACZfQNrgo9jKnOu+cEGueJSMNWsEUN1QWKt36DjaW0=; b=mtbuacyUIX96gD awtrt160kZN204XHCUc9dKYi13gSOMqH9gxQcgwUZ6/vfS2Jlea84x5EShWjUkrxt8Ty2VSBFENuc 7nrjAYmb/pNzm29csgUa4YsFJybpiL+43+j29N80EfJpI0xxYli2sHCLzYAUPtrxjLVNTI32hlt2d f62oYA+653OEqnEP96+CBmPgmLoht0CdiqTBDOuNBN7RlKFc/gXSzO89ZzAl1BIH9AAztxs60tY5/ C4HWj44UxvQyovb7lnnhMGTn5eD1to6rEinCerCj0YDBIt++PQL9OOEdsdXPwhm1PdaANAwijW4kI 2GCvL0DUJIxImCRHIadg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ifoi4-0005iT-HV; Fri, 13 Dec 2019 17:26:36 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ifohr-0005XN-5T for linux-arm-kernel@lists.infradead.org; Fri, 13 Dec 2019 17:26:24 +0000 Received: by mail-wr1-x442.google.com with SMTP id z3so281464wru.3 for ; Fri, 13 Dec 2019 09:26:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=k37i2rf0mrZ5PJBC1jYZXYaxxFfiB3iLMNAh4njzQbQ=; b=kzPdtp7JSMUx3Zngnb/0mSHBSVnlQiPG7HKMb8VAcPBhARKG5gd2fjFKOTGMsyZNpb OzkkaNb70V8zrtQMaRhpigBgwFToYKS/KlcAW6Qx1aqR0m/Po4RflLJHKfQB6BfoBTNX m1s3pGfg3l94wvz64lDNsXj2mIjGn82Hd34RY= 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=k37i2rf0mrZ5PJBC1jYZXYaxxFfiB3iLMNAh4njzQbQ=; b=Ru37t0S6FWeIaZzZjzxR1WRbevX5Uz5ITLz5M4aXUS45PzGoCt5y3q2oQvfVkd0Hll I4w25E38GojtqzVZwuVLKPbmdGxAIZZ44WYq7AgPb7I0rjSzE7eD/D3dFHcTcZNLTaio 2LrfM4HuL894M+P0a5BXD6MwYnQL5XgG4OjJl4wKQJv/u1F525J+cWKdep564pNnCMpf +zGOD31eCka0JuwGrkTA54X0kGltOzmt6CkYgiScmD4yvUwvfsZ1f2S6Piq4ydQA471U P825fceejRX7wFmu1YiLD4FCBKeEcdsBflCKgPLrAAS8X3LZm/l0RYU6oK2xveT84BhK jRTg== X-Gm-Message-State: APjAAAUNdFTC3VAw2SlKNITDyMY8hA76TmS9Goakaa2aAEtp+5XHoQ9O 7odAKWKiLV0h+uI9jn3NasZGS+7UhdU= X-Google-Smtp-Source: APXvYqzF2mlRiwvCpAy00FAu9v/gdbejfjXHVa3jmhV2/faBiJCG4X7d07oMgDmgeJTfaiBQafdsIg== X-Received: by 2002:adf:d4ca:: with SMTP id w10mr13329482wrk.53.1576257981725; Fri, 13 Dec 2019 09:26:21 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:564b:0:7567:bb67:3d7f:f863]) by smtp.gmail.com with ESMTPSA id q15sm10689669wrr.11.2019.12.13.09.26.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2019 09:26:21 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 04/10] drm/malidp: plane_state->fb iff plane_state->crtc Date: Fri, 13 Dec 2019 18:26:06 +0100 Message-Id: <20191213172612.1514842-4-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191213172612.1514842-1-daniel.vetter@ffwll.ch> References: <20191213172612.1514842-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191213_092623_201050_9C311F8C X-CRM114-Status: GOOD ( 11.95 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:442 listed in] [list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam , Philipp Zabel , Daniel Vetter , Sascha Hauer , NXP Linux Team , Pengutronix Kernel Team , Daniel Vetter , Shawn Guo , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Checking both is one too much, so wrap a WARN_ON around it to stope the copypasta. Signed-off-by: Daniel Vetter Cc: Philipp Zabel Cc: Shawn Guo Cc: Sascha Hauer Cc: Pengutronix Kernel Team Cc: Fabio Estevam Cc: NXP Linux Team Cc: linux-arm-kernel@lists.infradead.org --- drivers/gpu/drm/imx/ipuv3-plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c index 28826c0aa24a..6776ebb3246d 100644 --- a/drivers/gpu/drm/imx/ipuv3-plane.c +++ b/drivers/gpu/drm/imx/ipuv3-plane.c @@ -359,7 +359,7 @@ static int ipu_plane_atomic_check(struct drm_plane *plane, if (!fb) return 0; - if (!state->crtc) + if (WARN_ON(!state->crtc)) return -EINVAL; crtc_state = From patchwork Fri Dec 13 17:26:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11291795 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 0C14914E3 for ; Fri, 13 Dec 2019 22:28:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 E4C3D2077B for ; Fri, 13 Dec 2019 22:28:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="KI58G6Zy"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="OKaJHrVA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E4C3D2077B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=SoNR44sVYf5IKvGlyo9JEu63NoQXOlunOAOrTTFUusc=; b=KI58G6ZyYYCNuz ZFRA9Eww2RIb5vJkbTRncsxhLrxPE7Er63Tisqv07WjvtByL5OCQwDm7ZTVsuSJ6XcPYsWrvepw9s v4g8vAB58lDs1SHHOVnpPmQf5zWFjHRpVRcIY7pGNMj8hbnpHUKUJaXmDgl1iQKaRkMoZKpgGY9l3 jYgsCWPK+lrMwYTlDpL8Jq5eW56lAr3bASYvovYcumCq8/zOn6p6dcyATIDJNrEoiz120rqZb9meP r28i6Gm2PJ1a/efnH8CdCZQXlkz1djAH7Fb/dMP3EkHOKaOhS2cy+DjblhJ5t+4d0Nw9cNZJKhq0H HhyhH/eiSR0ZbSo4xlWQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ifoiJ-0005wq-Kk; Fri, 13 Dec 2019 17:26:51 +0000 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ifohs-0005Xf-2p for linux-arm-kernel@lists.infradead.org; Fri, 13 Dec 2019 17:26:26 +0000 Received: by mail-wr1-x442.google.com with SMTP id y11so265977wrt.6 for ; Fri, 13 Dec 2019 09:26:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+cbrIbSvVp0LclU+aOKqTmPIt3fby91EuMSME26/d5Y=; b=OKaJHrVAoaZtUEU3D85ZFLCR77H4fX6v6CsgmAjDRP9z9ftuNCnp76zTWWUm7HPKiN FTTSSUgJNQOmvoLndwEMxA/UsGm+L98LxGIzL43X7OUEB28m6PNUKY/007+20qZ70j5p 9F/y1NUVDwbvHhqktxm5Q/NhFLQrhd0/evKGg= 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=+cbrIbSvVp0LclU+aOKqTmPIt3fby91EuMSME26/d5Y=; b=JddXiA6NJ9Rh+gtd3wKD8Tz2aRJ0EKCYn7Er7oHJdxgM8ixYY9dG9lTlR6u2J2koeT xJ1MI9Xfj0JllYAlj3ozAT+DsBEkIEiCng0XR7tXwg67VLOd97qF7nSCHg3GgFf9RXRs RdFMLNGGq2lkMa8BAy1yOWXfAPyfUSar1OFvImZ8HU6dFHFEqXNtzBbsbVX6UuWkKy5x 7crXoD5FJFYuRvqa19MPRJ00kfYL6qbESX3OJIOEZpgsTUo00X9JW5jw4URnE2InhbJf mk/SLVHymcvneA9Dmr/+0rDpCdBWPT5hFf3A/QtnUbFVCm2ATslQ5WJ5ypCfVoxq1kNB 2D8g== X-Gm-Message-State: APjAAAW8+ItzKzS+Qrkxsav94syA4EkidrgOtfGZQsbfLGSoUPwAeDIj BooXqsnpDRkG8ewSqE+oRD9fcg== X-Google-Smtp-Source: APXvYqyJt4nToJrw+6t6T/NTYV4dX0RRCO+tqGBGWSgh7apaWrrcILwebqQdGpcwUnJdOImfOsV15w== X-Received: by 2002:a5d:690e:: with SMTP id t14mr13815008wru.65.1576257982999; Fri, 13 Dec 2019 09:26:22 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:564b:0:7567:bb67:3d7f:f863]) by smtp.gmail.com with ESMTPSA id q15sm10689669wrr.11.2019.12.13.09.26.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2019 09:26:22 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 05/10] drm/mediatek: plane_state->fb iff plane_state->crtc Date: Fri, 13 Dec 2019 18:26:07 +0100 Message-Id: <20191213172612.1514842-5-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191213172612.1514842-1-daniel.vetter@ffwll.ch> References: <20191213172612.1514842-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191213_092624_122475_615F5B89 X-CRM114-Status: GOOD ( 12.24 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:442 listed in] [list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Matthias Brugger , linux-mediatek@lists.infradead.org, Philipp Zabel , CK Hu , Daniel Vetter , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Checking both is one too much, so wrap a WARN_ON around it to stope the copypasta. Signed-off-by: Daniel Vetter Cc: CK Hu Cc: Philipp Zabel Cc: Matthias Brugger Cc: linux-arm-kernel@lists.infradead.org Cc: linux-mediatek@lists.infradead.org Acked-by: CK Hu --- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_plane.c b/drivers/gpu/drm/mediatek/mtk_drm_plane.c index 540ef2faa40a..f0b0325381e0 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_plane.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_plane.c @@ -94,7 +94,7 @@ static int mtk_plane_atomic_check(struct drm_plane *plane, if (!fb) return 0; - if (!state->crtc) + if (WARN_ON(!state->crtc)) return 0; ret = mtk_drm_crtc_plane_check(state->crtc, plane, From patchwork Fri Dec 13 17:26:08 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11291649 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 BAACC109A for ; Fri, 13 Dec 2019 22:23:43 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 A05AD2077B for ; Fri, 13 Dec 2019 22:23:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Y5YmoZIH"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="SgCyprn+" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A05AD2077B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=CQdVa0vfif6G8jFSkS6nBk42TTLLLCH4qcFAujurfPc=; b=Y5YmoZIHqY6M8p UggX+zo33ts00uLvf2Lb3b7dF2jKJ99Qs8sme1BVjzAM2DqRdqtHfm7FcKfjbgsTMV1P/4vx4iM3i sH0tgyW2/tQADJfPC7uRMOi3OxLtsx9p4gUmXi5i279H/FEyMgDQUjwtUcql9qTec6bPYN1AjIIrE S/v8/2QTkfn4bfUBiTHeYAvv6Yz2cpQjsGDUeVR9mCg5npGiDc/XeeqkSzMWScsyprOlc9qGUwOiO ui0NHjSDh7c8S+E9Svz+yanQ7w5dh6ft8f6UqdXi2Nbe8ympuMp7nwfY2YhJ6pXrqN4Bnxf5CUIqK Xex/UMpO9xl+AozV4a7A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ifoiZ-0006D3-G0; Fri, 13 Dec 2019 17:27:07 +0000 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ifoht-0005YH-9k for linux-arm-kernel@lists.infradead.org; Fri, 13 Dec 2019 17:26:26 +0000 Received: by mail-wr1-x441.google.com with SMTP id d16so236317wre.10 for ; Fri, 13 Dec 2019 09:26:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gBZaJnQ4T1pfuiYbNCV33pBAl/MiKps57aCdhCCq5GA=; b=SgCyprn+TJhfzJrAyOElFygAGYPjDOq49M6+F+et6rfEOdkuMx54OxKa1htCbgaOvN XHYlumbXc2snqLMJhb/p1vhbxd2+u7uERrXewvnV9bJZZAN1XYVqQ3i95Lj/8ZnI1QbX wBlGUBqXY5npseRH3RKCUbJy/msPwKjx28JhE= 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=gBZaJnQ4T1pfuiYbNCV33pBAl/MiKps57aCdhCCq5GA=; b=EXPkT9lASky7Y1Jhq4j6ZRhimq+THvbRJnV/Q32XpkerZfi66vMCm/2vgbg8ynho83 GcFHjJ4bnKDvgo5IPddDFX2tkFGQq/DJjOdlESGDFiUJ2lRcifHgqh/IGDWkLuHdg//k fP2SkTAaz5kZNGItc2q21o6XxbQcLGLgsNfFupMQ/3R4XTbmkHi6t4UaTi0TUAtm3462 wksnYuEoPCz+7OTQAYHLBJxGL9nB0TFCGhI391frVE065AQUv4w1fV942HvzEDy5KjPF ipUZkkvC8fHtByoTC0pFiBInHG1P3jgck2Z+v6AGNfbGHAIU9C0ue+eKTXzt82FINRvU NI+w== X-Gm-Message-State: APjAAAW/oG5ILjSSTsmGKM49psY4br5LxQpvPKioZsp2bqTJfvqsL0lE S+0gsZlUmeYK2F5e5BA/D/NwKA== X-Google-Smtp-Source: APXvYqySnMsLeoZE9VQ1vmqK71rJv5VV+5cxXaKC6Jepc5ChVNTPeNt0FFqW4uks4ZmZYYpHvNA/fQ== X-Received: by 2002:adf:e609:: with SMTP id p9mr13492290wrm.397.1576257984206; Fri, 13 Dec 2019 09:26:24 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:564b:0:7567:bb67:3d7f:f863]) by smtp.gmail.com with ESMTPSA id q15sm10689669wrr.11.2019.12.13.09.26.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2019 09:26:23 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 06/10] drm/xrockchip: plane_state->fb iff plane_state->crtc Date: Fri, 13 Dec 2019 18:26:08 +0100 Message-Id: <20191213172612.1514842-6-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191213172612.1514842-1-daniel.vetter@ffwll.ch> References: <20191213172612.1514842-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191213_092625_335876_1A362D19 X-CRM114-Status: GOOD ( 12.00 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:441 listed in] [list.dnswl.org] 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Heiko_St=C3=BCbner?= , Daniel Vetter , Sandy Huang , linux-rockchip@lists.infradead.org, Daniel Vetter , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Checking both is one too much, so wrap a WARN_ON around it to stope the copypasta. Signed-off-by: Daniel Vetter Cc: Sandy Huang Cc: "Heiko Stübner" Cc: linux-arm-kernel@lists.infradead.org Cc: linux-rockchip@lists.infradead.org Reviewed-by: Heiko Stuebner --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index d04b3492bdac..cecb2cc781f5 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -724,7 +724,7 @@ static int vop_plane_atomic_check(struct drm_plane *plane, int max_scale = win->phy->scl ? FRAC_16_16(8, 1) : DRM_PLANE_HELPER_NO_SCALING; - if (!crtc || !fb) + if (!crtc || WARN_ON(!fb)) return 0; crtc_state = drm_atomic_get_existing_crtc_state(state->state, crtc);