Commit 66101975 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Move request runtime management onto gt 



Requests are run from the gt and are tided into the gt runtime power
management, so pull the runtime request management under gt/

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191004134015.13204-12-chris@chris-wilson.co.uk
parent 789ed955

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ gt-y += \ 
	gt/intel_gt_irq.o \

	gt/intel_gt_pm.o \

	gt/intel_gt_pm_irq.o \

	gt/intel_gt_requests.o \

	gt/intel_hangcheck.o \

	gt/intel_lrc.o \

	gt/intel_rc6.o \

drivers/gpu/drm/i915/gem/i915_gem_mman.c

+3 −1
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/sizes.h>



#include "gt/intel_gt.h"

#include "gt/intel_gt_requests.h"



#include "i915_drv.h"

#include "i915_gem_gtt.h"
@@ -424,6 +425,7 @@ out: 
static int create_mmap_offset(struct drm_i915_gem_object *obj)

{

	struct drm_i915_private *i915 = to_i915(obj->base.dev);

	struct intel_gt *gt = &i915->gt;

	int err;



	err = drm_gem_create_mmap_offset(&obj->base);
@@ -431,7 +433,7 @@ static int create_mmap_offset(struct drm_i915_gem_object *obj) 
		return 0;



	/* Attempt to reap some mmap space from dead objects */

	err = i915_retire_requests_timeout(i915, MAX_SCHEDULE_TIMEOUT);

	err = intel_gt_retire_requests_timeout(gt, MAX_SCHEDULE_TIMEOUT);

	if (err)

		return err;

drivers/gpu/drm/i915/gem/i915_gem_pm.c

+4 −24
Original line number Diff line number Diff line
@@ -7,31 +7,18 @@ 
#include "gem/i915_gem_pm.h"

#include "gt/intel_gt.h"

#include "gt/intel_gt_pm.h"

#include "gt/intel_gt_requests.h"



#include "i915_drv.h"

#include "i915_globals.h"



static void i915_gem_park(struct drm_i915_private *i915)

{

	cancel_delayed_work(&i915->gem.retire_work);



	i915_vma_parked(i915);



	i915_globals_park();

}



static void retire_work_handler(struct work_struct *work)

{

	struct drm_i915_private *i915 =

		container_of(work, typeof(*i915), gem.retire_work.work);



	i915_retire_requests(i915);



	queue_delayed_work(i915->wq,

			   &i915->gem.retire_work,

			   round_jiffies_up_relative(HZ));

}



static int pm_notifier(struct notifier_block *nb,

		       unsigned long action,

		       void *data)
@@ -42,9 +29,6 @@ static int pm_notifier(struct notifier_block *nb, 
	switch (action) {

	case INTEL_GT_UNPARK:

		i915_globals_unpark();

		queue_delayed_work(i915->wq,

				   &i915->gem.retire_work,

				   round_jiffies_up_relative(HZ));

		break;



	case INTEL_GT_PARK:
@@ -59,7 +43,7 @@ static bool switch_to_kernel_context_sync(struct intel_gt *gt) 
{

	bool result = !intel_gt_is_wedged(gt);



	if (i915_gem_wait_for_idle(gt->i915, I915_GEM_IDLE_TIMEOUT) == -ETIME) {

	if (intel_gt_wait_for_idle(gt, I915_GEM_IDLE_TIMEOUT) == -ETIME) {

		/* XXX hide warning from gem_eio */

		if (i915_modparams.reset) {

			dev_err(gt->i915->drm.dev,
@@ -122,14 +106,12 @@ void i915_gem_suspend(struct drm_i915_private *i915) 
	 * state. Fortunately, the kernel_context is disposable and we do

	 * not rely on its state.

	 */

	switch_to_kernel_context_sync(&i915->gt);

	intel_gt_suspend(&i915->gt);

	intel_uc_suspend(&i915->gt.uc);



	cancel_delayed_work_sync(&i915->gt.hangcheck.work);



	i915_gem_drain_freed_objects(i915);



	intel_uc_suspend(&i915->gt.uc);

	intel_gt_suspend(&i915->gt);

}



static struct drm_i915_gem_object *first_mm_object(struct list_head *list)
@@ -239,8 +221,6 @@ err_wedged: 


void i915_gem_init__pm(struct drm_i915_private *i915)

{

	INIT_DELAYED_WORK(&i915->gem.retire_work, retire_work_handler);



	i915->gem.pm_notifier.notifier_call = pm_notifier;

	blocking_notifier_chain_register(&i915->gt.pm_notifications,

					 &i915->gem.pm_notifier);

drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c

+3 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 


#include "gem/i915_gem_pm.h"

#include "gt/intel_gt.h"

#include "gt/intel_gt_requests.h"

#include "gt/intel_reset.h"

#include "i915_selftest.h"
@@ -518,7 +519,7 @@ create_test_object(struct i915_address_space *vm, 
	int err;



	/* Keep in GEM's good graces */

	i915_retire_requests(vm->i915);

	intel_gt_retire_requests(vm->gt);



	size = min(vm->total / 2, 1024ull * DW_PER_PAGE * PAGE_SIZE);

	size = round_down(size, DW_PER_PAGE * PAGE_SIZE);
@@ -1136,7 +1137,7 @@ out: 
		igt_spinner_end(spin);



	if ((flags & TEST_IDLE) && ret == 0) {

		ret = i915_gem_wait_for_idle(ce->engine->i915,

		ret = intel_gt_wait_for_idle(ce->engine->gt,

					     MAX_SCHEDULE_TIMEOUT);

		if (ret)

			return ret;

drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c

+1 −1
Original line number Diff line number Diff line
@@ -573,7 +573,7 @@ static void disable_retire_worker(struct drm_i915_private *i915) 
{

	i915_gem_driver_unregister__shrinker(i915);

	intel_gt_pm_get(&i915->gt);

	cancel_delayed_work_sync(&i915->gem.retire_work);

	cancel_delayed_work_sync(&i915->gt.requests.retire_work);

}



static void restore_retire_worker(struct drm_i915_private *i915)

CRA Git | Maintained and supported by SUSTech CRA and CCSE