Commit d14a701b authored by Chris Wilson's avatar Chris Wilson

drm/i915/selftests: Assign the intel_runtime_pm pointer for mock_uncore

Couple up our mock_uncore to know about the fake global device and its
runtime powermanagement.
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Matthew Auld <matthew.william.auld@gmail.com>
Reviewed-by: default avatarMatthew Auld <matthew.william.auld@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191008145045.23157-1-chris@chris-wilson.co.uk
parent 3de16278
...@@ -240,6 +240,7 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915, ...@@ -240,6 +240,7 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915,
struct mock_engine *engine; struct mock_engine *engine;
GEM_BUG_ON(id >= I915_NUM_ENGINES); GEM_BUG_ON(id >= I915_NUM_ENGINES);
GEM_BUG_ON(!i915->gt.uncore);
engine = kzalloc(sizeof(*engine) + PAGE_SIZE, GFP_KERNEL); engine = kzalloc(sizeof(*engine) + PAGE_SIZE, GFP_KERNEL);
if (!engine) if (!engine)
......
...@@ -162,7 +162,7 @@ struct drm_i915_private *mock_gem_device(void) ...@@ -162,7 +162,7 @@ struct drm_i915_private *mock_gem_device(void)
I915_GTT_PAGE_SIZE_64K | I915_GTT_PAGE_SIZE_64K |
I915_GTT_PAGE_SIZE_2M; I915_GTT_PAGE_SIZE_2M;
mock_uncore_init(&i915->uncore); mock_uncore_init(&i915->uncore, i915);
i915_gem_init__mm(i915); i915_gem_init__mm(i915);
intel_gt_init_early(&i915->gt, i915); intel_gt_init_early(&i915->gt, i915);
atomic_inc(&i915->gt.wakeref.count); /* disable; no hw support */ atomic_inc(&i915->gt.wakeref.count); /* disable; no hw support */
......
...@@ -39,8 +39,11 @@ __nop_read(16) ...@@ -39,8 +39,11 @@ __nop_read(16)
__nop_read(32) __nop_read(32)
__nop_read(64) __nop_read(64)
void mock_uncore_init(struct intel_uncore *uncore) void mock_uncore_init(struct intel_uncore *uncore,
struct drm_i915_private *i915)
{ {
intel_uncore_init_early(uncore, i915);
ASSIGN_RAW_WRITE_MMIO_VFUNCS(uncore, nop); ASSIGN_RAW_WRITE_MMIO_VFUNCS(uncore, nop);
ASSIGN_RAW_READ_MMIO_VFUNCS(uncore, nop); ASSIGN_RAW_READ_MMIO_VFUNCS(uncore, nop);
} }
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#ifndef __MOCK_UNCORE_H #ifndef __MOCK_UNCORE_H
#define __MOCK_UNCORE_H #define __MOCK_UNCORE_H
void mock_uncore_init(struct intel_uncore *uncore); void mock_uncore_init(struct intel_uncore *uncore,
struct drm_i915_private *i915);
#endif /* !__MOCK_UNCORE_H */ #endif /* !__MOCK_UNCORE_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment