Skip to contentSkip to conversation

drm/i915: fix build for DEBUG_FS=n

PATCH Applied Jani Nikula 3 participants 3 messages Apr 10, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: fix build for DEBUG_FS=n

Fix DEBUG_FS=n build broken by

commit aa7471d228eb6dfddd0d201ea9746d6a2020972a

Author: Jani Nikula <[email protected]>
Date:   Wed Apr 1 11:15:21 2015 +0300

drm/i915: add i915 specific connector debugfs file for DPCD

---
 drivers/gpu/drm/i915/i915_drv.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
index 822f2591e3c5..8cbb20cd63e6 100644
@@ -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
 
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw
Quoted 10 lines · Jani Nikula

Fix DEBUG_FS=n build broken by

commit aa7471d228eb6dfddd0d201ea9746d6a2020972a

Author: Jani Nikula <[email protected]>
Date:   Wed Apr 1 11:15:21 2015 +0300

drm/i915: add i915 specific connector debugfs file for DPCD

Queued for -next, thanks for the patch.
-Daniel

Quoted 28 lines
---
 drivers/gpu/drm/i915/i915_drv.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +2 -1
index 822f2591e3c5..8cbb20cd63e6 100644
@@ -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
 
Signature · 6 lines
2.1.4

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tested-by on v1 1/1
#2 lore raw
In reply to Jani Nikula

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 [email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx