All of lore.kernel.org
 help / color / mirror / Atom feed
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
To: dri-devel@lists.freedesktop.org
Subject: [PATCH 11/12] drm: vc4: Use drm_atomic_helper_shutdown() to disable planes on removal
Date: Wed, 17 Jan 2018 23:55:34 +0200	[thread overview]
Message-ID: <20180117215535.16517-12-laurent.pinchart+renesas@ideasonboard.com> (raw)
In-Reply-To: <20180117215535.16517-1-laurent.pinchart+renesas@ideasonboard.com>

The plane cleanup handler currently calls drm_plane_helper_disable(),
which is a legacy helper function. Replace it with a call to
drm_atomic_helper_shutdown() at removal time. The plane .destroy()
handler now consisting only of a call to drm_plane_cleanup(), replace it
with direct calls to that function.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/gpu/drm/msm/Kconfig     | 1 -
 drivers/gpu/drm/vc4/Kconfig     | 1 -
 drivers/gpu/drm/vc4/vc4_drv.c   | 3 +++
 drivers/gpu/drm/vc4/vc4_plane.c | 8 +-------
 drivers/gpu/drm/zte/Kconfig     | 2 +-
 5 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
index 99d39b2aefa6..d6b0685ca129 100644
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -2,7 +2,6 @@
 config DRM_MSM
 	tristate "MSM DRM"
 	depends on DRM
-	depends on ARCH_QCOM || (ARM && COMPILE_TEST)
 	depends on OF && COMMON_CLK
 	depends on MMU
 	select QCOM_MDT_LOADER if ARCH_QCOM
diff --git a/drivers/gpu/drm/vc4/Kconfig b/drivers/gpu/drm/vc4/Kconfig
index fdae18aeab4f..412d7a06f0db 100644
--- a/drivers/gpu/drm/vc4/Kconfig
+++ b/drivers/gpu/drm/vc4/Kconfig
@@ -1,6 +1,5 @@
 config DRM_VC4
 	tristate "Broadcom VC4 Graphics"
-	depends on ARCH_BCM || ARCH_BCM2835 || COMPILE_TEST
 	depends on DRM
 	depends on SND && SND_SOC
 	depends on COMMON_CLK
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index ceb385fd69c5..ed2c1c233c39 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -31,6 +31,7 @@
 #include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/pm_runtime.h>
+#include <drm/drm_atomic_helper.h>
 #include <drm/drm_fb_cma_helper.h>
 #include <drm/drm_fb_helper.h>
 
@@ -299,6 +300,8 @@ static void vc4_drm_unbind(struct device *dev)
 
 	drm_fb_cma_fbdev_fini(drm);
 
+	drm_atomic_helper_shutdown(drm);
+
 	drm_mode_config_cleanup(drm);
 
 	drm_dev_unref(drm);
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
index 515f97997624..9fcc55078ff7 100644
--- a/drivers/gpu/drm/vc4/vc4_plane.c
+++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -825,12 +825,6 @@ static const struct drm_plane_helper_funcs vc4_plane_helper_funcs = {
 	.cleanup_fb = vc4_cleanup_fb,
 };
 
-static void vc4_plane_destroy(struct drm_plane *plane)
-{
-	drm_plane_helper_disable(plane);
-	drm_plane_cleanup(plane);
-}
-
 /* Implements immediate (non-vblank-synced) updates of the cursor
  * position, or falls back to the atomic helper otherwise.
  */
@@ -910,7 +904,7 @@ vc4_update_plane(struct drm_plane *plane,
 static const struct drm_plane_funcs vc4_plane_funcs = {
 	.update_plane = vc4_update_plane,
 	.disable_plane = drm_atomic_helper_disable_plane,
-	.destroy = vc4_plane_destroy,
+	.destroy = drm_plane_cleanup,
 	.set_property = NULL,
 	.reset = vc4_plane_reset,
 	.atomic_duplicate_state = vc4_plane_duplicate_state,
diff --git a/drivers/gpu/drm/zte/Kconfig b/drivers/gpu/drm/zte/Kconfig
index 5b36421ef3e5..76d63bcc5c3a 100644
--- a/drivers/gpu/drm/zte/Kconfig
+++ b/drivers/gpu/drm/zte/Kconfig
@@ -1,6 +1,6 @@
 config DRM_ZTE
 	tristate "DRM Support for ZTE SoCs"
-	depends on DRM && ARCH_ZX
+	depends on DRM
 	select DRM_KMS_CMA_HELPER
 	select DRM_KMS_FB_HELPER
 	select DRM_KMS_HELPER
-- 
Regards,

Laurent Pinchart

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

  parent reply	other threads:[~2018-01-17 21:55 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-17 21:55 [PATCH 00/12] Cargo cult cleanup in atomic drivers Laurent Pinchart
2018-01-17 21:55 ` [PATCH 01/12] drm: arc: Don't set CRTC .mode_set and .mode_set_base handlers Laurent Pinchart
2018-01-17 21:55 ` [PATCH 02/12] drm: atmel-hlcdc: " Laurent Pinchart
2018-01-18  8:44   ` Boris Brezillon
2018-01-17 21:55 ` [PATCH 03/12] drm: arc: Use drm_atomic_helper_shutdown() to disable planes on removal Laurent Pinchart
2018-01-17 21:55 ` [PATCH 04/12] drm: arm: hdlcd: Don't destroy plane manually in hdlcd_setup_crtc() Laurent Pinchart
2018-01-17 21:55 ` [PATCH 05/12] drm: arm: hdlcd: Use drm_atomic_helper_shutdown() to disable planes on removal Laurent Pinchart
2018-01-17 21:55 ` [PATCH 06/12] drm: arm: malidp: Don't destroy planes manually in error handlers Laurent Pinchart
2018-01-17 21:55 ` [PATCH 07/12] drm: arm: malidp: Use drm_atomic_helper_shutdown() to disable planes on removal Laurent Pinchart
2018-01-19 15:48   ` Liviu Dudau
2018-01-17 21:55 ` [PATCH 08/12] drm: msm: " Laurent Pinchart
2018-01-19  4:51   ` Archit Taneja
2018-01-17 21:55 ` [PATCH 09/12] drm: sti: Cleanup KMS objects " Laurent Pinchart
2018-01-17 21:55 ` [PATCH 10/12] drm: sti: Use drm_atomic_helper_shutdown() to disable planes " Laurent Pinchart
2018-01-17 21:55 ` Laurent Pinchart [this message]
2018-01-18  5:44   ` [PATCH 11/12] drm: vc4: " Eric Anholt
2018-01-20 11:54   ` kbuild test robot
2018-01-20 12:03   ` kbuild test robot
2018-01-17 21:55 ` [PATCH 12/12] drm: zte: " Laurent Pinchart
2018-02-02  7:48   ` Shawn Guo
2018-01-18 17:32 ` [PATCH 00/12] Cargo cult cleanup in atomic drivers Liviu Dudau
2018-01-18 18:00 ` Alexey Brodkin
2018-01-19 15:00 ` Benjamin Gaignard

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=20180117215535.16517-12-laurent.pinchart+renesas@ideasonboard.com \
    --to=laurent.pinchart+renesas@ideasonboard.com \
    --cc=dri-devel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.