drm: Move the legacy kms disable_all helper to crtc helpers

It's not a core function, and the matching atomic functions are also
not in the core. Plus the suspend/resume helper is also already there.

Needs a tiny bit of open-coding, but less midlayer beats that I think.

v2: Rebase onto ast (which gained a new user).

Cc: Sam Bobroff <[email protected]>
Reviewed-by: Alex Deucher <[email protected]>
Reviewed-by: Sean Paul <[email protected]>
Signed-off-by: Daniel Vetter <[email protected]>
Cc: Maarten Lankhorst <[email protected]>
Cc: Maxime Ripard <[email protected]>
Cc: Sean Paul <[email protected]>
Cc: David Airlie <[email protected]>
Cc: Ben Skeggs <[email protected]>
Cc: Alex Deucher <[email protected]>
Cc: "Christian König" <[email protected]>
Cc: "David (ChunMing) Zhou" <[email protected]>
Cc: Rex Zhu <[email protected]>
Cc: Andrey Grodzovsky <[email protected]>
Cc: Huang Rui <[email protected]>
Cc: Shaoyun Liu <[email protected]>
Cc: Monk Liu <[email protected]>
Cc: [email protected]
Cc: [email protected]
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index 8a078f4ae73dd17cc43384e605d28e4c613e7c37..28bccceaa363db9cd8fcef9da4dfadb11e9b0f97 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
@@ -2708,7 +2708,7 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
        amdgpu_irq_disable_all(adev);
        if (adev->mode_info.mode_config_initialized){
                if (!amdgpu_device_has_dc_support(adev))
        amdgpu_irq_disable_all(adev);
        if (adev->mode_info.mode_config_initialized){
                if (!amdgpu_device_has_dc_support(adev))

-                       drm_crtc_force_disable_all(adev->ddev);
+                       drm_helper_force_disable_all(adev->ddev);

                else
                        drm_atomic_helper_shutdown(adev->ddev);
        }
                else
                        drm_atomic_helper_shutdown(adev->ddev);
        }

diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
index c2e41369adcf4b8d43cdd4b0ec829318e9b13654..75f867d000315f9953904e9613a87223dc0494ac 100644 (file)
--- a/drivers/gpu/drm/ast/ast_fb.c
+++ b/drivers/gpu/drm/ast/ast_fb.c
@@ -261,7 +261,7 @@ static void ast_fbdev_destroy(struct drm_device *dev,
 {
        struct ast_framebuffer *afb = &afbdev->afb;
 
 {
        struct ast_framebuffer *afb = &afbdev->afb;
 

-       drm_crtc_force_disable_all(dev);
+       drm_helper_force_disable_all(dev);

        drm_fb_helper_unregister_fbi(&afbdev->helper);
 
        if (afb->obj) {
        drm_fb_helper_unregister_fbi(&afbdev->helper);
 
        if (afb->obj) {

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index f660819d406efb586fe2547a6585a5a9d4c0b02a..7dabbaf033a16055671ccfdb9d164936a8b9a4da 100644 (file)
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -104,37 +104,6 @@ int drm_crtc_force_disable(struct drm_crtc *crtc)
        return drm_mode_set_config_internal(&set);
 }
 
        return drm_mode_set_config_internal(&set);
 }
 

-/**
- * drm_crtc_force_disable_all - Forcibly turn off all enabled CRTCs
- * @dev: DRM device whose CRTCs to turn off
- *
- * Drivers may want to call this on unload to ensure that all displays are
- * unlit and the GPU is in a consistent, low power state. Takes modeset locks.
- *
- * Note: This should only be used by non-atomic legacy drivers. For an atomic
- * version look at drm_atomic_helper_shutdown().
- *
- * Returns:
- * Zero on success, error code on failure.
- */
-int drm_crtc_force_disable_all(struct drm_device *dev)
-{
-       struct drm_crtc *crtc;
-       int ret = 0;
-
-       drm_modeset_lock_all(dev);
-       drm_for_each_crtc(crtc, dev)
-               if (crtc->enabled) {
-                       ret = drm_crtc_force_disable(crtc);
-                       if (ret)
-                               goto out;
-               }
-out:
-       drm_modeset_unlock_all(dev);
-       return ret;
-}
-EXPORT_SYMBOL(drm_crtc_force_disable_all);
-

 static unsigned int drm_num_crtcs(struct drm_device *dev)
 {
        unsigned int num = 0;
 static unsigned int drm_num_crtcs(struct drm_device *dev)
 {
        unsigned int num = 0;

diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index 3b5cf93233c1e98ad5a19c3c08ac5e8412b89d63..91dc9b6386e78d440e5f767ae01c35d51c66617f 100644 (file)
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -994,3 +994,38 @@ void drm_helper_resume_force_mode(struct drm_device *dev)
        drm_modeset_unlock_all(dev);
 }
 EXPORT_SYMBOL(drm_helper_resume_force_mode);
        drm_modeset_unlock_all(dev);
 }
 EXPORT_SYMBOL(drm_helper_resume_force_mode);

+
+/**
+ * drm_helper_force_disable_all - Forcibly turn off all enabled CRTCs
+ * @dev: DRM device whose CRTCs to turn off
+ *
+ * Drivers may want to call this on unload to ensure that all displays are
+ * unlit and the GPU is in a consistent, low power state. Takes modeset locks.
+ *
+ * Note: This should only be used by non-atomic legacy drivers. For an atomic
+ * version look at drm_atomic_helper_shutdown().
+ *
+ * Returns:
+ * Zero on success, error code on failure.
+ */
+int drm_helper_force_disable_all(struct drm_device *dev)
+{
+       struct drm_crtc *crtc;
+       int ret = 0;
+
+       drm_modeset_lock_all(dev);
+       drm_for_each_crtc(crtc, dev)
+               if (crtc->enabled) {
+                       struct drm_mode_set set = {
+                               .crtc = crtc,
+                       };
+
+                       ret = drm_mode_set_config_internal(&set);
+                       if (ret)
+                               goto out;
+               }
+out:
+       drm_modeset_unlock_all(dev);
+       return ret;
+}
+EXPORT_SYMBOL(drm_helper_force_disable_all);

diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index f326ffd867664cd98dfc9dea789f91917c21856a..5d273a65547951afe2a47e96698030ab03b680b7 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -453,7 +453,7 @@ nouveau_display_fini(struct drm_device *dev, bool suspend, bool runtime)
                if (drm_drv_uses_atomic_modeset(dev))
                        drm_atomic_helper_shutdown(dev);
                else
                if (drm_drv_uses_atomic_modeset(dev))
                        drm_atomic_helper_shutdown(dev);
                else

-                       drm_crtc_force_disable_all(dev);
+                       drm_helper_force_disable_all(dev);

        }
 
        /* disable flip completion events */
        }
 
        /* disable flip completion events */

diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index 9d3ac8b981dab3d324e2864495c5fe739f4d675f..b190478ad087fff6027f29892b8ba036505da873 100644 (file)
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -1646,7 +1646,7 @@ void radeon_modeset_fini(struct radeon_device *rdev)
        if (rdev->mode_info.mode_config_initialized) {
                drm_kms_helper_poll_fini(rdev->ddev);
                radeon_hpd_fini(rdev);
        if (rdev->mode_info.mode_config_initialized) {
                drm_kms_helper_poll_fini(rdev->ddev);
                radeon_hpd_fini(rdev);

-               drm_crtc_force_disable_all(rdev->ddev);
+               drm_helper_force_disable_all(rdev->ddev);

                radeon_fbdev_fini(rdev);
                radeon_afmt_fini(rdev);
                drm_mode_config_cleanup(rdev->ddev);
                radeon_fbdev_fini(rdev);
                radeon_afmt_fini(rdev);
                drm_mode_config_cleanup(rdev->ddev);

diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index b45bec0b7a9c557e139769b08828c02a2736e74f..85abd3fe9e832d4bad14a710e69504821e4bcd3d 100644 (file)
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -1149,8 +1149,6 @@ static inline uint32_t drm_crtc_mask(const struct drm_crtc *crtc)
        return 1 << drm_crtc_index(crtc);
 }
 
        return 1 << drm_crtc_index(crtc);
 }
 

-int drm_crtc_force_disable_all(struct drm_device *dev);
-

 int drm_mode_set_config_internal(struct drm_mode_set *set);
 struct drm_crtc *drm_crtc_from_index(struct drm_device *dev, int idx);
 
 int drm_mode_set_config_internal(struct drm_mode_set *set);
 struct drm_crtc *drm_crtc_from_index(struct drm_device *dev, int idx);
 

diff --git a/include/drm/drm_crtc_helper.h b/include/drm/drm_crtc_helper.h
index d65f034843cea620a3d99ff7b28261e8e33122a9..0ee9a96b70dab6a6b9b0c61991bc9d61842b7841 100644 (file)
--- a/include/drm/drm_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
@@ -56,6 +56,7 @@ bool drm_helper_encoder_in_use(struct drm_encoder *encoder);
 int drm_helper_connector_dpms(struct drm_connector *connector, int mode);
 
 void drm_helper_resume_force_mode(struct drm_device *dev);
 int drm_helper_connector_dpms(struct drm_connector *connector, int mode);
 
 void drm_helper_resume_force_mode(struct drm_device *dev);

+int drm_helper_force_disable_all(struct drm_device *dev);

 
 /* drm_probe_helper.c */
 int drm_helper_probe_single_connector_modes(struct drm_connector
 
 /* drm_probe_helper.c */
 int drm_helper_probe_single_connector_modes(struct drm_connector