[PATCH v2] drm/i915: Fix build when !CONFIG_DEBUG_FS

[PATCH v2] drm/i915: Fix build when !CONFIG_DEBUG_FS

[Tomeu Vizoso]

Add stub for intel_crtc_set_crc_source() and fix arguments of
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.c       | 2 +-
 drivers/gpu/drm/i915/i915_drv.h       | 2 +-
 drivers/gpu/drm/i915/intel_drv.h      | 6 ++++++
 drivers/gpu/drm/i915/intel_pipe_crc.c | 3 +--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 31b2b6300d8d..9c1543240e27 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -847,7 +847,7 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,
 	intel_init_audio_hooks(dev_priv);
 	i915_gem_load_init(&dev_priv->drm);
 
-	intel_display_crc_init(&dev_priv->drm);
+	intel_display_crc_init(dev_priv);
 
 	intel_device_info_dump(dev_priv);
 
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 91ff3d735c45..d1195f4ffd29 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3524,7 +3524,7 @@ static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_objec
 int i915_debugfs_register(struct drm_i915_private *dev_priv);
 void i915_debugfs_unregister(struct drm_i915_private *dev_priv);
 int i915_debugfs_connector_add(struct drm_connector *connector);
-void intel_display_crc_init(struct drm_device *dev);
+void intel_display_crc_init(struct drm_i915_private *dev_priv);
 #else
 static inline int i915_debugfs_register(struct drm_i915_private *dev_priv) {return 0;}
 static inline void i915_debugfs_unregister(struct drm_i915_private *dev_priv) {}
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__ */
diff --git a/drivers/gpu/drm/i915/intel_pipe_crc.c b/drivers/gpu/drm/i915/intel_pipe_crc.c
index a3f3f45645ac..1a51e174e9e5 100644
--- a/drivers/gpu/drm/i915/intel_pipe_crc.c
+++ b/drivers/gpu/drm/i915/intel_pipe_crc.c
@@ -915,9 +915,8 @@ const struct file_operations i915_display_crc_ctl_fops = {
 	.write = display_crc_ctl_write
 };
 
-void intel_display_crc_init(struct drm_device *dev)
+void intel_display_crc_init(struct drm_i915_private *dev_priv)
 {
-	struct drm_i915_private *dev_priv = dev->dev_private;
 	enum pipe pipe;
 
 	for_each_pipe(dev_priv, pipe) {
-- 
2.7.4

Re: [Intel-gfx] [PATCH v2] drm/i915: Fix build when !CONFIG_DEBUG_FS

[Chris Wilson]

On Fri, Sep 30, 2016 at 02:20:30PM +0200, Tomeu Vizoso wrote:
> Add stub for intel_crtc_set_crc_source() and fix arguments of
> 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")
Reveiwed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre

Re: [Intel-gfx] [PATCH v2] drm/i915: Fix build when !CONFIG_DEBUG_FS

[Jani Nikula]

On Fri, 30 Sep 2016, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> On Fri, Sep 30, 2016 at 02:20:30PM +0200, Tomeu Vizoso wrote:
>> Add stub for intel_crtc_set_crc_source() and fix arguments of
>> 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")
> Reveiwed-by: Chris Wilson <chris@chris-wilson.co.uk>

Reveiwed tyop.

The commits being fixed are in drm-misc, so this needs to go in through
drm-misc as well. Daniel?

BR,
Jani.

-- 
Jani Nikula, Intel Open Source Technology Center

Re: [Intel-gfx] [PATCH v2] drm/i915: Fix build when !CONFIG_DEBUG_FS

[Daniel Vetter]

On Fri, Sep 30, 2016 at 3:19 PM, Jani Nikula
<jani.nikula@linux.intel.com> wrote:
> On Fri, 30 Sep 2016, Chris Wilson <chris@chris-wilson.co.uk> wrote:
>> On Fri, Sep 30, 2016 at 02:20:30PM +0200, Tomeu Vizoso wrote:
>>> Add stub for intel_crtc_set_crc_source() and fix arguments of
>>> 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")
>> Reveiwed-by: Chris Wilson <chris@chris-wilson.co.uk>
>
> Reveiwed tyop.
>
> The commits being fixed are in drm-misc, so this needs to go in through
> drm-misc as well. Daniel?


Because embarrassing build fail I already applied v1. I need a new,
real patch, no rebasing on -misc, patch to change the choice of color
...
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch