* [PATCH v2] drm/i915: Fix build when !CONFIG_DEBUG_FS
@ 2016-09-30 12:20 ` Tomeu Vizoso
0 siblings, 0 replies; 9+ messages in thread
From: Tomeu Vizoso @ 2016-09-30 12:20 UTC (permalink / raw)
To: linux-kernel; +Cc: Tomeu Vizoso, intel-gfx, dri-devel, Daniel Vetter
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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2] drm/i915: Fix build when !CONFIG_DEBUG_FS
@ 2016-09-30 12:20 ` Tomeu Vizoso
0 siblings, 0 replies; 9+ messages in thread
From: Tomeu Vizoso @ 2016-09-30 12:20 UTC (permalink / raw)
To: linux-kernel
Cc: Tomeu Vizoso, Daniel Vetter, Jani Nikula, David Airlie, intel-gfx,
dri-devel
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
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [Intel-gfx] [PATCH v2] drm/i915: Fix build when !CONFIG_DEBUG_FS
2016-09-30 12:20 ` Tomeu Vizoso
@ 2016-09-30 13:11 ` Chris Wilson
-1 siblings, 0 replies; 9+ messages in thread
From: Chris Wilson @ 2016-09-30 13:11 UTC (permalink / raw)
To: Tomeu Vizoso; +Cc: Daniel Vetter, intel-gfx, linux-kernel, dri-devel
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
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Intel-gfx] [PATCH v2] drm/i915: Fix build when !CONFIG_DEBUG_FS
@ 2016-09-30 13:11 ` Chris Wilson
0 siblings, 0 replies; 9+ messages in thread
From: Chris Wilson @ 2016-09-30 13:11 UTC (permalink / raw)
To: Tomeu Vizoso
Cc: linux-kernel, David Airlie, intel-gfx, dri-devel, Daniel Vetter
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
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2] drm/i915: Fix build when !CONFIG_DEBUG_FS
2016-09-30 13:11 ` Chris Wilson
@ 2016-09-30 13:19 ` Jani Nikula
-1 siblings, 0 replies; 9+ messages in thread
From: Jani Nikula @ 2016-09-30 13:19 UTC (permalink / raw)
To: Chris Wilson, Tomeu Vizoso
Cc: Daniel Vetter, intel-gfx, linux-kernel, dri-devel
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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Intel-gfx] [PATCH v2] drm/i915: Fix build when !CONFIG_DEBUG_FS
@ 2016-09-30 13:19 ` Jani Nikula
0 siblings, 0 replies; 9+ messages in thread
From: Jani Nikula @ 2016-09-30 13:19 UTC (permalink / raw)
To: Chris Wilson, Tomeu Vizoso
Cc: Daniel Vetter, intel-gfx, linux-kernel, dri-devel
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
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [PATCH v2] drm/i915: Fix build when !CONFIG_DEBUG_FS
2016-09-30 13:19 ` [Intel-gfx] " Jani Nikula
@ 2016-09-30 13:53 ` Daniel Vetter
-1 siblings, 0 replies; 9+ messages in thread
From: Daniel Vetter @ 2016-09-30 13:53 UTC (permalink / raw)
To: Jani Nikula
Cc: Tomeu Vizoso, intel-gfx, Linux Kernel Mailing List, dri-devel,
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
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [Intel-gfx] [PATCH v2] drm/i915: Fix build when !CONFIG_DEBUG_FS
@ 2016-09-30 13:53 ` Daniel Vetter
0 siblings, 0 replies; 9+ messages in thread
From: Daniel Vetter @ 2016-09-30 13:53 UTC (permalink / raw)
To: Jani Nikula
Cc: Chris Wilson, Tomeu Vizoso, Daniel Vetter, intel-gfx,
Linux Kernel Mailing List, dri-devel
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
^ permalink raw reply [flat|nested] 9+ messages in thread
* ✗ Fi.CI.BAT: warning for drm/i915: Fix build when !CONFIG_DEBUG_FS (rev2)
2016-09-30 12:20 ` Tomeu Vizoso
(?)
(?)
@ 2016-09-30 14:19 ` Patchwork
-1 siblings, 0 replies; 9+ messages in thread
From: Patchwork @ 2016-09-30 14:19 UTC (permalink / raw)
To: Tomeu Vizoso; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Fix build when !CONFIG_DEBUG_FS (rev2)
URL : https://patchwork.freedesktop.org/series/13124/
State : warning
== Summary ==
Series 13124v2 drm/i915: Fix build when !CONFIG_DEBUG_FS
https://patchwork.freedesktop.org/api/1.0/series/13124/revisions/2/mbox/
Test kms_force_connector_basic:
Subgroup force-connector-state:
pass -> SKIP (fi-snb-2520m)
Subgroup force-edid:
pass -> SKIP (fi-snb-2520m)
Subgroup prune-stale-modes:
pass -> SKIP (fi-snb-2520m)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-WARN (fi-byt-j1900)
Test kms_psr_sink_crc:
Subgroup psr_basic:
dmesg-warn -> PASS (fi-skl-6700hq)
fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15
fi-bsw-n3050 total:244 pass:202 dwarn:0 dfail:0 fail:0 skip:42
fi-bxt-t5700 total:244 pass:214 dwarn:0 dfail:0 fail:0 skip:30
fi-byt-j1900 total:244 pass:211 dwarn:1 dfail:0 fail:1 skip:31
fi-byt-n2820 total:244 pass:208 dwarn:0 dfail:0 fail:1 skip:35
fi-hsw-4770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
fi-hsw-4770r total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
fi-ilk-650 total:244 pass:182 dwarn:0 dfail:0 fail:2 skip:60
fi-ivb-3520m total:244 pass:219 dwarn:0 dfail:0 fail:0 skip:25
fi-ivb-3770 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37
fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14
fi-skl-6700hq total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
fi-skl-6700k total:244 pass:219 dwarn:1 dfail:0 fail:0 skip:24
fi-skl-6770hq total:244 pass:228 dwarn:1 dfail:0 fail:1 skip:14
fi-snb-2520m total:244 pass:205 dwarn:0 dfail:0 fail:0 skip:39
fi-snb-2600 total:244 pass:207 dwarn:0 dfail:0 fail:0 skip:37
Results at /archive/results/CI_IGT_test/Patchwork_2604/
d0534bd0217c83c083ba146b9c987e19b219e0e4 drm-intel-nightly: 2016y-09m-30d-10h-31m-00s UTC integration manifest
2d24ad9 drm/i915: Fix build when !CONFIG_DEBUG_FS
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-09-30 14:19 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-30 12:20 [PATCH v2] drm/i915: Fix build when !CONFIG_DEBUG_FS Tomeu Vizoso
2016-09-30 12:20 ` Tomeu Vizoso
2016-09-30 13:11 ` [Intel-gfx] " Chris Wilson
2016-09-30 13:11 ` Chris Wilson
2016-09-30 13:19 ` Jani Nikula
2016-09-30 13:19 ` [Intel-gfx] " Jani Nikula
2016-09-30 13:53 ` Daniel Vetter
2016-09-30 13:53 ` [Intel-gfx] " Daniel Vetter
2016-09-30 14:19 ` ✗ Fi.CI.BAT: warning for drm/i915: Fix build when !CONFIG_DEBUG_FS (rev2) Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.