From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
Start sorting out the pre-skl wm/cxsr code a bit. My plan is:
- move platform specific stuff out from intel_atomic_plane.c
- make cxsr actually robust (currently it has a bunch of poorly
handled corner cases)
- probably some other fixes and cleanups
This series doesn't achieve those goals yet, because
I decided to limit it to non-functional changes, but
it's a start.
Also included the sprite uapi header cleanup here
to save ci a bit of grief.
Ville Syrjälä (7):
drm/i915: Remove leftover intel_sprite_set_colorkey_ioctl() prototype
drm/i915: Combine .compute_{pipe,intermediate}_wm() into one
drm/i915: Extract ilk_must_disable_lp_wm()
drm/i915: Clean up intel_wm_need_update()
drm/i915: Move the dodgy pre-g4x wm stuff into i9xx_wm
drm/i915: s/disable_lp_wm/disable_cxsr/
drm/i915: Rename variables in ilk_intermedidate_wm()
drivers/gpu/drm/i915/display/i9xx_wm.c | 168 +++++++++++++++---
drivers/gpu/drm/i915/display/i9xx_wm.h | 4 +-
drivers/gpu/drm/i915/display/intel_atomic.c | 1 -
.../gpu/drm/i915/display/intel_atomic_plane.c | 133 ++++++--------
drivers/gpu/drm/i915/display/intel_display.c | 21 +--
.../gpu/drm/i915/display/intel_display_core.h | 6 +-
.../drm/i915/display/intel_display_types.h | 3 -
drivers/gpu/drm/i915/display/intel_sprite.h | 3 -
drivers/gpu/drm/i915/display/intel_wm.c | 24 +--
drivers/gpu/drm/i915/display/intel_wm.h | 6 +-
drivers/gpu/drm/i915/i915_driver.c | 2 +-
11 files changed, 221 insertions(+), 150 deletions(-)
--
2.44.2
