diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-21 16:46:08 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-21 16:46:08 +0100 |
| commit | cd6a22310ec2a70092e136d0cd65bb77c1502521 (patch) | |
| tree | c01fa788b27b240c7b426d7f329d92bd58c7b8f5 /drivers/gpu/drm/i915/intel_ringbuffer.h | |
| parent | 1e12a521d6917004f8b95a3b5864b92edc2694c8 (diff) | |
| parent | 177c459b08a34dcf004aa9a4c1f1d8be682ff3af (diff) | |
| download | kernel_replicant_linux-cd6a22310ec2a70092e136d0cd65bb77c1502521.tar.gz kernel_replicant_linux-cd6a22310ec2a70092e136d0cd65bb77c1502521.tar.bz2 kernel_replicant_linux-cd6a22310ec2a70092e136d0cd65bb77c1502521.zip | |
Merge USB 4.20-rc8 mergepoint into usb-next
We need the USB changes in here for additional patches to be able to
apply cleanly.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.h b/drivers/gpu/drm/i915/intel_ringbuffer.h index 2dfa585712c2..767a7192c969 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.h +++ b/drivers/gpu/drm/i915/intel_ringbuffer.h @@ -15,6 +15,7 @@ #include "i915_selftest.h" #include "i915_timeline.h" #include "intel_gpu_commands.h" +#include "intel_workarounds.h" struct drm_printer; struct i915_sched_attr; @@ -440,7 +441,7 @@ struct intel_engine_cs { struct intel_hw_status_page status_page; struct i915_ctx_workarounds wa_ctx; - struct i915_vma *scratch; + struct i915_wa_list wa_list; u32 irq_keep_mask; /* always keep these interrupts */ u32 irq_enable_mask; /* bitmask to enable ring interrupt */ @@ -898,10 +899,6 @@ void intel_engine_setup_common(struct intel_engine_cs *engine); int intel_engine_init_common(struct intel_engine_cs *engine); void intel_engine_cleanup_common(struct intel_engine_cs *engine); -int intel_engine_create_scratch(struct intel_engine_cs *engine, - unsigned int size); -void intel_engine_cleanup_scratch(struct intel_engine_cs *engine); - int intel_init_render_ring_buffer(struct intel_engine_cs *engine); int intel_init_bsd_ring_buffer(struct intel_engine_cs *engine); int intel_init_blt_ring_buffer(struct intel_engine_cs *engine); |