[Intel-gfx] [PATCH 21/21] drm/i915: Move global activity tracking from GEM to GT

[Tvrtko Ursulin]

On 02/09/2019 05:03, Chris Wilson wrote:
> As our global unpark/park keep track of the number of active users, we
> can simply move the accounting from the GEM layer to the base GT layer.
> It was placed originally inside GEM to benefit from the 100ms extra
> delay on idleness, but that has been eliminated and now there is no
> substantive difference between the layers. In moving it, we move another
> piece of the puzzle out from underneath struct_mutex.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
> Cc: Tvrtko Ursulin <tvrtko.ursulin at intel.com>
> ---
>   drivers/gpu/drm/i915/gem/i915_gem_pm.c | 11 +----------
>   drivers/gpu/drm/i915/gt/intel_gt_pm.c  |  5 +++++
>   2 files changed, 6 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pm.c b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
> index b459719386e3..5816bdb5bfa2 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_pm.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_pm.c
> @@ -10,14 +10,6 @@
>   #include "gt/intel_gt_requests.h"
>   
>   #include "i915_drv.h"
> -#include "i915_globals.h"
> -
> -static void i915_gem_park(struct drm_i915_private *i915)
> -{
> -	i915_vma_parked(i915);
> -
> -	i915_globals_park();
> -}
>   
>   static int pm_notifier(struct notifier_block *nb,
>   		       unsigned long action,
> @@ -28,11 +20,10 @@ static int pm_notifier(struct notifier_block *nb,
>   
>   	switch (action) {
>   	case INTEL_GT_UNPARK:
> -		i915_globals_unpark();
>   		break;
>   
>   	case INTEL_GT_PARK:
> -		i915_gem_park(i915);
> +		i915_vma_parked(i915);
>   		break;
>   	}
>   
> diff --git a/drivers/gpu/drm/i915/gt/intel_gt_pm.c b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
> index fa96e1ad7bd8..d31ad2d63175 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gt_pm.c
> +++ b/drivers/gpu/drm/i915/gt/intel_gt_pm.c
> @@ -5,6 +5,7 @@
>    */
>   
>   #include "i915_drv.h"
> +#include "i915_globals.h"
>   #include "i915_params.h"
>   #include "intel_context.h"
>   #include "intel_engine_pm.h"
> @@ -26,6 +27,8 @@ static int __gt_unpark(struct intel_wakeref *wf)
>   
>   	GEM_TRACE("\n");
>   
> +	i915_globals_unpark();
> +
>   	/*
>   	 * It seems that the DMC likes to transition between the DC states a lot
>   	 * when there are no connected displays (no active power domains) during
> @@ -77,6 +80,8 @@ static int __gt_park(struct intel_wakeref *wf)
>   	GEM_BUG_ON(!wakeref);
>   	intel_display_power_put(i915, POWER_DOMAIN_GT_IRQ, wakeref);
>   
> +	i915_globals_park();
> +
>   	return 0;
>   }
>   
> 

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

Regards,

Tvrtko