From patchwork Fri Dec 13 17:26:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11291243 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 69CF62D34 for ; Fri, 13 Dec 2019 21:04:59 +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 28DCF246D8 for ; Fri, 13 Dec 2019 21:04:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="cTqGuMWf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 28DCF246D8 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 C38256E823; Fri, 13 Dec 2019 17:26:20 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id CA3CD6E823 for ; Fri, 13 Dec 2019 17:26:19 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id d16so235969wre.10 for ; Fri, 13 Dec 2019 09:26:19 -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:mime-version :content-transfer-encoding; bh=nGbXcqHerJGBeBzW1jOtcyX0eHMlFdu8ptwtjM6IAGs=; b=cTqGuMWf3lcXJE3yyfN1xzAVUxEAqMUALHS8265gtqOrAHneylVktnsDn3fCGXvvH8 quPYHWh7eChpHSg5CePqbwnCjBaPfj35YvykuolmaxK/EL7URUmPHMv3b9sSjm9UShC3 gs5RXerv0sB6byEH0E3f/Uim6dUPPzdW7S32c= 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:mime-version :content-transfer-encoding; bh=nGbXcqHerJGBeBzW1jOtcyX0eHMlFdu8ptwtjM6IAGs=; b=itHJqtL1vXcbVqGYUVDLMVKQXvWSsPSwsRhicWa9BM7SzYiIV93IYxXuNJGAtlWPlN thU8DJdxrj5F1ZxIZk9tE1yOZn4VQbsWnNMeXhXMEWWMEljNEl4+LQNYaUDZeYm0jrbd /vY3IAfzAOhV3rcCuquP9RMuLvTofOZ0p+gttQKGVrujjSDtOG8emRBg+F4TuC/J+nJR MHArP5LwTERwvAgrKDDqTRSaFJmZkCsXZzSPl2B4vvUsv+f1kMzk4jCGlg8qBPPvFD4N BeblA+M9Jjq6teZjah6sBodjMsneovlXxGcn1zWTF6Yo0xkelmLRx1xO1rOweap2Z+q8 RDsA== X-Gm-Message-State: APjAAAVJskls4gfyjZf+i5aEJ2yWrXI6ZTVBL3sxciksG7zyWf09ZOo0 N6PI/BPV6XzO67lKcS+OSwW2HJz7Sys= X-Google-Smtp-Source: APXvYqx9y5Ex+KchS9HHfZNCLtRuFR8Lg7zSLNI3N6LTLXS7SFOtp5AZKNdobiJ13vR4HHMQZ1vA4A== X-Received: by 2002:adf:ef4e:: with SMTP id c14mr14293375wrp.142.1576257978051; Fri, 13 Dec 2019 09:26:18 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2019 09:26:17 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 01/10] drm/todo: Add item for the plane->atomic_check confusion Date: Fri, 13 Dec 2019 18:26:03 +0100 Message-Id: <20191213172612.1514842-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.24.0 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 , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" It's frankly a mess, and the confusion around plane_state->crtc/fb that I fixed up in this series is the least of the problems. Add a todo as a future note of how this could be done a lot better, and with a lot less driver confusion. Signed-off-by: Daniel Vetter --- Documentation/gpu/todo.rst | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Documentation/gpu/todo.rst b/Documentation/gpu/todo.rst index 2d85f37284a1..63b657ecc9ce 100644 --- a/Documentation/gpu/todo.rst +++ b/Documentation/gpu/todo.rst @@ -72,6 +72,28 @@ Contact: Ville Syrjälä, Daniel Vetter, driver maintainers Level: Advanced +Improve plane atomic_check helpers +---------------------------------- + +Aside from the clipped coordinates right above there's a few suboptimal things +with the current helpers: + +- drm_plane_helper_funcs->atomic_check gets called for enabled or disabled + planes. At best this seems to confuse drivers, worst it means they blow up + when the plane is disabled without the CRTC. The only special handling is + resetting values in the plane state structures, which instead should be moved + into the drm_plane_funcs->atomic_duplicate_state functions. + +- Once that's done, helpers could stop calling ->atomic_check for disabled + planes. + +- Then we could go through all the drivers and remove the more-or-less confused + checks for plane_state->fb and plane_state->crtc. + +Contact: Daniel Vetter + +Level: Advanced + Convert early atomic drivers to async commit helpers ---------------------------------------------------- From patchwork Fri Dec 13 17:26:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11291229 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 CA6AF14E3 for ; Fri, 13 Dec 2019 21:04:58 +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 97D0F246C0 for ; Fri, 13 Dec 2019 21:04:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="Om1tn+8L" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 97D0F246C0 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 016356EB62; Fri, 13 Dec 2019 17:26:23 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1A7976EB62 for ; Fri, 13 Dec 2019 17:26:21 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id w8so423024wmd.3 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=kPYaV0ooGhLXYbcX5Z9t9TmPcXtkLBtZ/r66PMo7XPA=; b=Om1tn+8L0RfQlHrat4IbVdRSxZ2dE7SQsUtqx1U+g+eI7sYfS9rv9MSTI7l3abwwev 50FCbIsJsepQB/hGqwHZHCMmox1OaxrU5AKtYkuDDwDVFcw4UusocMYZZZjKl9hs0smd WGI/jdk1QQ8MDeQUWkmNTKj09UZ/J9LgFch0s= 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=kPYaV0ooGhLXYbcX5Z9t9TmPcXtkLBtZ/r66PMo7XPA=; b=ingRzLh+QuL3BPHTko9CYRfsfCuRmhSmHcompZG9N0meO6Cnb2KRUv7cHapn4f7Uv3 yMWvI7yow8ClL9YV50Fi/vvgOtkrhgvcfNtp1wsKguG1Lcffg+l6vPMpKuDDu8Cd1yRU NAmY45fgOWw5y04BQX57x6NmJT3Rnv6ti9vLaTFBSURRucJSUYZIhNyUfxrfNyR2BoLr ceY8GeP1qVE1ulzWGhgy1Qha8kUdfYSee8YyUx8wYBIZFfSPuNI5lRqnxK3e72WfTscj ZbG9pRkmkR69IZnSR1uqnuqCkHCIfLTCKj9T6G6KFaTZsT3rcCbM1ArZFrKm81WGCgij AvTA== X-Gm-Message-State: APjAAAVlqdqu4wl58Fs1BUkooOtcja5PyAkEvhHOIK/hTggxtvDHWQ82 1sAvehPKrVlm26Cmkgur20sby9yntr4= X-Google-Smtp-Source: APXvYqxv60zDfzUkmwc6e9UmmH10SwWQvmsPSI+9izrpz9s7CjsZEMyKM3luhCIW69BOduFA2LhCdQ== X-Received: by 2002:a1c:ed09:: with SMTP id l9mr15746072wmh.101.1576257979443; Fri, 13 Dec 2019 09:26:19 -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.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2019 09:26:18 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 02/10] drm/malidp: plane_state->fb iff plane_state->crtc Date: Fri, 13 Dec 2019 18:26:04 +0100 Message-Id: <20191213172612.1514842-2-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-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 , Liviu Dudau , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Checking both is one too much, so wrap a WARN_ON around it to stope the copypasta. Signed-off-by: Daniel Vetter Cc: Liviu Dudau Cc: Brian Starkey Cc: Acked-by: Liviu Dudau --- drivers/gpu/drm/arm/malidp_planes.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/arm/malidp_planes.c b/drivers/gpu/drm/arm/malidp_planes.c index 3c70a53813bf..37715cc6064e 100644 --- a/drivers/gpu/drm/arm/malidp_planes.c +++ b/drivers/gpu/drm/arm/malidp_planes.c @@ -512,7 +512,7 @@ static int malidp_de_plane_check(struct drm_plane *plane, int i, ret; unsigned int block_w, block_h; - if (!state->crtc || !state->fb) + if (!state->crtc || WARN_ON(!state->fb)) return 0; fb = state->fb; 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: 11291221 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 66BDE19B6 for ; Fri, 13 Dec 2019 21:04:58 +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 31EC2246AF for ; Fri, 13 Dec 2019 21:04:58 +0000 (UTC) Authentication-Results: mail.kernel.org; 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 31EC2246AF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 6CC076EB66; Fri, 13 Dec 2019 17:26:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 44DA26EB62 for ; Fri, 13 Dec 2019 17:26:22 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id t2so304281wrr.1 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=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=TIGP+PH9Zo48GWedGuG0gzh7CO8Js2yPfrZ7FNhMV4UlmzhcXdU9eXcfAm5XMyBm7T 6L4jcQdlAcmxa9ZOEhc4nYg5lxvMm8saawkCQWZ20ZO37Mnux87M9GFUe7kjwqyKm2fv NpnzXovC4gYH8Bh3y6SxMDOlWwbMb64k8biZ03+w9acUJkGl7iDR6zM4C0dr22hazDzo vF+lXT1ffVLgdenNFsaj7pCp44U0uijcVdLrVkYwP/AIvcdkt0B4nQDIH7Q54SuQHwy/ WuiZsz2acBqans7PcFO4QHGuTxlrOjvDoe1sM1Iq5Tr3ZMYnYrvspriIig//E0qJw0k4 lZxQ== X-Gm-Message-State: APjAAAUXgaAtHNYk0vEc2Hc5RVp5ePUvwIaBaInuV86ampHLqLy+9L2F BFTj/zdeve93y+EdKStz5d+PB53BlEQ= 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-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: Alexandre Belloni , Boris Brezillon , Daniel Vetter , Nicolas Ferre , Ludovic Desroches , Daniel Vetter , Sam Ravnborg , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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: 11291261 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 CC88D1951 for ; Fri, 13 Dec 2019 21:04:59 +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 9DF51246AF for ; Fri, 13 Dec 2019 21:04:57 +0000 (UTC) Authentication-Results: mail.kernel.org; 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 9DF51246AF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 76F3E6EB67; Fri, 13 Dec 2019 17:26:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id 59B7D6EB64 for ; Fri, 13 Dec 2019 17:26:23 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id w15so281394wru.4 for ; Fri, 13 Dec 2019 09:26:23 -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=iiykeVdmC7cm607MwcrCg9I6+QMH3L2zgH6mSgCDEhQwUuRIwWv/OGLTfhVERt0DND kGKjVfMouVYBfwqYgHmkPcj/lasiqsEX8ZwRhjPDQKm0KspkIOEj7ZBdjIMekibh1nTh H2HGjJ/3XIMu+BuOtf8ruTGhOgJl9AFqsIJgl/HuaasWn1IL0IVHx/DoixQDQBMEhw5Q Rg2cau2OaOB701kzsXFPbRFqh6U36BN+c+GSzvGmgnLPIHz62A2gAZHa2luU6ufP08rW fc3ODPrkc3mbc215ySBtXABqGctfFSYnB2hhtALaRs0Ui0PhiaruGbkGDz1PV2hSQ2Sl YLJg== X-Gm-Message-State: APjAAAW4SbUezyCzpzjbGSkLx7KBewIT6vxu2Si1cYyDur+Jnma8yUm6 Nt6a3Hf1ImljCRlWtu7ZUI+HdWwGvKo= 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-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 , Sascha Hauer , NXP Linux Team , Pengutronix Kernel Team , Daniel Vetter , Shawn Guo , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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: 11291211 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 373211920 for ; Fri, 13 Dec 2019 21:04:58 +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 08DD324692 for ; Fri, 13 Dec 2019 21:04:58 +0000 (UTC) Authentication-Results: mail.kernel.org; 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 08DD324692 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 121346EB64; Fri, 13 Dec 2019 17:26:26 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by gabe.freedesktop.org (Postfix) with ESMTPS id AE1526EB64 for ; Fri, 13 Dec 2019 17:26:24 +0000 (UTC) Received: by mail-wr1-x441.google.com with SMTP id q6so242012wro.9 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=Ir6tb1hg2dpcZj2TVItJRmNut8W+OUzEaB+TH7pdFNV1DEO8i/+pRj8EdAAi8p9Gyl GGiPTYople2XySLvJrMlMYD0uXJRVn50asg2b2O0YDAnkOnqzas4FCPWNbWeNyLooc+0 cVshNsxKzCYPME58BQJ7RAFqQb097wcKvocTBPTJNh1QUcSdF7/QWeEGmT+xPBdN88/d iUtervwZmHBtkZSkRnNB+ABgL1IQris44GtmcduV67IHTlmb7JbghzsK0RiHLbC0zvQF YMLui2vG9OmGKvhWWfee42LkrVP9xCUc6hlF17z/dvN1qz9VuHoC2yMvjeR1xcnclv5w qFDw== X-Gm-Message-State: APjAAAXcbxyIW8+WHXyh/YIiKwEcTZA9spX71RlmcBZNYAMn6cH5I2Yk QBwvqre07JOT1FyvImogNi2FxgZSXaQ= 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-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 , Matthias Brugger , linux-mediatek@lists.infradead.org, Daniel Vetter , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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: 11291205 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 DE982188B for ; Fri, 13 Dec 2019 21:04:57 +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 AB20A24681 for ; Fri, 13 Dec 2019 21:04:57 +0000 (UTC) Authentication-Results: mail.kernel.org; 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 AB20A24681 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 838E06EB69; Fri, 13 Dec 2019 17:26:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id C25946EB64 for ; Fri, 13 Dec 2019 17:26:25 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id d16so236329wre.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=TI0/wkVTAsMvLkR2XK2fXaHItJ7tncMcS2rK+cIMUMjAkGtSE+zkOjrz33HO1hnt9Y PQBR4KQRGxAn6ESgpqdhI0Fv+bknoxrqq9rcF+6r0la7sJERPZxsdXzc7cpHrka6MQlP P/bVMJnnxLvD/zqAMGDeFl0Q3JpAHpHT5KwO+4JzpoYBVeRBPEpXltp9lWeSvxMrCw/H UJzh5geO+5yPi+1QQCmD8uH6ZwxjTiUc/sezgAm8DMhPV1u8bgsKeVeaDFyEDgv9WbPM AwgGJIV6YGQpj4mgI2+6vbWK5L7H6iNcqnQ7Lbx0LH89ZygNcFdUETL/EzxiWQhdNxVU O7iw== X-Gm-Message-State: APjAAAXG+5LBi2pMQbmwz+XW22co+iIfKXzPnKgfTrnn529H05CzNeap wriU67BPNEqe5LMnePN0ZQDiAfFhFZg= 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-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 , Sandy Huang , linux-rockchip@lists.infradead.org, Daniel Vetter , linux-arm-kernel@lists.infradead.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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); From patchwork Fri Dec 13 17:26:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11291207 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 1BE3318C6 for ; Fri, 13 Dec 2019 21:04:58 +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 DC6982469F for ; Fri, 13 Dec 2019 21:04:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="Lffmppnc" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC6982469F Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 EB0DF6EB6D; Fri, 13 Dec 2019 17:26:29 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by gabe.freedesktop.org (Postfix) with ESMTPS id D287F6EB67 for ; Fri, 13 Dec 2019 17:26:26 +0000 (UTC) Received: by mail-wr1-x444.google.com with SMTP id y17so272566wrh.5 for ; Fri, 13 Dec 2019 09:26:26 -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=4KSJrNnZyJA5dnfCvf672onDAdJxTNtoy4RQd/XzpGA=; b=Lffmppnc9XlntIHSORKwXfPjW7HmrHD4I9ENhDIGfIgPZz3Grc1g8GPUda1NbtfiFB AwYPXI53mn82/XbubDsjf+hhk1kDSjttjjXgdd0LaXtvxh6wu680O+ml97XQI/2a84h1 5oUJ/fatp2gZnk6Jkq0likj7vqszTF/q5PkMA= 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=4KSJrNnZyJA5dnfCvf672onDAdJxTNtoy4RQd/XzpGA=; b=KTa2Z+bP9dSGYffYcn30y2o7yZlBDCV/ieRqif4+tHVWdWaOihzNYUNjog/E97yBI2 ZiipH9w3U+mgosYNx3bxIf4w2OD7L7B+YBZLJ1+ZFuWaZkdWDc4btKBuOG1T+zADzTcJ kZjh5PXFZ0PsnzZfBiSHitu+ekNLxOD3FMmS/9vb0WTtlNxF1T1WJ6b5qJThqC8II3xY 8SNi3fg53LyuDTpqLLVk/tHtZcCNEyUCFKajX5UGSswCzoIkZ8seQ5w0Wba/ErAu2rY1 RMMHp6zhWwTaXfB6Og+WY3GppCDNhlyznDQNbDY5YhzRfg7pQNDYBfvXWLwzRxVC6IxC KEkA== X-Gm-Message-State: APjAAAVFnp3MxKKO+rzlB5KoMwNTLJndkm9+Bse6YEZYmqqB8R6zGAr5 iZfia0xMqWY2KULn1WmI+KtisKx7pw0= X-Google-Smtp-Source: APXvYqyKaVLdfwPR173FfaP1we/4Op+V6Bkpu04dFY+S+6F4NxFZGR/WhAMhjsP3YMRPNGAOvpKOlQ== X-Received: by 2002:adf:eb51:: with SMTP id u17mr14151473wrn.29.1576257985278; Fri, 13 Dec 2019 09:26:25 -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.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2019 09:26:24 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 07/10] drm/vc4: plane_state->fb iff plane_state->crtc Date: Fri, 13 Dec 2019 18:26:09 +0100 Message-Id: <20191213172612.1514842-7-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-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 , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Checking both is one too much, so wrap a WARN_ON around it to stope the copypasta. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/vc4/vc4_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index 4934127f0d76..91e408f7a56e 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c @@ -139,7 +139,7 @@ static enum vc4_scaling_mode vc4_get_scaling_mode(u32 src, u32 dst) static bool plane_enabled(struct drm_plane_state *state) { - return state->fb && state->crtc; + return state->fb && !WARN_ON(!state->crtc); } static struct drm_plane_state *vc4_plane_duplicate_state(struct drm_plane *plane) From patchwork Fri Dec 13 17:26:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11291255 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 6D8E92D35 for ; Fri, 13 Dec 2019 21:04:59 +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 3805A24686 for ; Fri, 13 Dec 2019 21:04:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="IkTuiXLC" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3805A24686 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 CB81C6EB6F; Fri, 13 Dec 2019 17:26:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id E3DD66EB66 for ; Fri, 13 Dec 2019 17:26:27 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id g17so290086wro.2 for ; Fri, 13 Dec 2019 09:26:27 -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=v2QQo2XB7NXwvW9lnZFYF7ZZ3DNShcC4KCT5UdTmJbg=; b=IkTuiXLCwMl5X6aSrAX2aAlYlfwvvlp6WhvuBzrSHu5i5Pkjt2f+lE62nHWnM7GTxA 4RwLuaP8Edc/XfXBIDUQ2J6v6ROM0WE2Aqfb7rqiyKjzlVq/hHBSaqTfgoYbmmE7jnbR M6bz0mx19JEEERFXSknFWQzeV5ly+mh9dbg6g= 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=v2QQo2XB7NXwvW9lnZFYF7ZZ3DNShcC4KCT5UdTmJbg=; b=O3AqqFEYwdDKCSeHlL5/gpMvK+RM/N2NK64s8cibBcrep0d4sMFfFtyYlvYQoGsL3J tOmszzz2gTGWenB78XI8I5YXhKwTElNTNrlFygplwz7FhXyoskQGbSk+J69dS5cUVB1O toRccaEOQt2MfYuSUm7knuVzSSCPPgOP4pAWk3qrgOd4yQG90XrXMyJhiCaI34ZXgCEw NdGexWLLlDnSFNJaG2puvm2jdYSk/DY70a9RJxsdm74mlkz7AwgibXjsj5E5pAgPSr3I ZQWsFGXtwBcg+i+xQPWBGHrk0h71FdjWKuAe3vbrfTB69FRIWwmnVspCRfTzi8YLDmqg cmhg== X-Gm-Message-State: APjAAAXBHuAEO5fTuTavChB5VycnOTHUTNMBqswvhFENs8ip4GU2H7zC U9SdjTayNt+z6euAD1UZlzVOamUMoi8= X-Google-Smtp-Source: APXvYqxbjJsIIrae6ucYxC8SHS+iLhc+EAdv+i5QRVToz5+KDdFk5pSV7I1tisG7+zyWPdF8ERx+SQ== X-Received: by 2002:a5d:4d4a:: with SMTP id a10mr14211332wru.220.1576257986276; Fri, 13 Dec 2019 09:26:26 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2019 09:26:25 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 08/10] drm/virtio: plane_state->fb iff plane_state->crtc Date: Fri, 13 Dec 2019 18:26:10 +0100 Message-Id: <20191213172612.1514842-8-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-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 , virtualization@lists.linux-foundation.org, Gerd Hoffmann , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Checking both is one too much, so wrap a WARN_ON around it to stope the copypasta. Signed-off-by: Daniel Vetter Cc: David Airlie Cc: Gerd Hoffmann Cc: virtualization@lists.linux-foundation.org --- drivers/gpu/drm/virtio/virtgpu_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c index bc4bc4475a8c..947e65b51555 100644 --- a/drivers/gpu/drm/virtio/virtgpu_plane.c +++ b/drivers/gpu/drm/virtio/virtgpu_plane.c @@ -88,7 +88,7 @@ static int virtio_gpu_plane_atomic_check(struct drm_plane *plane, struct drm_crtc_state *crtc_state; int ret; - if (!state->fb || !state->crtc) + if (!state->fb || WARN_ON(!state->crtc)) return 0; crtc_state = drm_atomic_get_crtc_state(state->state, state->crtc); From patchwork Fri Dec 13 17:26:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11291245 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 503452D33 for ; Fri, 13 Dec 2019 21:04:59 +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 188F9246D4 for ; Fri, 13 Dec 2019 21:04:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="Tu7zU7lw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 188F9246D4 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 A994F6EB6B; Fri, 13 Dec 2019 17:26:31 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4DB206EB6B for ; Fri, 13 Dec 2019 17:26:29 +0000 (UTC) Received: by mail-wr1-x443.google.com with SMTP id q6so242318wro.9 for ; Fri, 13 Dec 2019 09:26:29 -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=viKraVC/bKAlbkdKhupkC+IBXqisO/o7XMPk0rhWWxg=; b=Tu7zU7lw/Vey0KJWrWKmUAFmKGC6stwk9BGu+WtQpewM0dRJkhbeThnQRNgsiaChkw pSvt5frmolgc4ZfquqpOt1MH/KOAXLKzp5TJW8aQzRi95IiCEJT6Q9YTIaDwN8rcwJTv NS8ESyNH3YHaShXtVpvH1EeULGrwLzQGGIZds= 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=viKraVC/bKAlbkdKhupkC+IBXqisO/o7XMPk0rhWWxg=; b=G44a+U6YRHQXpeIYrauSeCKuXARmjlqH8tGaI9IK5Ec+2NvRt47fBNN7nEX7mbgX/A FeRghgmOmejtIEupmtBQaYVTbIEaDe2y3mKLHIFBQTvqBJ73caAOWByqY8cbZq5nSvrN y/iXnpKCFjekVmo8zuKNuaYXw7qrDaC8bTTbz7s/gqu54LueM5d2ZI0pC0pIrx2z6BX6 nkLCvvnPR+ZhdKAwSVMepENw9/oTtybCJ6Bhy/lrOfPmPdmKk183i/77ttf1Ncuwsl/h LGtef800cfdjFYFxmFJ1pNc2G3ych/sjuqzAB3KrvbEbUoOohBEqetYk4oGWdKH8MlSD vtXw== X-Gm-Message-State: APjAAAWP+HLD8/XkHPY31GtTSaUu2VbUk8r090Yf1TAPveSgFZ9YQAPE BAopGocSMwzqZv5LiywmNZUZbZ33xGk= X-Google-Smtp-Source: APXvYqxQ+9PUz1RLVtYW3x8gEY6ZNC8xm3VQgmhZhPklJpiTVmquy0AuRMifB3HU1bSstQNujn0OsA== X-Received: by 2002:adf:f8c4:: with SMTP id f4mr13713640wrq.243.1576257987713; Fri, 13 Dec 2019 09:26:27 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2019 09:26:26 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 09/10] drm/vkms: plane_state->fb iff plane_state->crtc Date: Fri, 13 Dec 2019 18:26:11 +0100 Message-Id: <20191213172612.1514842-9-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-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 , Haneen Mohammed , Rodrigo Siqueira , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Checking both is one too much, so wrap a WARN_ON around it to stope the copypasta. Signed-off-by: Daniel Vetter Cc: Rodrigo Siqueira Cc: Haneen Mohammed Cc: Daniel Vetter Reviewed-by: Rodrigo Siqueira Tested-by: Rodrigo Siqueira --- drivers/gpu/drm/vkms/vkms_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vkms/vkms_plane.c b/drivers/gpu/drm/vkms/vkms_plane.c index 5fc8f85aaf3d..6d31265a2ab7 100644 --- a/drivers/gpu/drm/vkms/vkms_plane.c +++ b/drivers/gpu/drm/vkms/vkms_plane.c @@ -117,7 +117,7 @@ static int vkms_plane_atomic_check(struct drm_plane *plane, bool can_position = false; int ret; - if (!state->fb | !state->crtc) + if (!state->fb || WARN_ON(!state->crtc)) return 0; crtc_state = drm_atomic_get_crtc_state(state->state, state->crtc); From patchwork Fri Dec 13 17:26:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 11291219 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 757391AA3 for ; Fri, 13 Dec 2019 21:04:58 +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 4136124680 for ; Fri, 13 Dec 2019 21:04:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="YBMnyOLT" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4136124680 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 33AC46EB75; Fri, 13 Dec 2019 17:26:32 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6E0A46EB6B for ; Fri, 13 Dec 2019 17:26:30 +0000 (UTC) Received: by mail-wr1-x442.google.com with SMTP id b6so305581wrq.0 for ; Fri, 13 Dec 2019 09:26:30 -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=+V1N6V09AnDWHP5ygK/oqJXsT6Me79yFsJqWmOiifFk=; b=YBMnyOLTfxX6KPb1tX4qXf+wH7bhin/8WvLWlfju6Y3hKg5leqiUthtoQdbja94HMK 1QsxnFgt23VF3CxXx9fXPN78A3bNWCeiP3DFN+vb6JCSrt+uICgwZpBDkpDxhjccjJuq P83zlUMIyAfig2lyIvc1cVIHpSSjpay14QRzE= 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=+V1N6V09AnDWHP5ygK/oqJXsT6Me79yFsJqWmOiifFk=; b=fmWo9JWkwQ+W6bM4Z+Nx4bYufrxUI1SNtwgVV8qqqIgGN7X758dzYgGiOmqvUrWOSD eG8bk5MAM3DFw/rh9K0Ka+vLI61vJzGM15SGEsFcljBZQ7axO316fAcZkGhPgJhCDCaF 1HEFnntppZsjo7GJHEnGor9f33Q6Iua/RV2MMIYYF2WMHAHloBTWVr0rlZybBQTt98Fy PcbGNCy1zhQ8POENuVxT7EP5TEs8iBPAJIfOCs6OOQHVb0Jn7ljChhe6qaN2hsHtFD/t NihQhcrtXN8OR4OCRKNp2FpiNDJ1ENAGMtwbyvh8AZPvu/X2t1ZvlS30ZO5Vc9CDuGh5 W+BA== X-Gm-Message-State: APjAAAUAUmoKgjQ6RJnFKjAKRpea7LWFNLsBIFGy7CaWYsV4E5Wsgt4T 7IT5Nv71FwLrHA177V9eqYJxlwj8zko= X-Google-Smtp-Source: APXvYqzQW5LghQu4ylCHb2OGId8yVF+jZPfQYcD24aT9rIBNVEVju1GCfSkIw+jQhPBzxZQxeJOHWA== X-Received: by 2002:adf:e683:: with SMTP id r3mr13917025wrm.38.1576257988718; Fri, 13 Dec 2019 09:26:28 -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.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Dec 2019 09:26:28 -0800 (PST) From: Daniel Vetter To: DRI Development Subject: [PATCH 10/10] drm/zte: plane_state->fb iff plane_state->crtc Date: Fri, 13 Dec 2019 18:26:12 +0100 Message-Id: <20191213172612.1514842-10-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-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 , Shawn Guo , Daniel Vetter Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Checking both is one too much, so wrap a WARN_ON around it to stope the copypasta. Signed-off-by: Daniel Vetter Cc: Shawn Guo --- drivers/gpu/drm/zte/zx_plane.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/zte/zx_plane.c b/drivers/gpu/drm/zte/zx_plane.c index 086c50fac689..c8f7b21fa09e 100644 --- a/drivers/gpu/drm/zte/zx_plane.c +++ b/drivers/gpu/drm/zte/zx_plane.c @@ -54,7 +54,7 @@ static int zx_vl_plane_atomic_check(struct drm_plane *plane, int min_scale = FRAC_16_16(1, 8); int max_scale = FRAC_16_16(8, 1); - if (!crtc || !fb) + if (!crtc || WARN_ON(!fb)) return 0; crtc_state = drm_atomic_get_existing_crtc_state(plane_state->state, @@ -281,7 +281,7 @@ static int zx_gl_plane_atomic_check(struct drm_plane *plane, struct drm_crtc *crtc = plane_state->crtc; struct drm_crtc_state *crtc_state; - if (!crtc || !fb) + if (!crtc || WARN_ON(!fb)) return 0; crtc_state = drm_atomic_get_existing_crtc_state(plane_state->state,