[4/4] tidy

Commit Message

Chris Wilson Feb. 20, 2020, 1:43 a.m. UTC

---
 drivers/gpu/drm/i915/gt/gen7_renderclear.c          | 13 +++++++------
 .../gt/{gen7_5_clearbuffer.h => hsw_clear_kernel.c} | 10 +---------
 .../gt/{gen7_clearbuffer.h => ivb_clear_kernel.c}   | 10 +---------
 3 files changed, 9 insertions(+), 24 deletions(-)
 rename drivers/gpu/drm/i915/gt/{gen7_5_clearbuffer.h => hsw_clear_kernel.c} (93%)
 rename drivers/gpu/drm/i915/gt/{gen7_clearbuffer.h => ivb_clear_kernel.c} (93%)

Patch

diff --git a/drivers/gpu/drm/i915/gt/gen7_renderclear.c b/drivers/gpu/drm/i915/gt/gen7_renderclear.c
index beeb2e82c6fe..adac4487d793 100644
--- a/drivers/gpu/drm/i915/gt/gen7_renderclear.c
+++ b/drivers/gpu/drm/i915/gt/gen7_renderclear.c
@@ -4,8 +4,6 @@ 
  */
 
 #include "gen7_renderclear.h"
-#include "gen7_5_clearbuffer.h"
-#include "gen7_clearbuffer.h"
 #include "i915_drv.h"
 #include "intel_gpu_commands.h"
 
@@ -21,8 +19,11 @@  struct cb_kernel {
 
 #define CB_KERNEL(name) { .data = (name), .size = sizeof(name) }
 
-static const struct cb_kernel cb_kernel_gen7 = CB_KERNEL(ivb_eu_kernel);
-static const struct cb_kernel cb_kernel_gen7_5 = CB_KERNEL(hsw_eu_kernel);
+#include "ivb_clear_kernel.c"
+static const struct cb_kernel cb_kernel_ivb = CB_KERNEL(ivb_clear_kernel);
+
+#include "hsw_clear_kernel.c"
+static const struct cb_kernel cb_kernel_hsw = CB_KERNEL(hsw_clear_kernel);
 
 struct batch_chunk {
 	struct i915_vma *vma;
@@ -355,8 +356,8 @@  static void emit_batch(struct i915_vma * const vma,
 	interface_descriptor =
 		gen7_fill_interface_descriptor(&state, bv,
 					       IS_HASWELL(i915) ?
-					       &cb_kernel_gen7_5 :
-					       &cb_kernel_gen7,
+					       &cb_kernel_hsw :
+					       &cb_kernel_ivb,
 					       desc_count);
 	gen7_emit_pipeline_flush(&cmds);
 	batch_add(&cmds, PIPELINE_SELECT | PIPELINE_SELECT_MEDIA);
diff --git a/drivers/gpu/drm/i915/gt/gen7_5_clearbuffer.h b/drivers/gpu/drm/i915/gt/hsw_clear_kernel.c
similarity index 93%
rename from drivers/gpu/drm/i915/gt/gen7_5_clearbuffer.h
rename to drivers/gpu/drm/i915/gt/hsw_clear_kernel.c
index 126e8133b951..3061de70a88a 100644
--- a/drivers/gpu/drm/i915/gt/gen7_5_clearbuffer.h
+++ b/drivers/gpu/drm/i915/gt/hsw_clear_kernel.c
@@ -5,13 +5,7 @@ 
  * Generate by: Intel-gpu-tools on Thu 13 Feb 2020 01:06:41 AM UTC
  */
 
-#ifndef __GEN7_5_CLEARBUFFER_H__
-#define __GEN7_5_CLEARBUFFER_H__
-
-#include <linux/types.h>
-
-/* Media CB Kernel for gen7.5 devices */
-const u32 hsw_eu_kernel[] = {
+static const u32 hsw_clear_kernel[] = {
 	0x00000001, 0x26020128, 0x00000024, 0x00000000,
 	0x00000040, 0x20280c21, 0x00000028, 0x00000001,
 	0x01000010, 0x20000c20, 0x0000002c, 0x00000000,
@@ -65,5 +59,3 @@  const u32 hsw_eu_kernel[] = {
 	0x00010220, 0x34001c00, 0x00001400, 0xffffffc0,
 	0x07600032, 0x20000fa0, 0x008d0fe0, 0x82000010,
 };
-
-#endif /* __GEN7_5_CLEARBUFFER_H__ */
diff --git a/drivers/gpu/drm/i915/gt/gen7_clearbuffer.h b/drivers/gpu/drm/i915/gt/ivb_clear_kernel.c
similarity index 93%
rename from drivers/gpu/drm/i915/gt/gen7_clearbuffer.h
rename to drivers/gpu/drm/i915/gt/ivb_clear_kernel.c
index 524189d90ded..b1cd3479527e 100644
--- a/drivers/gpu/drm/i915/gt/gen7_clearbuffer.h
+++ b/drivers/gpu/drm/i915/gt/ivb_clear_kernel.c
@@ -5,13 +5,7 @@ 
  * Generate by: Intel-gpu-tools on Thu 13 Feb 2020 01:05:56 AM UTC
  */
 
-#ifndef __GEN7_CLEARBUFFER_H__
-#define __GEN7_CLEARBUFFER_H__
-
-#include <linux/types.h>
-
-/* Media CB Kernel for gen7 devices */
-const u32 ivb_eu_kernel[] = {
+static const u32 ivb_clear_kernel[] = {
 	0x00000001, 0x26020128, 0x00000024, 0x00000000,
 	0x00000040, 0x20280c21, 0x00000028, 0x00000001,
 	0x01000010, 0x20000c20, 0x0000002c, 0x00000000,
@@ -65,5 +59,3 @@  const u32 ivb_eu_kernel[] = {
 	0x00010220, 0x34001c00, 0x00001400, 0xfffffff8,
 	0x07600032, 0x20000fa0, 0x008d0fe0, 0x82000010,
 };
-
-#endif /* __GEN7_CLEARBUFFER_H__ */