| Message ID | 20191213172612.1514842-3-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/10] drm/todo: Add item for the plane->atomic_check confusion | expand |
On Fri, Dec 13, 2019 at 08:53:30PM +0100, Sam Ravnborg wrote: > Hi Daniel. > > On Fri, Dec 13, 2019 at 06:26:05PM +0100, Daniel Vetter wrote: > > 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: Sam Ravnborg <sam@ravnborg.org> > > Cc: Boris Brezillon <bbrezillon@kernel.org> > > Cc: Nicolas Ferre <nicolas.ferre@microchip.com> > > Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> > > Cc: Ludovic Desroches <ludovic.desroches@microchip.com> > > Cc: linux-arm-kernel@lists.infradead.org > > Applied to drm-misc-next. > Looked through the whole series: > Acked-by: Sam Ravnborg <sam@ravnborg.org> Ok, pulled in the remaining patches, thanks for taking a look. -Daniel
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);
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: Sam Ravnborg <sam@ravnborg.org> Cc: Boris Brezillon <bbrezillon@kernel.org> Cc: Nicolas Ferre <nicolas.ferre@microchip.com> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: Ludovic Desroches <ludovic.desroches@microchip.com> Cc: linux-arm-kernel@lists.infradead.org --- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)