Skip to contentSkip to conversation

drm/i915: Unify GuC variable types to avoid floding checkpatch.pl

PATCH Superseded Joonas Lahtinen 3 participants 3 messages Oct 6, 2017

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Joonas Lahtinen

author maintainer
#0 lore raw

PATCH 1/1 drm/i915: Unify GuC variable types to avoid floding checkpatch.pl

With the code motion mostly done, convert all the GuC code away from uint??_t at once (only a couple dozen variables), so that reading the checkpatch.pl output should actually pinpoint if a new uint??_t was accidentally introduced.

Cc Michal Wajdeczko <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Michał Winiarski <[email protected]>
Cc Sagar Arun Kamble <[email protected]>
Cc Anusha Srivatsa <[email protected]>
Cc Sujaritha Sundaresan <[email protected]>
---
 drivers/gpu/drm/i915/i915_guc_submission.c | 10 +++----
 drivers/gpu/drm/i915/i915_guc_submission.h |  8 ++---
 drivers/gpu/drm/i915/intel_guc.h           |  3 +-
 drivers/gpu/drm/i915/intel_guc_fwif.h      | 48 +++++++++++++++---------------
 drivers/gpu/drm/i915/intel_guc_log.c       |  3 +-
 drivers/gpu/drm/i915/intel_guc_log.h       |  2 +-
 6 files changed, 38 insertions(+), 36 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +5 -5
index 7460ab4a214c..a2fad82532e4 100644
@@ -338,7 +338,7 @@ static void guc_stage_desc_init(struct intel_guc *guc,
 
 	for_each_engine_masked(engine, dev_priv, client->engines, tmp) {
 		struct intel_context *ce = &ctx->engine[engine->id];
-		uint32_t guc_engine_id = engine->guc_id;
+		u32 guc_engine_id = engine->guc_id;
 		struct guc_execlist_context *lrc = &desc->lrc[guc_engine_id];
 
 		/* TODO: We have a design issue to be solved here. Only when we
@@ -388,13 +388,13 @@ static void guc_stage_desc_init(struct intel_guc *guc,
 	gfx_addr = guc_ggtt_offset(client->vma);
 	desc->db_trigger_phy = sg_dma_address(client->vma->pages->sgl) +
 				client->doorbell_offset;
-	desc->db_trigger_cpu = (uintptr_t)__get_doorbell(client);
+	desc->db_trigger_cpu = (u64)__get_doorbell(client);
 	desc->db_trigger_uk = gfx_addr + client->doorbell_offset;
 	desc->process_desc = gfx_addr + client->proc_desc_offset;
 	desc->wq_addr = gfx_addr + GUC_DB_SIZE;
 	desc->wq_size = GUC_WQ_SIZE;
 
-	desc->desc_private = (uintptr_t)client;
+	desc->desc_private = (u64)client;
 }
 
 static void guc_stage_desc_fini(struct intel_guc *guc,
@@ -755,8 +755,8 @@ static int guc_init_doorbell_hw(struct intel_guc *guc)
  */
 static struct i915_guc_client *
 guc_client_alloc(struct drm_i915_private *dev_priv,
-		 uint32_t engines,
-		 uint32_t priority,
+		 u32 engines,
+		 u32 priority,
 		 struct i915_gem_context *ctx)
 {
 	struct i915_guc_client *client;
drivers/gpu/drm/i915/i915_guc_submission.h +4 -4
index a7e61e6246ff..cb4353b59059 100644
@@ -59,17 +59,17 @@ struct i915_guc_client {
 	struct intel_guc *guc;
 
 	/* bitmap of (host) engine ids */
-	uint32_t engines;
-	uint32_t priority;
+	u32 engines;
+	u32 priority;
 	u32 stage_id;
-	uint32_t proc_desc_offset;
+	u32 proc_desc_offset;
 
 	u16 doorbell_id;
 	unsigned long doorbell_offset;
 
 	spinlock_t wq_lock;
 	/* Per-engine counts of GuC submissions */
-	uint64_t submissions[I915_NUM_ENGINES];
+	u64 submissions[I915_NUM_ENGINES];
 };
 
 int i915_guc_submission_init(struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_guc.h +2 -1
index 094d64980882..aa9a7b55be6e 100644
@@ -52,7 +52,8 @@ struct intel_guc {
 	struct i915_guc_client *execbuf_client;
 
 	DECLARE_BITMAP(doorbell_bitmap, GUC_NUM_DOORBELLS);
-	uint32_t db_cacheline;		/* Cyclic counter mod pagesize	*/
+	/* Cyclic counter mod pagesize	*/
+	u32 db_cacheline;
 
 	/* GuC's FW specific registers used in MMIO send */
 	struct {
drivers/gpu/drm/i915/intel_guc_fwif.h +24 -24

73 lines not on this page · raw message

drivers/gpu/drm/i915/intel_guc_log.c +2 -1
index b7317a13354a..76d3eb1e4614 100644
@@ -528,7 +528,8 @@ int intel_guc_log_create(struct intel_guc *guc)
 {
 	struct i915_vma *vma;
 	unsigned long offset;
-	uint32_t size, flags;
+	u32 flags;
+	u32 size;
 	int ret;
 
 	GEM_BUG_ON(guc->log.vma);
drivers/gpu/drm/i915/intel_guc_log.h +1 -1
index b5ec374d9b15..f512cf79339b 100644
@@ -33,7 +33,7 @@ struct drm_i915_private;
 struct intel_guc;
 
 struct intel_guc_log {
-	uint32_t flags;
+	u32 flags;
 	struct i915_vma *vma;
 	/* The runtime stuff gets created only when GuC logging gets enabled */
 	struct {
Signature · 6 lines
2.13.6

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Joonas Lahtinen

With the code motion mostly done, convert all the GuC code away from uint??_t at once (only a couple dozen variables), so that reading the checkpatch.pl output should actually pinpoint if a new uint??_t was accidentally introduced.

Quoted 7 lines
Cc Michal Wajdeczko <[email protected]>
Cc Chris Wilson <[email protected]>
Cc Michał Winiarski <[email protected]>
Cc Sagar Arun Kamble <[email protected]>
Cc Anusha Srivatsa <[email protected]>
Cc Sujaritha Sundaresan <[email protected]>

Looks good to me.

Spotted few more uint??_t in intel_uc_fw.h. Will you include updates to those in this same patch? If you want to limit this patch to GuC just a minor nitpick "drm/i915/guc".

Quoted 186 lines
---
  drivers/gpu/drm/i915/i915_guc_submission.c | 10 +++----
  drivers/gpu/drm/i915/i915_guc_submission.h |  8 ++---
  drivers/gpu/drm/i915/intel_guc.h           |  3 +-
  drivers/gpu/drm/i915/intel_guc_fwif.h      | 48 +++++++++++++++---------------
  drivers/gpu/drm/i915/intel_guc_log.c       |  3 +-
  drivers/gpu/drm/i915/intel_guc_log.h       |  2 +-
  6 files changed, 38 insertions(+), 36 deletions(-)
drivers/gpu/drm/i915/i915_guc_submission.c +5 -5
index 7460ab4a214c..a2fad82532e4 100644
@@ -338,7 +338,7 @@ static void guc_stage_desc_init(struct intel_guc *guc,
 
  	for_each_engine_masked(engine, dev_priv, client->engines, tmp) {
  		struct intel_context *ce = &ctx->engine[engine->id];
-		uint32_t guc_engine_id = engine->guc_id;
+		u32 guc_engine_id = engine->guc_id;
  		struct guc_execlist_context *lrc = &desc->lrc[guc_engine_id];
 
  		/* TODO: We have a design issue to be solved here. Only when we
@@ -388,13 +388,13 @@ static void guc_stage_desc_init(struct intel_guc *guc,
  	gfx_addr = guc_ggtt_offset(client->vma);
  	desc->db_trigger_phy = sg_dma_address(client->vma->pages->sgl) +
  				client->doorbell_offset;
-	desc->db_trigger_cpu = (uintptr_t)__get_doorbell(client);
+	desc->db_trigger_cpu = (u64)__get_doorbell(client);
  	desc->db_trigger_uk = gfx_addr + client->doorbell_offset;
  	desc->process_desc = gfx_addr + client->proc_desc_offset;
  	desc->wq_addr = gfx_addr + GUC_DB_SIZE;
  	desc->wq_size = GUC_WQ_SIZE;
 
-	desc->desc_private = (uintptr_t)client;
+	desc->desc_private = (u64)client;
  }
 
  static void guc_stage_desc_fini(struct intel_guc *guc,
@@ -755,8 +755,8 @@ static int guc_init_doorbell_hw(struct intel_guc *guc)
   */
  static struct i915_guc_client *
  guc_client_alloc(struct drm_i915_private *dev_priv,
-		 uint32_t engines,
-		 uint32_t priority,
+		 u32 engines,
+		 u32 priority,
  		 struct i915_gem_context *ctx)
  {
  	struct i915_guc_client *client;
drivers/gpu/drm/i915/i915_guc_submission.h +4 -4
index a7e61e6246ff..cb4353b59059 100644
@@ -59,17 +59,17 @@ struct i915_guc_client {
  	struct intel_guc *guc;
 
  	/* bitmap of (host) engine ids */
-	uint32_t engines;
-	uint32_t priority;
+	u32 engines;
+	u32 priority;
  	u32 stage_id;
-	uint32_t proc_desc_offset;
+	u32 proc_desc_offset;
 
  	u16 doorbell_id;
  	unsigned long doorbell_offset;
 
  	spinlock_t wq_lock;
  	/* Per-engine counts of GuC submissions */
-	uint64_t submissions[I915_NUM_ENGINES];
+	u64 submissions[I915_NUM_ENGINES];
  };
 
  int i915_guc_submission_init(struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_guc.h +2 -1
index 094d64980882..aa9a7b55be6e 100644
@@ -52,7 +52,8 @@ struct intel_guc {
  	struct i915_guc_client *execbuf_client;
 
  	DECLARE_BITMAP(doorbell_bitmap, GUC_NUM_DOORBELLS);
-	uint32_t db_cacheline;		/* Cyclic counter mod pagesize	*/
+	/* Cyclic counter mod pagesize	*/
+	u32 db_cacheline;
 
  	/* GuC's FW specific registers used in MMIO send */
  	struct {
drivers/gpu/drm/i915/intel_guc_fwif.h +24 -24
index 7eb6b4fa1d6f..1c0a2a3de121 100644
@@ -178,49 +178,49 @@
   */
 
  struct uc_css_header {
-	uint32_t module_type;
+	u32 module_type;
  	/* header_size includes all non-uCode bits, including css_header, rsa
  	 * key, modulus key and exponent data. */
-	uint32_t header_size_dw;
-	uint32_t header_version;
-	uint32_t module_id;
-	uint32_t module_vendor;
+	u32 header_size_dw;
+	u32 header_version;
+	u32 module_id;
+	u32 module_vendor;
  	union {
  		struct {
-			uint8_t day;
-			uint8_t month;
-			uint16_t year;
+			u8 day;
+			u8 month;
+			u16 year;
  		};
-		uint32_t date;
+		u32 date;
  	};
-	uint32_t size_dw; /* uCode plus header_size_dw */
-	uint32_t key_size_dw;
-	uint32_t modulus_size_dw;
-	uint32_t exponent_size_dw;
+	u32 size_dw; /* uCode plus header_size_dw */
+	u32 key_size_dw;
+	u32 modulus_size_dw;
+	u32 exponent_size_dw;
  	union {
  		struct {
-			uint8_t hour;
-			uint8_t min;
-			uint16_t sec;
+			u8 hour;
+			u8 min;
+			u16 sec;
  		};
-		uint32_t time;
+		u32 time;
  	};
 
  	char username[8];
  	char buildnumber[12];
  	union {
  		struct {
-			uint32_t branch_client_version;
-			uint32_t sw_version;
+			u32 branch_client_version;
+			u32 sw_version;
  	} guc;
  		struct {
-			uint32_t sw_version;
-			uint32_t reserved;
+			u32 sw_version;
+			u32 reserved;
  	} huc;
  	};
-	uint32_t prod_preprod_fw;
-	uint32_t reserved[12];
-	uint32_t header_info;
+	u32 prod_preprod_fw;
+	u32 reserved[12];
+	u32 header_info;
  } __packed;
 
  struct guc_doorbell_info {
drivers/gpu/drm/i915/intel_guc_log.c +2 -1
index b7317a13354a..76d3eb1e4614 100644
@@ -528,7 +528,8 @@ int intel_guc_log_create(struct intel_guc *guc)
  {
  	struct i915_vma *vma;
  	unsigned long offset;
-	uint32_t size, flags;
+	u32 flags;
+	u32 size;
  	int ret;
 
  	GEM_BUG_ON(guc->log.vma);
drivers/gpu/drm/i915/intel_guc_log.h +0 -0
index b5ec374d9b15..f512cf79339b 100644

drivers/gpu/drm/i915/intel_guc_log.h struct drm_i915_private; · line 39

Quoted 8 lines
drivers/gpu/drm/i915/intel_guc_log.h +1 -1
@@ -33,7 +33,7 @@ struct drm_i915_private;
  struct intel_guc;
 
  struct intel_guc_log {
-	uint32_t flags;
+	u32 flags;
  	struct i915_vma *vma;
  	/* The runtime stuff gets created only when GuC logging gets enabled */
  	struct {

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw

✗ Fi.CI.BAT: failure for drm/i915: Unify GuC variable types to avoid floding checkpatch.pl

In reply to Joonas Lahtinen
== Series Details ==

== Series Details ==

Series: drm/i915: Unify GuC variable types to avoid floding checkpatch.pl
URL : https://patchwork.freedesktop.org/series/31469/
State : failure

== Summary ==

Series 31469 revision 1 was fully merged or fully failed: no git log

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx