[Intel-gfx] [PATCH 3/6] drm/i915: pass dev_priv to intel_device_info_runtime_init()

[Tvrtko Ursulin]

On 31/12/2018 14:56, Jani Nikula wrote:
> With the static/runtime device info split, this makes more sense.
> 
> Cc: Tvrtko Ursulin <tvrtko.ursulin at linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
> ---
>   drivers/gpu/drm/i915/i915_drv.c          | 2 +-
>   drivers/gpu/drm/i915/intel_device_info.c | 5 ++---
>   drivers/gpu/drm/i915/intel_device_info.h | 2 +-
>   3 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index f884b9a138cd..261932ee6837 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1374,7 +1374,7 @@ static int i915_driver_init_hw(struct drm_i915_private *dev_priv)
>   	if (i915_inject_load_failure())
>   		return -ENODEV;
>   
> -	intel_device_info_runtime_init(mkwrite_device_info(dev_priv));
> +	intel_device_info_runtime_init(dev_priv);
>   
>   	if (HAS_PPGTT(dev_priv)) {
>   		if (intel_vgpu_active(dev_priv) &&
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> index ffc5d75aa690..f35e8cff4b99 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -738,10 +738,9 @@ static u32 read_timestamp_frequency(struct drm_i915_private *dev_priv)
>    *   - after the PCH has been detected,
>    *   - before the first usage of the fields it can tweak.
>    */
> -void intel_device_info_runtime_init(struct intel_device_info *info)
> +void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
>   {
> -	struct drm_i915_private *dev_priv =
> -		container_of(info, struct drm_i915_private, info);
> +	struct intel_device_info *info = mkwrite_device_info(dev_priv);
>   	struct intel_runtime_info *runtime = RUNTIME_INFO(dev_priv);
>   	enum pipe pipe;
>   
> diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
> index fa81ee15dfa1..f0e6d374d4ec 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.h
> +++ b/drivers/gpu/drm/i915/intel_device_info.h
> @@ -266,7 +266,7 @@ static inline void sseu_set_eus(struct sseu_dev_info *sseu,
>   
>   const char *intel_platform_name(enum intel_platform platform);
>   
> -void intel_device_info_runtime_init(struct intel_device_info *info);
> +void intel_device_info_runtime_init(struct drm_i915_private *dev_priv);
>   void intel_device_info_dump(const struct intel_device_info *info,
>   			    struct drm_printer *p);
>   void intel_device_info_dump_flags(const struct intel_device_info *info,
> 

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin at intel.com>

Regards,

Tvrtko