[Intel-gfx] [PATCH] drm/i915: Unify GuC variable types to avoid floding checkpatch.pl
Sagar Arun Kamble
sagar.a.kamble at intel.com
Fri Oct 6 08:44:18 UTC 2017
On 10/6/2017 12:41 PM, Joonas Lahtinen wrote:
> 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.
>
> Signed-off-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> Cc: Michal Wajdeczko <michal.wajdeczko at intel.com>
> Cc: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Michał Winiarski <michal.winiarski at intel.com>
> Cc: Sagar Arun Kamble <sagar.a.kamble at intel.com>
> Cc: Anusha Srivatsa <anusha.srivatsa at intel.com>
> Cc: Sujaritha Sundaresan <sujaritha.sundaresan at intel.com>
Looks good to me.
Reviewed-by: Sagar Arun Kamble <sagar.a.kamble at intel.com>
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".
> ---
> 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(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_guc_submission.c b/drivers/gpu/drm/i915/i915_guc_submission.c
> index 7460ab4a214c..a2fad82532e4 100644
> --- a/drivers/gpu/drm/i915/i915_guc_submission.c
> +++ b/drivers/gpu/drm/i915/i915_guc_submission.c
> @@ -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;
> diff --git a/drivers/gpu/drm/i915/i915_guc_submission.h b/drivers/gpu/drm/i915/i915_guc_submission.h
> index a7e61e6246ff..cb4353b59059 100644
> --- a/drivers/gpu/drm/i915/i915_guc_submission.h
> +++ b/drivers/gpu/drm/i915/i915_guc_submission.h
> @@ -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);
> diff --git a/drivers/gpu/drm/i915/intel_guc.h b/drivers/gpu/drm/i915/intel_guc.h
> index 094d64980882..aa9a7b55be6e 100644
> --- a/drivers/gpu/drm/i915/intel_guc.h
> +++ b/drivers/gpu/drm/i915/intel_guc.h
> @@ -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 {
> diff --git a/drivers/gpu/drm/i915/intel_guc_fwif.h b/drivers/gpu/drm/i915/intel_guc_fwif.h
> index 7eb6b4fa1d6f..1c0a2a3de121 100644
> --- a/drivers/gpu/drm/i915/intel_guc_fwif.h
> +++ b/drivers/gpu/drm/i915/intel_guc_fwif.h
> @@ -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 {
> diff --git a/drivers/gpu/drm/i915/intel_guc_log.c b/drivers/gpu/drm/i915/intel_guc_log.c
> index b7317a13354a..76d3eb1e4614 100644
> --- a/drivers/gpu/drm/i915/intel_guc_log.c
> +++ b/drivers/gpu/drm/i915/intel_guc_log.c
> @@ -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);
> diff --git a/drivers/gpu/drm/i915/intel_guc_log.h b/drivers/gpu/drm/i915/intel_guc_log.h
> index b5ec374d9b15..f512cf79339b 100644
> --- a/drivers/gpu/drm/i915/intel_guc_log.h
> +++ b/drivers/gpu/drm/i915/intel_guc_log.h
> @@ -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 {
More information about the Intel-gfx
mailing list