From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
Sandy Huang <hjc@rock-chips.com>,
linux-rockchip@lists.infradead.org,
Daniel Vetter <daniel.vetter@intel.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/10] drm/xrockchip: plane_state->fb iff plane_state->crtc
Date: Fri, 13 Dec 2019 18:26:08 +0100 [thread overview]
Message-ID: <20191213172612.1514842-6-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20191213172612.1514842-1-daniel.vetter@ffwll.ch>
Checking both is one too much, so wrap a WARN_ON around it to stope
the copypasta.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
---
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);
--
2.24.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch>
To: DRI Development <dri-devel@lists.freedesktop.org>
Cc: "Heiko Stübner" <heiko@sntech.de>,
"Daniel Vetter" <daniel.vetter@ffwll.ch>,
"Sandy Huang" <hjc@rock-chips.com>,
linux-rockchip@lists.infradead.org,
"Daniel Vetter" <daniel.vetter@intel.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/10] drm/xrockchip: plane_state->fb iff plane_state->crtc
Date: Fri, 13 Dec 2019 18:26:08 +0100 [thread overview]
Message-ID: <20191213172612.1514842-6-daniel.vetter@ffwll.ch> (raw)
In-Reply-To: <20191213172612.1514842-1-daniel.vetter@ffwll.ch>
Checking both is one too much, so wrap a WARN_ON around it to stope
the copypasta.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
---
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);
--
2.24.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-12-13 17:26 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-13 17:26 [PATCH 01/10] drm/todo: Add item for the plane->atomic_check confusion Daniel Vetter
2019-12-13 17:26 ` [PATCH 02/10] drm/malidp: plane_state->fb iff plane_state->crtc Daniel Vetter
2019-12-16 9:19 ` Liviu Dudau
2019-12-13 17:26 ` [PATCH 03/10] drm/atmel: " Daniel Vetter
2019-12-13 17:26 ` Daniel Vetter
2019-12-13 19:53 ` Sam Ravnborg
2019-12-13 19:53 ` Sam Ravnborg
2020-01-28 14:44 ` Daniel Vetter
2020-01-28 14:44 ` Daniel Vetter
2019-12-13 17:26 ` [PATCH 04/10] drm/malidp: " Daniel Vetter
2019-12-13 17:26 ` Daniel Vetter
2019-12-17 13:11 ` Daniel Vetter
2019-12-17 13:11 ` Daniel Vetter
2019-12-13 17:26 ` [PATCH 05/10] drm/mediatek: " Daniel Vetter
2019-12-13 17:26 ` Daniel Vetter
2019-12-13 17:26 ` Daniel Vetter
2019-12-17 1:13 ` CK Hu
2019-12-17 1:13 ` CK Hu
2019-12-17 1:13 ` CK Hu
2019-12-13 17:26 ` Daniel Vetter [this message]
2019-12-13 17:26 ` [PATCH 06/10] drm/xrockchip: " Daniel Vetter
2019-12-13 18:03 ` Heiko Stübner
2019-12-13 18:03 ` Heiko Stübner
2019-12-13 18:03 ` Heiko Stübner
2019-12-13 17:26 ` [PATCH 07/10] drm/vc4: " Daniel Vetter
2019-12-13 17:26 ` [PATCH 08/10] drm/virtio: " Daniel Vetter
2019-12-13 17:26 ` Daniel Vetter
2019-12-13 17:26 ` [PATCH 09/10] drm/vkms: " Daniel Vetter
2020-01-14 23:50 ` Rodrigo Siqueira
2020-01-15 1:27 ` Sam Ravnborg
2020-01-15 23:16 ` Rodrigo Siqueira
2019-12-13 17:26 ` [PATCH 10/10] drm/zte: " Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191213172612.1514842-6-daniel.vetter@ffwll.ch \
--to=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=hjc@rock-chips.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-rockchip@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.