Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1611333 > unrolled thread
| Started by | Eric Anholt <eric@anholt.net> |
|---|---|
| First post | 2017-03-28 22:20 +0200 |
| Last post | 2017-03-31 02:50 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH] drm/vc4: Allocate the right amount of space for boot-time CRTC state. Eric Anholt <eric@anholt.net> - 2017-03-28 22:20 +0200
Re: [PATCH] drm/vc4: Allocate the right amount of space for boot-time CRTC state. Daniel Vetter <daniel@ffwll.ch> - 2017-03-29 08:40 +0200
Re: [PATCH] drm/vc4: Allocate the right amount of space for boot-time CRTC state. Eric Anholt <eric@anholt.net> - 2017-03-31 02:50 +0200
| From | Eric Anholt <eric@anholt.net> |
|---|---|
| Date | 2017-03-28 22:20 +0200 |
| Subject | [PATCH] drm/vc4: Allocate the right amount of space for boot-time CRTC state. |
| Message-ID | <tq5KV-4td-9@gated-at.bofh.it> |
Without this, the first modeset would dereference past the allocation
when trying to free the mm node.
Signed-off-by: Eric Anholt <eric@anholt.net>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
---
drivers/gpu/drm/vc4/vc4_crtc.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
index 24edd0c22cc9..9d91a40e4345 100644
--- a/drivers/gpu/drm/vc4/vc4_crtc.c
+++ b/drivers/gpu/drm/vc4/vc4_crtc.c
@@ -845,6 +845,17 @@ static void vc4_crtc_destroy_state(struct drm_crtc *crtc,
drm_atomic_helper_crtc_destroy_state(crtc, state);
}
+static void
+vc4_crtc_reset(struct drm_crtc *crtc)
+{
+ if (crtc->state)
+ __drm_atomic_helper_crtc_destroy_state(crtc->state);
+
+ crtc->state = kzalloc(sizeof(struct vc4_crtc_state), GFP_KERNEL);
+ if (crtc->state)
+ crtc->state->crtc = crtc;
+}
+
static const struct drm_crtc_funcs vc4_crtc_funcs = {
.set_config = drm_atomic_helper_set_config,
.destroy = vc4_crtc_destroy,
@@ -852,7 +863,7 @@ static const struct drm_crtc_funcs vc4_crtc_funcs = {
.set_property = NULL,
.cursor_set = NULL, /* handled by drm_mode_cursor_universal */
.cursor_move = NULL, /* handled by drm_mode_cursor_universal */
- .reset = drm_atomic_helper_crtc_reset,
+ .reset = vc4_crtc_reset,
.atomic_duplicate_state = vc4_crtc_duplicate_state,
.atomic_destroy_state = vc4_crtc_destroy_state,
.gamma_set = vc4_crtc_gamma_set,
--
2.11.0
[toc] | [next] | [standalone]
| From | Daniel Vetter <daniel@ffwll.ch> |
|---|---|
| Date | 2017-03-29 08:40 +0200 |
| Subject | Re: [PATCH] drm/vc4: Allocate the right amount of space for boot-time CRTC state. |
| Message-ID | <tqfqW-2Zw-7@gated-at.bofh.it> |
| In reply to | #1611333 |
On Tue, Mar 28, 2017 at 01:13:43PM -0700, Eric Anholt wrote:
> Without this, the first modeset would dereference past the allocation
> when trying to free the mm node.
>
> Signed-off-by: Eric Anholt <eric@anholt.net>
> Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Fixes: d8dbf44f13b9 ("drm/vc4: Make the CRTCs cooperate on allocating display lists.")
Cc: <stable@vger.kernel.org> # v4.6+
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> drivers/gpu/drm/vc4/vc4_crtc.c | 13 ++++++++++++-
> 1 file changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c
> index 24edd0c22cc9..9d91a40e4345 100644
> --- a/drivers/gpu/drm/vc4/vc4_crtc.c
> +++ b/drivers/gpu/drm/vc4/vc4_crtc.c
> @@ -845,6 +845,17 @@ static void vc4_crtc_destroy_state(struct drm_crtc *crtc,
> drm_atomic_helper_crtc_destroy_state(crtc, state);
> }
>
> +static void
> +vc4_crtc_reset(struct drm_crtc *crtc)
> +{
> + if (crtc->state)
> + __drm_atomic_helper_crtc_destroy_state(crtc->state);
> +
> + crtc->state = kzalloc(sizeof(struct vc4_crtc_state), GFP_KERNEL);
> + if (crtc->state)
> + crtc->state->crtc = crtc;
> +}
> +
> static const struct drm_crtc_funcs vc4_crtc_funcs = {
> .set_config = drm_atomic_helper_set_config,
> .destroy = vc4_crtc_destroy,
> @@ -852,7 +863,7 @@ static const struct drm_crtc_funcs vc4_crtc_funcs = {
> .set_property = NULL,
> .cursor_set = NULL, /* handled by drm_mode_cursor_universal */
> .cursor_move = NULL, /* handled by drm_mode_cursor_universal */
> - .reset = drm_atomic_helper_crtc_reset,
> + .reset = vc4_crtc_reset,
> .atomic_duplicate_state = vc4_crtc_duplicate_state,
> .atomic_destroy_state = vc4_crtc_destroy_state,
> .gamma_set = vc4_crtc_gamma_set,
> --
> 2.11.0
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
[toc] | [prev] | [next] | [standalone]
| From | Eric Anholt <eric@anholt.net> |
|---|---|
| Date | 2017-03-31 02:50 +0200 |
| Message-ID | <tqSVj-5M0-5@gated-at.bofh.it> |
| In reply to | #1611620 |
[Multipart message — attachments visible in raw view] — view raw
Daniel Vetter <daniel@ffwll.ch> writes:
> On Tue, Mar 28, 2017 at 01:13:43PM -0700, Eric Anholt wrote:
>> Without this, the first modeset would dereference past the allocation
>> when trying to free the mm node.
>>
>> Signed-off-by: Eric Anholt <eric@anholt.net>
>> Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
> Fixes: d8dbf44f13b9 ("drm/vc4: Make the CRTCs cooperate on allocating display lists.")
> Cc: <stable@vger.kernel.org> # v4.6+
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Thanks, pushed do drm-misc-next today.
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web