diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2018-05-02 11:20:32 +0200 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2018-05-02 11:20:32 +0200 |
| commit | 53f071e19d566e7d0a4eada1bd8313a4cdb660a4 (patch) | |
| tree | ee2aecae90ec29ab404cf60bedeb3feb2ec99966 /drivers/gpu/drm/i915/gvt/cmd_parser.c | |
| parent | drm/i915: Print error state times relative to capture (diff) | |
| parent | Merge tag 'drm-misc-next-2018-04-26' of git://anongit.freedesktop.org/drm/drm... (diff) | |
| download | linux-53f071e19d566e7d0a4eada1bd8313a4cdb660a4.tar.xz linux-53f071e19d566e7d0a4eada1bd8313a4cdb660a4.zip | |
Merge drm/drm-next into drm-intel-next-queued
Need d224985a5e31 ("sched/wait, drivers/drm: Convert wait_on_atomic_t()
usage to the new wait_var_event() API") in dinq to be able to fix
https://bugs.freedesktop.org/show_bug.cgi?id=106085.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/gvt/cmd_parser.c')
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c index 9ec2cd982705..a294427088d8 100644 --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c @@ -1080,6 +1080,7 @@ static int cmd_handler_mi_user_interrupt(struct parser_exec_state *s) { set_bit(cmd_interrupt_events[s->ring_id].mi_user_interrupt, s->workload->pending_events); + patch_value(s, cmd_ptr(s, 0), MI_NOOP); return 0; } |