diff options
| author | Dave Airlie | 2017-11-02 02:33:57 +0100 |
|---|---|---|
| committer | Dave Airlie | 2017-11-02 02:33:57 +0100 |
| commit | 96ffbbf936298cad0df289ed1c09052493095b7f (patch) | |
| tree | 47548e12527c8843c7b4d3e4158a7ce7350af7e7 /drivers/gpu/drm/i915/intel_drv.h | |
| parent | Merge branch 'linux-4.14' of git://github.com/skeggsb/linux into drm-fixes (diff) | |
| parent | drm/i915: Check incoming alignment for unfenced buffers (on i915gm) (diff) | |
| download | kernel-qcow2-linux-96ffbbf936298cad0df289ed1c09052493095b7f.tar.gz kernel-qcow2-linux-96ffbbf936298cad0df289ed1c09052493095b7f.tar.xz kernel-qcow2-linux-96ffbbf936298cad0df289ed1c09052493095b7f.zip | |
Merge tag 'drm-intel-fixes-2017-11-01' of git://anongit.freedesktop.org/drm/drm-intel into drm-fixes
Fixes for Stable:
- Fix KBL Blank Screen (Jani)
- Fix FIFO Underrun on SNB (Maarten)
Other fixes:
- Fix GPU Hang on i915gm (Chris)
- Fix gem_tiled_pread_pwrite IGT case (Chris)
- Cancel modeset retry work during modeset clean-up (Manasi)
* tag 'drm-intel-fixes-2017-11-01' of git://anongit.freedesktop.org/drm/drm-intel:
drm/i915: Check incoming alignment for unfenced buffers (on i915gm)
drm/i915: Hold rcu_read_lock when iterating over the radixtree (vma idr)
drm/i915: Hold rcu_read_lock when iterating over the radixtree (objects)
drm/i915/edp: read edp display control registers unconditionally
drm/i915: Do not rely on wm preservation for ILK watermarks
drm/i915: Cancel the modeset retry work during modeset cleanup
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index fa47285918f4..79fbaf78f604 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -496,7 +496,6 @@ struct intel_crtc_scaler_state { struct intel_pipe_wm { struct intel_wm_level wm[5]; - struct intel_wm_level raw_wm[5]; uint32_t linetime; bool fbc_wm_enabled; bool pipe_enabled; |