projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge drm/drm-next into drm-intel-next
[linux-block.git]
/
drivers
/
gpu
/
drm
/
i915
/
gt
/
intel_engine_cs.c
diff --git
a/drivers/gpu/drm/i915/gt/intel_engine_cs.c
b/drivers/gpu/drm/i915/gt/intel_engine_cs.c
index fb1b1d09697511ab88338ef8fe460a36e9d80265..376e82e170613e395f5fb4989337289cede3eb3c 100644
(file)
--- a/
drivers/gpu/drm/i915/gt/intel_engine_cs.c
+++ b/
drivers/gpu/drm/i915/gt/intel_engine_cs.c
@@
-1269,7
+1269,7
@@
bool intel_engine_is_idle(struct intel_engine_cs *engine)
/* Waiting to drain ELSP? */
if (execlists_active(&engine->execlists)) {
- synchronize_hardirq(
engine->i915->drm.pdev
->irq);
+ synchronize_hardirq(
to_pci_dev(engine->i915->drm.dev)
->irq);
intel_engine_flush_submission(engine);