* [PATCH] drm/meson: Fix plane atomic check when no crtc for the plane
@ 2017-01-03 9:20 Neil Armstrong
2017-01-04 9:10 ` Daniel Vetter
2017-01-04 13:27 ` Ville Syrjälä
0 siblings, 2 replies; 5+ messages in thread
From: Neil Armstrong @ 2017-01-03 9:20 UTC (permalink / raw)
To: linux-arm-kernel
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 | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c
index 4942ca0..7890e30 100644
--- 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);
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] drm/meson: Fix plane atomic check when no crtc for the plane
2017-01-03 9:20 [PATCH] drm/meson: Fix plane atomic check when no crtc for the plane Neil Armstrong
@ 2017-01-04 9:10 ` Daniel Vetter
2017-01-04 9:57 ` Neil Armstrong
2017-01-04 13:27 ` Ville Syrjälä
1 sibling, 1 reply; 5+ messages in thread
From: Daniel Vetter @ 2017-01-04 9:10 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 03, 2017 at 10:20:54AM +0100, Neil Armstrong wrote:
> 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>
Makes sense, pls send a pull request with this to Dave.
-Daniel
> ---
> drivers/gpu/drm/meson/meson_plane.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c
> index 4942ca0..7890e30 100644
> --- 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);
> --
> 1.9.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] drm/meson: Fix plane atomic check when no crtc for the plane
2017-01-04 9:10 ` Daniel Vetter
@ 2017-01-04 9:57 ` Neil Armstrong
0 siblings, 0 replies; 5+ messages in thread
From: Neil Armstrong @ 2017-01-04 9:57 UTC (permalink / raw)
To: linux-arm-kernel
On 01/04/2017 10:10 AM, Daniel Vetter wrote:
> On Tue, Jan 03, 2017 at 10:20:54AM +0100, Neil Armstrong wrote:
>> 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>
>
> Makes sense, pls send a pull request with this to Dave.
> -Daniel
Hi Daniel,
OK, I will push this one with the CVBS fixes I just pushed.
Thanks,
Neil
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] drm/meson: Fix plane atomic check when no crtc for the plane
2017-01-03 9:20 [PATCH] drm/meson: Fix plane atomic check when no crtc for the plane Neil Armstrong
2017-01-04 9:10 ` Daniel Vetter
@ 2017-01-04 13:27 ` Ville Syrjälä
2017-01-04 13:45 ` Neil Armstrong
1 sibling, 1 reply; 5+ messages in thread
From: Ville Syrjälä @ 2017-01-04 13:27 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jan 03, 2017 at 10:20:54AM +0100, Neil Armstrong wrote:
> 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 | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c
> index 4942ca0..7890e30 100644
> --- 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;
> +
Since you're not going to call drm_plane_helper_check_state() you will
fail to update plane_state->visible.
What i915 does in this case is look for state->crtc first, and if that's
NULL it'll pick the crtc from the old state (plane->state->crtc). It
looks a bit ugly, but maybe we should hide it in a small helper function
that could be used by all drivers?
> crtc_state = drm_atomic_get_crtc_state(state->state, state->crtc);
> if (IS_ERR(crtc_state))
> return PTR_ERR(crtc_state);
> --
> 1.9.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Ville Syrj?l?
Intel OTC
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] drm/meson: Fix plane atomic check when no crtc for the plane
2017-01-04 13:27 ` Ville Syrjälä
@ 2017-01-04 13:45 ` Neil Armstrong
0 siblings, 0 replies; 5+ messages in thread
From: Neil Armstrong @ 2017-01-04 13:45 UTC (permalink / raw)
To: linux-arm-kernel
On 01/04/2017 02:27 PM, Ville Syrj?l? wrote:
> On Tue, Jan 03, 2017 at 10:20:54AM +0100, Neil Armstrong wrote:
>> 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 | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/meson/meson_plane.c b/drivers/gpu/drm/meson/meson_plane.c
>> index 4942ca0..7890e30 100644
>> --- 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;
>> +
>
> Since you're not going to call drm_plane_helper_check_state() you will
> fail to update plane_state->visible.
Indeed I forgot about that, but i's not necessary yet since visibility is not yet handled.
>
> What i915 does in this case is look for state->crtc first, and if that's
> NULL it'll pick the crtc from the old state (plane->state->crtc). It
> looks a bit ugly, but maybe we should hide it in a small helper function
> that could be used by all drivers?
Yes, an helper would be helpful.
>
>> crtc_state = drm_atomic_get_crtc_state(state->state, state->crtc);
>> if (IS_ERR(crtc_state))
>> return PTR_ERR(crtc_state);
>> --
>> 1.9.1
Thanks,
Neil
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-01-04 13:45 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-03 9:20 [PATCH] drm/meson: Fix plane atomic check when no crtc for the plane Neil Armstrong
2017-01-04 9:10 ` Daniel Vetter
2017-01-04 9:57 ` Neil Armstrong
2017-01-04 13:27 ` Ville Syrjälä
2017-01-04 13:45 ` Neil Armstrong
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).