| Message ID | 20161213230814.19598-3-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Dec 13, 2016 at 6:08 PM, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > This is not driver interface stuff. > Reviewed-by: Sean Paul <seanpaul@chromium.org> > 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> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > --- > drivers/gpu/drm/drm_crtc_internal.h | 6 ++++++ > drivers/gpu/drm/drm_debugfs.c | 1 + > 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 cdf6860c9d22..0b8454c7dc00 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, > void *data, struct drm_file *file_priv); > > /* drm_atomic.c */ > +#ifdef CONFIG_DEBUG_FS > +struct drm_minor; > +int drm_atomic_debugfs_init(struct drm_minor *minor); > +int drm_atomic_debugfs_cleanup(struct drm_minor *minor); > +#endif > + > int drm_atomic_get_property(struct drm_mode_object *obj, > struct drm_property *property, uint64_t *val); > 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 @@ > #include <drm/drm_edid.h> > #include <drm/drm_atomic.h> > #include "drm_internal.h" > +#include "drm_crtc_internal.h" > > #if defined(CONFIG_DEBUG_FS) > > diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h > index 01d02e1935b1..c35b4aba36b6 100644 > --- a/include/drm/drm_atomic.h > +++ b/include/drm/drm_atomic.h > @@ -379,12 +379,6 @@ int __must_check drm_atomic_nonblocking_commit(struct drm_atomic_state *state); > > void drm_state_dump(struct drm_device *dev, struct drm_printer *p); > > -#ifdef CONFIG_DEBUG_FS > -struct drm_minor; > -int drm_atomic_debugfs_init(struct drm_minor *minor); > -int drm_atomic_debugfs_cleanup(struct drm_minor *minor); > -#endif > - > #define for_each_connector_in_state(__state, connector, connector_state, __i) \ > for ((__i) = 0; \ > (__i) < (__state)->num_connector && \ > -- > 2.11.0 >
diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h index cdf6860c9d22..0b8454c7dc00 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, void *data, struct drm_file *file_priv); /* drm_atomic.c */ +#ifdef CONFIG_DEBUG_FS +struct drm_minor; +int drm_atomic_debugfs_init(struct drm_minor *minor); +int drm_atomic_debugfs_cleanup(struct drm_minor *minor); +#endif + int drm_atomic_get_property(struct drm_mode_object *obj, struct drm_property *property, uint64_t *val); 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 @@ #include <drm/drm_edid.h> #include <drm/drm_atomic.h> #include "drm_internal.h" +#include "drm_crtc_internal.h" #if defined(CONFIG_DEBUG_FS) diff --git a/include/drm/drm_atomic.h b/include/drm/drm_atomic.h index 01d02e1935b1..c35b4aba36b6 100644 --- a/include/drm/drm_atomic.h +++ b/include/drm/drm_atomic.h @@ -379,12 +379,6 @@ int __must_check drm_atomic_nonblocking_commit(struct drm_atomic_state *state); void drm_state_dump(struct drm_device *dev, struct drm_printer *p); -#ifdef CONFIG_DEBUG_FS -struct drm_minor; -int drm_atomic_debugfs_init(struct drm_minor *minor); -int drm_atomic_debugfs_cleanup(struct drm_minor *minor); -#endif - #define for_each_connector_in_state(__state, connector, connector_state, __i) \ for ((__i) = 0; \ (__i) < (__state)->num_connector && \
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> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- drivers/gpu/drm/drm_crtc_internal.h | 6 ++++++ drivers/gpu/drm/drm_debugfs.c | 1 + include/drm/drm_atomic.h | 6 ------ 3 files changed, 7 insertions(+), 6 deletions(-)