| .. | .. |
|---|
| 26 | 26 | |
|---|
| 27 | 27 | #define __nop_write(x) \ |
|---|
| 28 | 28 | static void \ |
|---|
| 29 | | -nop_write##x(struct drm_i915_private *dev_priv, i915_reg_t reg, u##x val, bool trace) { } |
|---|
| 29 | +nop_write##x(struct intel_uncore *uncore, i915_reg_t reg, u##x val, bool trace) { } |
|---|
| 30 | 30 | __nop_write(8) |
|---|
| 31 | 31 | __nop_write(16) |
|---|
| 32 | 32 | __nop_write(32) |
|---|
| 33 | 33 | |
|---|
| 34 | 34 | #define __nop_read(x) \ |
|---|
| 35 | 35 | static u##x \ |
|---|
| 36 | | -nop_read##x(struct drm_i915_private *dev_priv, i915_reg_t reg, bool trace) { return 0; } |
|---|
| 36 | +nop_read##x(struct intel_uncore *uncore, i915_reg_t reg, bool trace) { return 0; } |
|---|
| 37 | 37 | __nop_read(8) |
|---|
| 38 | 38 | __nop_read(16) |
|---|
| 39 | 39 | __nop_read(32) |
|---|
| 40 | 40 | __nop_read(64) |
|---|
| 41 | 41 | |
|---|
| 42 | | -void mock_uncore_init(struct drm_i915_private *i915) |
|---|
| 42 | +void mock_uncore_init(struct intel_uncore *uncore, |
|---|
| 43 | + struct drm_i915_private *i915) |
|---|
| 43 | 44 | { |
|---|
| 44 | | - ASSIGN_WRITE_MMIO_VFUNCS(i915, nop); |
|---|
| 45 | | - ASSIGN_READ_MMIO_VFUNCS(i915, nop); |
|---|
| 45 | + intel_uncore_init_early(uncore, i915); |
|---|
| 46 | + |
|---|
| 47 | + ASSIGN_RAW_WRITE_MMIO_VFUNCS(uncore, nop); |
|---|
| 48 | + ASSIGN_RAW_READ_MMIO_VFUNCS(uncore, nop); |
|---|
| 46 | 49 | } |
|---|