diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-13 18:08:03 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-12-18 08:18:12 -0500 |
commit | 5bc9cb4dfbe8fcae02f8421e3102c78681f53b8c (patch) | |
tree | d790cedd03355bbfce1b3d6d2e3997a4aba3219c | |
parent | 25a9939c09eae246173d06e0478f0e131d83b55c (diff) |
drm: Move atomic debugfs functions into drm_crtc_internal.h
This is not driver interface stuff.
Fixes: 6559c901cb48 ("drm/atomic: add debugfs file to dump out atomic state")
Cc: Rob Clark <robdclark@gmail.com>
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161213230814.19598-3-daniel.vetter@ffwll.ch
-rw-r--r-- | drivers/gpu/drm/drm_crtc_internal.h | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_debugfs.c | 1 | ||||
-rw-r--r-- | include/drm/drm_atomic.h | 6 |
3 files changed, 7 insertions, 6 deletions
diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h index 42471dfc7405..724c329186d5 100644 --- a/drivers/gpu/drm/drm_crtc_internal.h +++ b/drivers/gpu/drm/drm_crtc_internal.h | |||
@@ -174,6 +174,12 @@ int drm_mode_dirtyfb_ioctl(struct drm_device *dev, | |||
174 | void *data, struct drm_file *file_priv); | 174 | void *data, struct drm_file *file_priv); |
175 | 175 | ||
176 | /* drm_atomic.c */ | 176 | /* drm_atomic.c */ |
177 | #ifdef CONFIG_DEBUG_FS | ||
178 | struct drm_minor; | ||
179 | int drm_atomic_debugfs_init(struct drm_minor *minor); | ||
180 | int drm_atomic_debugfs_cleanup(struct drm_minor *minor); | ||
181 | #endif | ||
182 | |||
177 | int drm_atomic_get_property(struct drm_mode_object *obj, | 183 | int drm_atomic_get_property(struct drm_mode_object *obj, |
178 | struct drm_property *property, uint64_t *val); | 184 | struct drm_property *property, uint64_t *val); |
179 | int drm_mode_atomic_ioctl(struct drm_device *dev, | 185 | int drm_mode_atomic_ioctl(struct drm_device *dev, |
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c index 2e3e46a53805..37fd612d57a6 100644 --- a/drivers/gpu/drm/drm_debugfs.c +++ b/drivers/gpu/drm/drm_debugfs.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <drm/drm_edid.h> | 38 | #include <drm/drm_edid.h> |
39 | #include <drm/drm_atomic.h> | 39 | #include <drm/drm_atomic.h> |
40 | #include "drm_internal.h" | 40 | #include "drm_internal.h" |
41 | #include "drm_crtc_internal.h" | ||
41 | 42 | ||
42 | #if defined(CONFIG_DEBUG_FS) | 43 | #if defined(CONFIG_DEBUG_FS) |
43 | 44 | ||
diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index d6d241f63b9f..b74f04c49713 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h | |||
@@ -369,12 +369,6 @@ int __must_check drm_atomic_nonblocking_commit(struct drm_atomic_state *state); | |||
369 | 369 | ||
370 | void drm_state_dump(struct drm_device *dev, struct drm_printer *p); | 370 | void drm_state_dump(struct drm_device *dev, struct drm_printer *p); |
371 | 371 | ||
372 | #ifdef CONFIG_DEBUG_FS | ||
373 | struct drm_minor; | ||
374 | int drm_atomic_debugfs_init(struct drm_minor *minor); | ||
375 | int drm_atomic_debugfs_cleanup(struct drm_minor *minor); | ||
376 | #endif | ||
377 | |||
378 | #define for_each_connector_in_state(__state, connector, connector_state, __i) \ | 372 | #define for_each_connector_in_state(__state, connector, connector_state, __i) \ |
379 | for ((__i) = 0; \ | 373 | for ((__i) = 0; \ |
380 | (__i) < (__state)->num_connector && \ | 374 | (__i) < (__state)->num_connector && \ |