Skip to contentSkip to conversation

drm/i915: Typo in #define

PATCH Applied Nicolas Kaiser 3 participants 3 messages Jun 8, 2010 – Jul 26, 2010

Subsystems (2)
DRM drivers Intel i915
lore
Share & tools
lore

Nicolas Kaiser

author
#0 lore raw

PATCH 1/1 drm/i915: Typo in #define

checkpatch complains about this define:

WARNING: space prohibited between function name and open parenthesis '(' #377: FILE: gpu/drm/i915/i915_reg.h:377:
+#define GEN6_RENDER TIMEOUT_COUNTER_EXPIRED (1 << 6)

Signed-off-by Nicolas Kaiser <[email protected]>

---

drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -374,7 +374,7 @@
 #define GEN6_RENDER_IMR		0x20a8
 #define   GEN6_RENDER_CONTEXT_SWITCH_INTERRUPT		(1 << 8)
 #define   GEN6_RENDER_PPGTT_PAGE_FAULT			(1 << 7)
-#define   GEN6_RENDER TIMEOUT_COUNTER_EXPIRED		(1 << 6)
+#define   GEN6_RENDER_TIMEOUT_COUNTER_EXPIRED		(1 << 6)
 #define   GEN6_RENDER_L3_PARITY_ERROR			(1 << 5)
 #define   GEN6_RENDER_PIPE_CONTROL_NOTIFY_INTERRUPT	(1 << 4)
 #define   GEN6_RENDER_COMMAND_PARSER_MASTER_ERROR	(1 << 3)
Acked-by on v1 1/1
#1 lore raw
Quoted 12 lines · Nicolas Kaiser

checkpatch complains about this define:

WARNING: space prohibited between function name and open parenthesis '(' #377: FILE: gpu/drm/i915/i915_reg.h:377:
+#define GEN6_RENDER TIMEOUT_COUNTER_EXPIRED (1 << 6)

Signed-off-by Nicolas Kaiser <[email protected]>

---

drivers/gpu/drm/i915/i915_reg.h line 380

Quoted 8 lines
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -374,7 +374,7 @@
 #define GEN6_RENDER_IMR		0x20a8
 #define   GEN6_RENDER_CONTEXT_SWITCH_INTERRUPT		(1 << 8)
 #define   GEN6_RENDER_PPGTT_PAGE_FAULT			(1 << 7)
-#define   GEN6_RENDER TIMEOUT_COUNTER_EXPIRED		(1 << 6)
+#define   GEN6_RENDER_TIMEOUT_COUNTER_EXPIRED		(1 << 6)
 #define   GEN6_RENDER_L3_PARITY_ERROR			(1 << 5)
 #define   GEN6_RENDER_PIPE_CONTROL_NOTIFY_INTERRUPT	(1 << 4)
 #define   GEN6_RENDER_COMMAND_PARSER_MASTER_ERROR	(1 << 3)

Thanks for catching this!

Acked-by Zhenyu Wang <[email protected]>
Signature · 3 lines
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Applied
#2 lore raw
Quoted 24 lines · Zhenyu Wang
Quoted 12 lines · Nicolas Kaiser

checkpatch complains about this define:

WARNING: space prohibited between function name and open parenthesis '(' #377: FILE: gpu/drm/i915/i915_reg.h:377:
+#define GEN6_RENDER TIMEOUT_COUNTER_EXPIRED (1 << 6)

Signed-off-by Nicolas Kaiser <[email protected]>

---

drivers/gpu/drm/i915/i915_reg.h line 380

Quoted 8 lines
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -374,7 +374,7 @@
 #define GEN6_RENDER_IMR		0x20a8
 #define   GEN6_RENDER_CONTEXT_SWITCH_INTERRUPT		(1 << 8)
 #define   GEN6_RENDER_PPGTT_PAGE_FAULT			(1 << 7)
-#define   GEN6_RENDER TIMEOUT_COUNTER_EXPIRED		(1 << 6)
+#define   GEN6_RENDER_TIMEOUT_COUNTER_EXPIRED		(1 << 6)
 #define   GEN6_RENDER_L3_PARITY_ERROR			(1 << 5)
 #define   GEN6_RENDER_PIPE_CONTROL_NOTIFY_INTERRUPT	(1 << 4)
 #define   GEN6_RENDER_COMMAND_PARSER_MASTER_ERROR	(1 << 3)

Thanks for catching this!

Quoted 1 line
Acked-by Zhenyu Wang <[email protected]>

Applied to -next.

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel