Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99f2eb96 authored by Tvrtko Ursulin's avatar Tvrtko Ursulin
Browse files

drm/i915: Move intel_gt_pm_init under intel_gt_init_early 



And also rename to intel_gt_pm_init_early and make it operate on gt.

Signed-off-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Suggested-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20190621070811.7006-5-tvrtko.ursulin@linux.intel.com
parent 724e9564

drivers/gpu/drm/i915/gt/intel_gt.c

+3 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include "i915_drv.h"



#include "intel_gt.h"

#include "intel_gt_pm.h"



void intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915)

{
@@ -16,4 +17,6 @@ void intel_gt_init_early(struct intel_gt *gt, struct drm_i915_private *i915) 
	INIT_LIST_HEAD(&gt->closed_vma);



	spin_lock_init(&gt->closed_lock);



	intel_gt_pm_init_early(gt);

}

drivers/gpu/drm/i915/gt/intel_gt_pm.c

+3 −3
Original line number Diff line number Diff line
@@ -80,10 +80,10 @@ void intel_gt_pm_put(struct drm_i915_private *i915) 
	intel_wakeref_put(&i915->runtime_pm, &i915->gt.wakeref, intel_gt_park);

}



void intel_gt_pm_init(struct drm_i915_private *i915)

void intel_gt_pm_init_early(struct intel_gt *gt)

{

	intel_wakeref_init(&i915->gt.wakeref);

	BLOCKING_INIT_NOTIFIER_HEAD(&i915->gt.pm_notifications);

	intel_wakeref_init(&gt->wakeref);

	BLOCKING_INIT_NOTIFIER_HEAD(&gt->pm_notifications);

}



static bool reset_engines(struct drm_i915_private *i915)

drivers/gpu/drm/i915/gt/intel_gt_pm.h

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/types.h>



struct drm_i915_private;

struct intel_gt;



enum {

	INTEL_GT_UNPARK,
@@ -19,7 +20,7 @@ enum { 
void intel_gt_pm_get(struct drm_i915_private *i915);

void intel_gt_pm_put(struct drm_i915_private *i915);



void intel_gt_pm_init(struct drm_i915_private *i915);

void intel_gt_pm_init_early(struct intel_gt *gt);



void intel_gt_sanitize(struct drm_i915_private *i915, bool force);

void intel_gt_resume(struct drm_i915_private *i915);

drivers/gpu/drm/i915/i915_gem.c

+0 −2
Original line number Diff line number Diff line
@@ -1746,8 +1746,6 @@ int i915_gem_init_early(struct drm_i915_private *dev_priv) 
{

	int err;



	intel_gt_pm_init(dev_priv);



	i915_gem_init__mm(dev_priv);

	i915_gem_init__pm(dev_priv);

drivers/gpu/drm/i915/selftests/mock_gem_device.c

+0 −1
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ struct drm_i915_private *mock_gem_device(void) 
	mock_uncore_init(&i915->uncore);

	i915_gem_init__mm(i915);

	intel_gt_init_early(&i915->gt, i915);

	intel_gt_pm_init(i915);

	atomic_inc(&i915->gt.wakeref.count); /* disable; no hw support */



	init_waitqueue_head(&i915->gpu_error.wait_queue);