drm/i915: Rename conditional GEM execution macros

After a brief discussion, we settled on a naming convention for the
conditional GEM debugging data that should be clearer to the casual
user: GEM_DEBUG

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170207102319.10910-1-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

diff --git a/drivers/gpu/drm/i915/i915_gem.h b/drivers/gpu/drm/i915/i915_gem.h
index 412fa2794cbb40be7e5d0de6c74fce0b26bec874..5a49487368ca39826017207effb5db4fb4c7f514 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem.h
+++ b/drivers/gpu/drm/i915/i915_gem.h
@@ -29,17 +29,17 @@
 #define GEM_BUG_ON(expr) BUG_ON(expr)
 #define GEM_WARN_ON(expr) WARN_ON(expr)
 
-#define GEM_BUG_ONLY(expr) expr
-#define GEM_BUG_ONLY_DECLARE(var) var
-#define GEM_BUG_ONLY_ON(expr) GEM_BUG_ON(expr)
+#define GEM_DEBUG_DECL(var) var
+#define GEM_DEBUG_EXEC(expr) expr
+#define GEM_DEBUG_BUG_ON(expr) GEM_BUG_ON(expr)
 
 #else
 #define GEM_BUG_ON(expr) BUILD_BUG_ON_INVALID(expr)
 #define GEM_WARN_ON(expr) (BUILD_BUG_ON_INVALID(expr), 0)
 
-#define GEM_BUG_ONLY(expr) do { } while (0)
-#define GEM_BUG_ONLY_DECLARE(var)
-#define GEM_BUG_ONLY_ON(expr)
+#define GEM_DEBUG_DECL(var)
+#define GEM_DEBUG_EXEC(expr) do { } while (0)
+#define GEM_DEBUG_BUG_ON(expr)
 #endif
 
 #define I915_NUM_ENGINES 5

diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c
index 697776d427b94b2e629241ab5c0eff551e83702e..af717e1356a9fb910547088b461b91a51d75f96a 100644 (file)
--- a/drivers/gpu/drm/i915/intel_lrc.c
+++ b/drivers/gpu/drm/i915/intel_lrc.c
@@ -351,7 +351,7 @@ static void execlists_submit_ports(struct intel_engine_cs *engine)
                execlists_context_status_change(port[0].request,
                                                INTEL_CONTEXT_SCHEDULE_IN);
        desc[0] = execlists_update_context(port[0].request);
-       GEM_BUG_ONLY(port[0].context_id = upper_32_bits(desc[0]));
+       GEM_DEBUG_EXEC(port[0].context_id = upper_32_bits(desc[0]));
        port[0].count++;
 
        if (port[1].request) {
@@ -359,7 +359,7 @@ static void execlists_submit_ports(struct intel_engine_cs *engine)
                execlists_context_status_change(port[1].request,
                                                INTEL_CONTEXT_SCHEDULE_IN);
                desc[1] = execlists_update_context(port[1].request);
-               GEM_BUG_ONLY(port[1].context_id = upper_32_bits(desc[1]));
+               GEM_DEBUG_EXEC(port[1].context_id = upper_32_bits(desc[1]));
                port[1].count = 1;
        } else {
                desc[1] = 0;
@@ -583,8 +583,8 @@ static void intel_lrc_irq_handler(unsigned long data)
                                continue;
 
                        /* Check the context/desc id for this event matches */
-                       GEM_BUG_ONLY_ON(readl(buf + 2 * idx + 1) !=
-                                       port[0].context_id);
+                       GEM_DEBUG_BUG_ON(readl(buf + 2 * idx + 1) !=
+                                        port[0].context_id);
 
                        GEM_BUG_ON(port[0].count == 0);
                        if (--port[0].count == 0) {

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 8ae78b79178f338a44e717d0eed7213c9db9978a..9fba5664376e776b6bf3ab8be92ad16143389608 100644 (file)
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -2284,7 +2284,7 @@ int intel_ring_begin(struct drm_i915_gem_request *req, int num_dwords)
 
        ring->space -= bytes;
        GEM_BUG_ON(ring->space < 0);
-       GEM_BUG_ONLY(ring->advance = ring->tail + bytes);
+       GEM_DEBUG_EXEC(ring->advance = ring->tail + bytes);
        return 0;
 }
 

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h
index 896838ca502ced863045efb07aeffd16879ec239..b122c3cc6dbb044f98b734630094b751e2f889e9 100644 (file)
--- a/drivers/gpu/drm/i915/intel_ringbuffer.h
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.h
@@ -144,7 +144,7 @@ struct intel_ring {
 
        u32 head;
        u32 tail;
-       GEM_BUG_ONLY_DECLARE(u32 advance);
+       GEM_DEBUG_DECL(u32 advance);
 
        int space;
        int size;
@@ -381,7 +381,7 @@ struct intel_engine_cs {
        struct execlist_port {
                struct drm_i915_gem_request *request;
                unsigned int count;
-               GEM_BUG_ONLY_DECLARE(u32 context_id);
+               GEM_DEBUG_DECL(u32 context_id);
        } execlist_port[2];
        struct rb_root execlist_queue;
        struct rb_node *execlist_first;
@@ -519,7 +519,7 @@ static inline void intel_ring_advance(struct intel_ring *ring)
         * reserved for the command packet (i.e. the value passed to
         * intel_ring_begin()).
         */
-       GEM_BUG_ONLY_ON(ring->tail != ring->advance);
+       GEM_DEBUG_BUG_ON(ring->tail != ring->advance);
 }
 
 static inline u32 intel_ring_offset(struct intel_ring *ring, void *addr)