* [PATCH] drm/i915: fix build for DEBUG_FS=n
@ 2015-04-10 13:59 Jani Nikula
2015-04-10 14:19 ` Daniel Vetter
2015-04-10 18:32 ` shuang.he
0 siblings, 2 replies; 3+ messages in thread
From: Jani Nikula @ 2015-04-10 13:59 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
Fix DEBUG_FS=n build broken by
commit aa7471d228eb6dfddd0d201ea9746d6a2020972a
Author: Jani Nikula <jani.nikula@intel.com>
Date: Wed Apr 1 11:15:21 2015 +0300
drm/i915: add i915 specific connector debugfs file for DPCD
Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_drv.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 822f2591e3c5..8cbb20cd63e6 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -3029,10 +3029,11 @@ int i915_verify_lists(struct drm_device *dev);
/* i915_debugfs.c */
int i915_debugfs_init(struct drm_minor *minor);
void i915_debugfs_cleanup(struct drm_minor *minor);
-int i915_debugfs_connector_add(struct drm_connector *connector);
#ifdef CONFIG_DEBUG_FS
+int i915_debugfs_connector_add(struct drm_connector *connector);
void intel_display_crc_init(struct drm_device *dev);
#else
+static inline int i915_debugfs_connector_add(struct drm_connector *connector) {}
static inline void intel_display_crc_init(struct drm_device *dev) {}
#endif
--
2.1.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915: fix build for DEBUG_FS=n
2015-04-10 13:59 [PATCH] drm/i915: fix build for DEBUG_FS=n Jani Nikula
@ 2015-04-10 14:19 ` Daniel Vetter
2015-04-10 18:32 ` shuang.he
1 sibling, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2015-04-10 14:19 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Fri, Apr 10, 2015 at 04:59:32PM +0300, Jani Nikula wrote:
> Fix DEBUG_FS=n build broken by
>
> commit aa7471d228eb6dfddd0d201ea9746d6a2020972a
> Author: Jani Nikula <jani.nikula@intel.com>
> Date: Wed Apr 1 11:15:21 2015 +0300
>
> drm/i915: add i915 specific connector debugfs file for DPCD
>
> Reported-by: kbuild test robot <fengguang.wu@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Queued for -next, thanks for the patch.
-Daniel
> ---
> drivers/gpu/drm/i915/i915_drv.h | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 822f2591e3c5..8cbb20cd63e6 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -3029,10 +3029,11 @@ int i915_verify_lists(struct drm_device *dev);
> /* i915_debugfs.c */
> int i915_debugfs_init(struct drm_minor *minor);
> void i915_debugfs_cleanup(struct drm_minor *minor);
> -int i915_debugfs_connector_add(struct drm_connector *connector);
> #ifdef CONFIG_DEBUG_FS
> +int i915_debugfs_connector_add(struct drm_connector *connector);
> void intel_display_crc_init(struct drm_device *dev);
> #else
> +static inline int i915_debugfs_connector_add(struct drm_connector *connector) {}
> static inline void intel_display_crc_init(struct drm_device *dev) {}
> #endif
>
> --
> 2.1.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] drm/i915: fix build for DEBUG_FS=n
2015-04-10 13:59 [PATCH] drm/i915: fix build for DEBUG_FS=n Jani Nikula
2015-04-10 14:19 ` Daniel Vetter
@ 2015-04-10 18:32 ` shuang.he
1 sibling, 0 replies; 3+ messages in thread
From: shuang.he @ 2015-04-10 18:32 UTC (permalink / raw)
To: shuang.he, ethan.gao, intel-gfx, jani.nikula
Tested-By: Intel Graphics QA PRTS (Patch Regression Test System Contact: shuang.he@intel.com)
Task id: 6175
-------------------------------------Summary-------------------------------------
Platform Delta drm-intel-nightly Series Applied
PNV -6 276/276 270/276
ILK 301/301 301/301
SNB 316/316 316/316
IVB 328/328 328/328
BYT 285/285 285/285
HSW 394/394 394/394
BDW 321/321 321/321
-------------------------------------Detailed-------------------------------------
Platform Test drm-intel-nightly Series Applied
PNV igt@gem_userptr_blits@coherency-sync CRASH(1)PASS(2) CRASH(2)
PNV igt@gem_userptr_blits@coherency-unsync CRASH(1)PASS(3) CRASH(2)
PNV igt@gen3_render_linear_blits FAIL(3)PASS(2) FAIL(2)
PNV igt@gen3_render_mixed_blits FAIL(2)PASS(2) FAIL(1)PASS(1)
PNV igt@gen3_render_tiledx_blits FAIL(3)PASS(2) FAIL(1)PASS(1)
PNV igt@gen3_render_tiledy_blits FAIL(3)PASS(2) FAIL(1)PASS(1)
Note: You need to pay more attention to line start with '*'
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-04-10 18:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-10 13:59 [PATCH] drm/i915: fix build for DEBUG_FS=n Jani Nikula
2015-04-10 14:19 ` Daniel Vetter
2015-04-10 18:32 ` shuang.he
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox