[PATCH] drm/plane_helper: don't disable plane in destroy function

[PATCH] drm/plane_helper: don't disable plane in destroy function

[Daniel Vetter]

By the time drm_mode_config_cleanup calls this all the hw state should
be cleaned up already - we even have a WARN right before calling
plane->destroy callbacks asserting that all framebuffers are gone.

So trying to disable things harder is a bit a bug. Caught by Thierry
since it resulted in some mode_config.mutex locking backtraces.

Cc: Thierry Reding <treding@nvidia.com>
Cc: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/gpu/drm/drm_plane_helper.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c
index e768d35ff22e..a3c9c6e11ee9 100644
--- a/drivers/gpu/drm/drm_plane_helper.c
+++ b/drivers/gpu/drm/drm_plane_helper.c
@@ -255,7 +255,6 @@ EXPORT_SYMBOL(drm_primary_helper_disable);
  */
 void drm_primary_helper_destroy(struct drm_plane *plane)
 {
-	plane->funcs->disable_plane(plane);
 	drm_plane_cleanup(plane);
 	kfree(plane);
 }
-- 
1.8.5.2

Re: [PATCH] drm/plane_helper: don't disable plane in destroy function

[Thierry Reding]

[-- Attachment #1.1: Type: text/plain, Size: 755 bytes --]

On Fri, Apr 11, 2014 at 02:12:10PM +0200, Daniel Vetter wrote:
> By the time drm_mode_config_cleanup calls this all the hw state should
> be cleaned up already - we even have a WARN right before calling
> plane->destroy callbacks asserting that all framebuffers are gone.
> 
> So trying to disable things harder is a bit a bug. Caught by Thierry
> since it resulted in some mode_config.mutex locking backtraces.
> 
> Cc: Thierry Reding <treding@nvidia.com>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>  drivers/gpu/drm/drm_plane_helper.c | 1 -
>  1 file changed, 1 deletion(-)

Reviewed-by: Thierry Reding <treding@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>

[-- Attachment #1.2: Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH] drm/plane_helper: don't disable plane in destroy function

[Matt Roper]

On Fri, Apr 11, 2014 at 02:12:10PM +0200, Daniel Vetter wrote:
> By the time drm_mode_config_cleanup calls this all the hw state should
> be cleaned up already - we even have a WARN right before calling
> plane->destroy callbacks asserting that all framebuffers are gone.
> 
> So trying to disable things harder is a bit a bug. Caught by Thierry
> since it resulted in some mode_config.mutex locking backtraces.
> 
> Cc: Thierry Reding <treding@nvidia.com>
> Cc: Matt Roper <matthew.d.roper@intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

Reviewed-by: Matt Roper <matthew.d.roper@intel.com>

> ---
>  drivers/gpu/drm/drm_plane_helper.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/drm_plane_helper.c b/drivers/gpu/drm/drm_plane_helper.c
> index e768d35ff22e..a3c9c6e11ee9 100644
> --- a/drivers/gpu/drm/drm_plane_helper.c
> +++ b/drivers/gpu/drm/drm_plane_helper.c
> @@ -255,7 +255,6 @@ EXPORT_SYMBOL(drm_primary_helper_disable);
>   */
>  void drm_primary_helper_destroy(struct drm_plane *plane)
>  {
> -	plane->funcs->disable_plane(plane);
>  	drm_plane_cleanup(plane);
>  	kfree(plane);
>  }
> -- 
> 1.8.5.2
> 

-- 
Matt Roper
Graphics Software Engineer
IoTG Platform Enabling & Development
Intel Corporation
(916) 356-2795