Since the reset path wants to recover the engines itself, it only wants to reinitialise the hardware using i915_gem_init_hw(). Pull the call to intel_engines_resume() to the module init/resume path so we can avoid it during reset. Fixes: 79ffac8599c4 ("drm/i915: Invert the GEM wakeref hierarchy") Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> Reviewed-by: Mika Kuoppala <mika.kuoppala@linux.intel.com> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: Imre Deak <imre.deak@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190626154549.10066-3-chris@chris-wilson.co.uk (cherry picked from commit 092be382a2602067766f190a113514d469162456) Signed-off-by: Jani Nikula <jani.nikula@intel.com>
28 lines
533 B
C
28 lines
533 B
C
/*
|
|
* SPDX-License-Identifier: MIT
|
|
*
|
|
* Copyright © 2019 Intel Corporation
|
|
*/
|
|
|
|
#ifndef INTEL_GT_PM_H
|
|
#define INTEL_GT_PM_H
|
|
|
|
#include <linux/types.h>
|
|
|
|
struct drm_i915_private;
|
|
|
|
enum {
|
|
INTEL_GT_UNPARK,
|
|
INTEL_GT_PARK,
|
|
};
|
|
|
|
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_sanitize(struct drm_i915_private *i915, bool force);
|
|
int intel_gt_resume(struct drm_i915_private *i915);
|
|
|
|
#endif /* INTEL_GT_PM_H */
|