| Message ID | 1475229522-24113-1-git-send-email-tomeu.vizoso@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Sep 30, 2016 at 11:58:42AM +0200, Tomeu Vizoso wrote: > Add stub for intel_crtc_set_crc_source() and fix arguments of stub for > intel_display_crc_init(). > > Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> > Fixes: 21165bd933ac ("drm/i915/debugfs: Move out pipe CRC code") > Fixes: 13fa0253d97a ("drm/i915: Use new CRC debugfs API") > --- > drivers/gpu/drm/i915/i915_drv.h | 2 +- > drivers/gpu/drm/i915/intel_drv.h | 6 ++++++ > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 91ff3d735c45..e0cb71c9c52e 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -3530,7 +3530,7 @@ static inline int i915_debugfs_register(struct drm_i915_private *dev_priv) {retu > static inline void i915_debugfs_unregister(struct drm_i915_private *dev_priv) {} > static inline int i915_debugfs_connector_add(struct drm_connector *connector) > { return 0; } > -static inline void intel_display_crc_init(struct drm_i915_private *dev_priv) {} > +static inline void intel_display_crc_init(struct drm_device *dev) {} > #endif > > /* i915_gpu_error.c */ > diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h > index c49a11ed70be..73bab745c855 100644 > --- a/drivers/gpu/drm/i915/intel_drv.h > +++ b/drivers/gpu/drm/i915/intel_drv.h > @@ -1842,8 +1842,14 @@ void intel_color_load_luts(struct drm_crtc_state *crtc_state); > /* intel_pipe_crc.c */ > int intel_pipe_crc_create(struct drm_minor *minor); > void intel_pipe_crc_cleanup(struct drm_minor *minor); > +#ifdef CONFIG_DEBUG_FS > int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name, > size_t *values_cnt); > +#else > +static inline int intel_crtc_set_crc_source(struct drm_crtc *crtc, > + const char *source_name, > + size_t *values_cnt) { return 0; } > +#endif Please fix by passing the right pointer to intel_display_crc_init() instead. -Chris
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 91ff3d735c45..e0cb71c9c52e 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -3530,7 +3530,7 @@ static inline int i915_debugfs_register(struct drm_i915_private *dev_priv) {retu static inline void i915_debugfs_unregister(struct drm_i915_private *dev_priv) {} static inline int i915_debugfs_connector_add(struct drm_connector *connector) { return 0; } -static inline void intel_display_crc_init(struct drm_i915_private *dev_priv) {} +static inline void intel_display_crc_init(struct drm_device *dev) {} #endif /* i915_gpu_error.c */ diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index c49a11ed70be..73bab745c855 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -1842,8 +1842,14 @@ void intel_color_load_luts(struct drm_crtc_state *crtc_state); /* intel_pipe_crc.c */ int intel_pipe_crc_create(struct drm_minor *minor); void intel_pipe_crc_cleanup(struct drm_minor *minor); +#ifdef CONFIG_DEBUG_FS int intel_crtc_set_crc_source(struct drm_crtc *crtc, const char *source_name, size_t *values_cnt); +#else +static inline int intel_crtc_set_crc_source(struct drm_crtc *crtc, + const char *source_name, + size_t *values_cnt) { return 0; } +#endif extern const struct file_operations i915_display_crc_ctl_fops; #endif /* __INTEL_DRV_H__ */
Add stub for intel_crtc_set_crc_source() and fix arguments of stub for intel_display_crc_init(). Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Fixes: 21165bd933ac ("drm/i915/debugfs: Move out pipe CRC code") Fixes: 13fa0253d97a ("drm/i915: Use new CRC debugfs API") --- drivers/gpu/drm/i915/i915_drv.h | 2 +- drivers/gpu/drm/i915/intel_drv.h | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-)