@@ -60,15 +60,8 @@ void intel_guc_init_send_regs(struct intel_guc *guc)
60
60
enum forcewake_domains fw_domains = 0 ;
61
61
unsigned int i ;
62
62
63
- if (INTEL_GEN (gt -> i915 ) >= 11 ) {
64
- guc -> send_regs .base =
65
- i915_mmio_reg_offset (GEN11_SOFT_SCRATCH (0 ));
66
- guc -> send_regs .count = GEN11_SOFT_SCRATCH_COUNT ;
67
- } else {
68
- guc -> send_regs .base = i915_mmio_reg_offset (SOFT_SCRATCH (0 ));
69
- guc -> send_regs .count = GUC_MAX_MMIO_MSG_LEN ;
70
- BUILD_BUG_ON (GUC_MAX_MMIO_MSG_LEN > SOFT_SCRATCH_COUNT );
71
- }
63
+ GEM_BUG_ON (!guc -> send_regs .base );
64
+ GEM_BUG_ON (!guc -> send_regs .count );
72
65
73
66
for (i = 0 ; i < guc -> send_regs .count ; i ++ ) {
74
67
fw_domains |= intel_uncore_forcewake_for_reg (gt -> uncore ,
@@ -172,11 +165,18 @@ void intel_guc_init_early(struct intel_guc *guc)
172
165
guc -> interrupts .reset = gen11_reset_guc_interrupts ;
173
166
guc -> interrupts .enable = gen11_enable_guc_interrupts ;
174
167
guc -> interrupts .disable = gen11_disable_guc_interrupts ;
168
+ guc -> send_regs .base =
169
+ i915_mmio_reg_offset (GEN11_SOFT_SCRATCH (0 ));
170
+ guc -> send_regs .count = GEN11_SOFT_SCRATCH_COUNT ;
171
+
175
172
} else {
176
173
guc -> notify_reg = GUC_SEND_INTERRUPT ;
177
174
guc -> interrupts .reset = gen9_reset_guc_interrupts ;
178
175
guc -> interrupts .enable = gen9_enable_guc_interrupts ;
179
176
guc -> interrupts .disable = gen9_disable_guc_interrupts ;
177
+ guc -> send_regs .base = i915_mmio_reg_offset (SOFT_SCRATCH (0 ));
178
+ guc -> send_regs .count = GUC_MAX_MMIO_MSG_LEN ;
179
+ BUILD_BUG_ON (GUC_MAX_MMIO_MSG_LEN > SOFT_SCRATCH_COUNT );
180
180
}
181
181
}
182
182
0 commit comments