[Intel-gfx] [PATCH v2 10/11] drm/i915: Rearrange i915_gem_context

[Joonas Lahtinen]

On ma, 2016-05-23 at 12:34 +0100, Chris Wilson wrote:
> Pack the integers and related types together inside the struct.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h | 16 +++++++++-------
>  1 file changed, 9 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 9d7a088efc16..5dbce15e6e4c 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -829,7 +829,6 @@ struct i915_ctx_hang_stats {
>  /* This must match up with the value previously used for execbuf2.rsvd1. */
>  #define DEFAULT_CONTEXT_HANDLE 0
>  
> -#define CONTEXT_NO_ZEROMAP (1<<0)
>  /**
>   * struct i915_gem_context - as the name implies, represents a context.
>   * @ref: reference count.
> @@ -851,28 +850,31 @@ struct i915_ctx_hang_stats {
>   */
>  struct i915_gem_context {
>  	struct kref ref;
> -	int user_handle;
> -	uint8_t remap_slice;
>  	struct drm_i915_private *i915;
> -	int flags;
>  	struct drm_i915_file_private *file_priv;
> -	struct i915_ctx_hang_stats hang_stats;
>  	struct i915_hw_ppgtt *ppgtt;
>  
> +	struct i915_ctx_hang_stats hang_stats;
> +
>  	/* Unique identifier for this context, used by the hw for tracking */
>  	unsigned hw_id;
> +	uint32_t user_handle;
> +	unsigned long flags;
> +#define CONTEXT_NO_ZEROMAP		(1<<0)

Add spaces (1 << 0), otherwise DIM will complain.

Reviewed-by: Joonas Lahtinen <joonas.lahtinen at linux.intel.com>

>  
>  	struct intel_context {
>  		struct drm_i915_gem_object *state;
>  		struct intel_ringbuffer *ringbuf;
> -		int pin_count;
>  		struct i915_vma *lrc_vma;
> -		u64 lrc_desc;
>  		uint32_t *lrc_reg_state;
> +		u64 lrc_desc;
> +		int pin_count;
>  		bool initialised;
>  	} engine[I915_NUM_ENGINES];
>  
>  	struct list_head link;
> +
> +	uint8_t remap_slice;
>  };
>  
>  enum fb_op_origin {
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation