Skip to content

Commit 259f5a9

Browse files
committed
drm/i915/gt: Nuke gen2_irq_{enable,disable}()
We've determined that accessing the (supposedly) 16bit interrupt registers on gen2 as 32bit works just fine. We already dropped the special case from the main interrupt code, do so also for the gt interrupt stuff. Signed-off-by: Ville Syrjälä <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Reviewed-by: Jani Nikula <[email protected]>
1 parent b05f984 commit 259f5a9

File tree

3 files changed

+1
-23
lines changed

3 files changed

+1
-23
lines changed

drivers/gpu/drm/i915/gt/gen2_engine_cs.c

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -290,23 +290,6 @@ int gen4_emit_bb_start(struct i915_request *rq,
290290
return 0;
291291
}
292292

293-
void gen2_irq_enable(struct intel_engine_cs *engine)
294-
{
295-
struct drm_i915_private *i915 = engine->i915;
296-
297-
i915->irq_mask &= ~engine->irq_enable_mask;
298-
intel_uncore_write16(&i915->uncore, GEN2_IMR, i915->irq_mask);
299-
ENGINE_POSTING_READ16(engine, RING_IMR);
300-
}
301-
302-
void gen2_irq_disable(struct intel_engine_cs *engine)
303-
{
304-
struct drm_i915_private *i915 = engine->i915;
305-
306-
i915->irq_mask |= engine->irq_enable_mask;
307-
intel_uncore_write16(&i915->uncore, GEN2_IMR, i915->irq_mask);
308-
}
309-
310293
void gen3_irq_enable(struct intel_engine_cs *engine)
311294
{
312295
engine->i915->irq_mask &= ~engine->irq_enable_mask;

drivers/gpu/drm/i915/gt/gen2_engine_cs.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ int gen4_emit_bb_start(struct i915_request *rq,
2828
u64 offset, u32 length,
2929
unsigned int dispatch_flags);
3030

31-
void gen2_irq_enable(struct intel_engine_cs *engine);
32-
void gen2_irq_disable(struct intel_engine_cs *engine);
3331
void gen3_irq_enable(struct intel_engine_cs *engine);
3432
void gen3_irq_disable(struct intel_engine_cs *engine);
3533
void gen5_irq_enable(struct intel_engine_cs *engine);

drivers/gpu/drm/i915/gt/intel_ring_submission.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1090,12 +1090,9 @@ static void setup_irq(struct intel_engine_cs *engine)
10901090
} else if (GRAPHICS_VER(i915) >= 5) {
10911091
engine->irq_enable = gen5_irq_enable;
10921092
engine->irq_disable = gen5_irq_disable;
1093-
} else if (GRAPHICS_VER(i915) >= 3) {
1093+
} else {
10941094
engine->irq_enable = gen3_irq_enable;
10951095
engine->irq_disable = gen3_irq_disable;
1096-
} else {
1097-
engine->irq_enable = gen2_irq_enable;
1098-
engine->irq_disable = gen2_irq_disable;
10991096
}
11001097
}
11011098

0 commit comments

Comments
 (0)