projects
/
platform
/
kernel
/
linux-starfive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5d39b15
)
drm/zte: plane_state->fb iff plane_state->crtc
author
Daniel Vetter
<daniel.vetter@ffwll.ch>
Fri, 13 Dec 2019 17:26:12 +0000
(18:26 +0100)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Tue, 28 Jan 2020 14:43:58 +0000
(15:43 +0100)
Checking both is one too much, so wrap a WARN_ON around it to stope
the copypasta.
Reviewed-by: Rodrigo Siqueira <rodrigosiqueira@gmail.com>
Tested-by: Rodrigo Siqueira <rodrigosiqueira@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Shawn Guo <shawnguo@kernel.org>
Link:
https://patchwork.freedesktop.org/patch/msgid/20191213172612.1514842-10-daniel.vetter@ffwll.ch
drivers/gpu/drm/zte/zx_plane.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/zte/zx_plane.c
b/drivers/gpu/drm/zte/zx_plane.c
index 086c50fac6894800ad596d3bd07b0aae2cabe3b7..c8f7b21fa09e6fe1fb0a095eb631631eaa5a3944 100644
(file)
--- 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,