From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
DRI Development <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH 13/18] drm/vc4: Use drm_atomic_helper_shutdown
Date: Wed, 3 Oct 2018 16:08:05 +0300 [thread overview]
Message-ID: <20181003130805.GN9144@intel.com> (raw)
In-Reply-To: <20181003091827.25276-1-daniel.vetter@ffwll.ch>
On Wed, Oct 03, 2018 at 11:18:22AM +0200, Daniel Vetter wrote:
> drm_plane_helper_disable is a non-atomic drivers only function, and
> will blow up (since no one passes the locking context it needs).
>
> Atomic drivers which want to quiescent their hw on unload should
> use drm_atomic_helper_shutdown() instead.
>
> v2: Rebase.
>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Eric Anholt <eric@anholt.net>
Looks correct to me.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/vc4/vc4_drv.c | 3 +++
> drivers/gpu/drm/vc4/vc4_plane.c | 1 -
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
> index 1f1780ccdbdf..f6f5cd80c04d 100644
> --- a/drivers/gpu/drm/vc4/vc4_drv.c
> +++ b/drivers/gpu/drm/vc4/vc4_drv.c
> @@ -33,6 +33,7 @@
> #include <linux/pm_runtime.h>
> #include <drm/drm_fb_cma_helper.h>
> #include <drm/drm_fb_helper.h>
> +#include <drm/drm_atomic_helper.h>
>
> #include "uapi/drm/vc4_drm.h"
> #include "vc4_drv.h"
> @@ -308,6 +309,8 @@ static void vc4_drm_unbind(struct device *dev)
>
> drm_dev_unregister(drm);
>
> + drm_atomic_helper_shutdown(drm);
> +
> drm_mode_config_cleanup(drm);
>
> drm_atomic_private_obj_fini(&vc4->ctm_manager);
> diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
> index 9dc3fcbd290b..d04b3c3246ba 100644
> --- a/drivers/gpu/drm/vc4/vc4_plane.c
> +++ b/drivers/gpu/drm/vc4/vc4_plane.c
> @@ -903,7 +903,6 @@ static const struct drm_plane_helper_funcs vc4_plane_helper_funcs = {
>
> static void vc4_plane_destroy(struct drm_plane *plane)
> {
> - drm_plane_helper_disable(plane, NULL);
> drm_plane_cleanup(plane);
> }
>
> --
> 2.19.0.rc2
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Ville Syrjälä
Intel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2018-10-03 13:08 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-02 13:35 [PATCH 00/18] atomic helper cleanups Daniel Vetter
2018-10-02 13:35 ` [PATCH 01/18] drm/amdgpu: Remove default best_encoder hook from DC Daniel Vetter
2018-10-02 13:35 ` [PATCH 02/18] drm/atomic-helper: Unexport drm_atomic_helper_best_encoder Daniel Vetter
2018-10-02 13:53 ` Laurent Pinchart
2018-10-03 9:08 ` Daniel Vetter
2018-10-04 17:13 ` Laurent Pinchart
2018-10-04 18:33 ` Sean Paul
2018-10-04 19:33 ` [Intel-gfx] " Daniel Vetter
2018-10-02 13:35 ` [PATCH 03/18] drm: Extract drm_atomic_state_helper.[hc] Daniel Vetter
2018-10-02 15:40 ` Ville Syrjälä
2018-10-03 9:10 ` Daniel Vetter
2018-10-02 13:35 ` [PATCH 04/18] drm/vmwgfx: Remove confused comment from vmw_du_connector_atomic_set_property Daniel Vetter
2018-10-02 15:15 ` Ville Syrjälä
2018-10-02 16:36 ` [Intel-gfx] " Thomas Hellstrom
2018-10-02 17:02 ` Ville Syrjälä
2018-10-04 20:03 ` [Intel-gfx] " Daniel Vetter
2018-10-02 13:35 ` [PATCH 05/18] drm/vmwgfx: Don't look at state->allow_modeset Daniel Vetter
2018-10-02 13:35 ` [PATCH 06/18] drm/atomic: Improve docs for drm_atomic_state->allow_modeset Daniel Vetter
2018-10-02 15:40 ` Ville Syrjälä
2018-10-02 13:35 ` [PATCH 07/18] drm/vmwgfx: Add FIXME comments for customer page_flip handlers Daniel Vetter
2018-10-02 16:49 ` Thomas Hellstrom
2018-10-03 9:11 ` Daniel Vetter
2018-10-02 13:35 ` [PATCH 08/18] drm/arcpgu: Drop transitional hooks Daniel Vetter
2018-10-02 15:34 ` Ville Syrjälä
2018-10-03 9:20 ` [Intel-gfx] " Daniel Vetter
2018-10-02 13:35 ` [PATCH 09/18] drm/atmel: " Daniel Vetter
2018-10-02 15:34 ` [Intel-gfx] " Ville Syrjälä
2018-10-02 13:35 ` [PATCH 10/18] drm/arcpgu: Use drm_atomic_helper_shutdown Daniel Vetter
2018-10-02 15:39 ` Ville Syrjälä
2018-10-03 9:16 ` [PATCH 11/18] drm/msm: " Daniel Vetter
2018-10-03 13:01 ` Ville Syrjälä
2018-10-03 9:17 ` [PATCH 12/18] drm/sti: " Daniel Vetter
2018-10-03 13:07 ` Ville Syrjälä
2018-10-03 9:18 ` [PATCH 13/18] drm/vc4: " Daniel Vetter
2018-10-03 9:18 ` [PATCH 14/18] drm/zte: " Daniel Vetter
2018-10-03 13:08 ` Ville Syrjälä
2018-10-03 9:18 ` [PATCH 15/18] drm: Remove transitional helpers Daniel Vetter
2018-10-03 13:11 ` [Intel-gfx] " Ville Syrjälä
2018-10-03 9:18 ` [PATCH 16/18] drm/vmwgfx: Fix vmw_du_cursor_plane_atomic_check Daniel Vetter
2018-10-03 13:12 ` Ville Syrjälä
2018-10-03 9:18 ` [PATCH 17/18] drm: Unexport drm_plane_helper_check_update Daniel Vetter
2018-10-04 20:30 ` Ville Syrjälä
2018-10-03 9:18 ` [PATCH 18/18] drm: Unexport primary plane helpers Daniel Vetter
2018-10-03 13:15 ` Ville Syrjälä
2018-10-03 13:08 ` Ville Syrjälä [this message]
2018-10-03 20:31 ` [PATCH 13/18] drm/vc4: Use drm_atomic_helper_shutdown Eric Anholt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20181003130805.GN9144@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).