diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 91b6b4060333..0598932ce623 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -468,9 +468,6 @@ struct intel_crtc_state { | |||
468 | 468 | ||
469 | /* w/a for waiting 2 vblanks during crtc enable */ | 469 | /* w/a for waiting 2 vblanks during crtc enable */ |
470 | enum pipe hsw_workaround_pipe; | 470 | enum pipe hsw_workaround_pipe; |
471 | |||
472 | /* IVB sprite scaling w/a (WaCxSRDisabledForSpriteScaling:ivb) */ | ||
473 | bool disable_lp_wm; | ||
474 | }; | 471 | }; |
475 | 472 | ||
476 | struct vlv_wm_state { | 473 | struct vlv_wm_state { |
@@ -1399,6 +1396,12 @@ void intel_init_clock_gating(struct drm_device *dev); | |||
1399 | void intel_suspend_hw(struct drm_device *dev); | 1396 | void intel_suspend_hw(struct drm_device *dev); |
1400 | int ilk_wm_max_level(const struct drm_device *dev); | 1397 | int ilk_wm_max_level(const struct drm_device *dev); |
1401 | void intel_update_watermarks(struct drm_crtc *crtc); | 1398 | void intel_update_watermarks(struct drm_crtc *crtc); |
1399 | void intel_update_sprite_watermarks(struct drm_plane *plane, | ||
1400 | struct drm_crtc *crtc, | ||
1401 | uint32_t sprite_width, | ||
1402 | uint32_t sprite_height, | ||
1403 | int pixel_size, | ||
1404 | bool enabled, bool scaled); | ||
1402 | void intel_init_pm(struct drm_device *dev); | 1405 | void intel_init_pm(struct drm_device *dev); |
1403 | void intel_pm_setup(struct drm_device *dev); | 1406 | void intel_pm_setup(struct drm_device *dev); |
1404 | void intel_gpu_ips_init(struct drm_i915_private *dev_priv); | 1407 | void intel_gpu_ips_init(struct drm_i915_private *dev_priv); |