projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0c744ea
)
drm/meson: Fix plane atomic check when no crtc for the plane
author
Neil Armstrong
<narmstrong@baylibre.com>
Mon, 2 Jan 2017 15:09:59 +0000
(16:09 +0100)
committer
Neil Armstrong
<narmstrong@baylibre.com>
Tue, 3 Jan 2017 09:23:02 +0000
(10:23 +0100)
When no CRTC is associated with the plane, the meson_plane_atomic_check()
call breaks the kernel with an Oops.
Fixes: bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller")
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
drivers/gpu/drm/meson/meson_plane.c
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/meson/meson_plane.c
b/drivers/gpu/drm/meson/meson_plane.c
index 4942ca090b46fdfa1cf4b6193f3d66095804e02e..7890e30eb584570d5d87d857131db4065a8b3849 100644
(file)
--- a/
drivers/gpu/drm/meson/meson_plane.c
+++ b/
drivers/gpu/drm/meson/meson_plane.c
@@
-51,6
+51,9
@@
static int meson_plane_atomic_check(struct drm_plane *plane,
struct drm_crtc_state *crtc_state;
struct drm_rect clip = { 0, };
+ if (!state->crtc)
+ return 0;
+
crtc_state = drm_atomic_get_crtc_state(state->state, state->crtc);
if (IS_ERR(crtc_state))
return PTR_ERR(crtc_state);