diff options
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 554bef7a3b9..602bc80baab 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -207,6 +207,8 @@ struct drm_i915_display_funcs { | |||
207 | int (*get_display_clock_speed)(struct drm_device *dev); | 207 | int (*get_display_clock_speed)(struct drm_device *dev); |
208 | int (*get_fifo_size)(struct drm_device *dev, int plane); | 208 | int (*get_fifo_size)(struct drm_device *dev, int plane); |
209 | void (*update_wm)(struct drm_device *dev); | 209 | void (*update_wm)(struct drm_device *dev); |
210 | void (*update_sprite_wm)(struct drm_device *dev, int pipe, | ||
211 | uint32_t sprite_width, int pixel_size); | ||
210 | int (*crtc_mode_set)(struct drm_crtc *crtc, | 212 | int (*crtc_mode_set)(struct drm_crtc *crtc, |
211 | struct drm_display_mode *mode, | 213 | struct drm_display_mode *mode, |
212 | struct drm_display_mode *adjusted_mode, | 214 | struct drm_display_mode *adjusted_mode, |
@@ -337,6 +339,8 @@ typedef struct drm_i915_private { | |||
337 | struct timer_list hangcheck_timer; | 339 | struct timer_list hangcheck_timer; |
338 | int hangcheck_count; | 340 | int hangcheck_count; |
339 | uint32_t last_acthd; | 341 | uint32_t last_acthd; |
342 | uint32_t last_acthd_bsd; | ||
343 | uint32_t last_acthd_blt; | ||
340 | uint32_t last_instdone; | 344 | uint32_t last_instdone; |
341 | uint32_t last_instdone1; | 345 | uint32_t last_instdone1; |
342 | 346 | ||
@@ -350,6 +354,7 @@ typedef struct drm_i915_private { | |||
350 | 354 | ||
351 | /* overlay */ | 355 | /* overlay */ |
352 | struct intel_overlay *overlay; | 356 | struct intel_overlay *overlay; |
357 | bool sprite_scaling_enabled; | ||
353 | 358 | ||
354 | /* LVDS info */ | 359 | /* LVDS info */ |
355 | int backlight_level; /* restore backlight to this value */ | 360 | int backlight_level; /* restore backlight to this value */ |
@@ -1362,8 +1367,7 @@ void __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv); | |||
1362 | #define NEEDS_FORCE_WAKE(dev_priv, reg) \ | 1367 | #define NEEDS_FORCE_WAKE(dev_priv, reg) \ |
1363 | (((dev_priv)->info->gen >= 6) && \ | 1368 | (((dev_priv)->info->gen >= 6) && \ |
1364 | ((reg) < 0x40000) && \ | 1369 | ((reg) < 0x40000) && \ |
1365 | ((reg) != FORCEWAKE) && \ | 1370 | ((reg) != FORCEWAKE)) |
1366 | ((reg) != ECOBUS)) | ||
1367 | 1371 | ||
1368 | #define __i915_read(x, y) \ | 1372 | #define __i915_read(x, y) \ |
1369 | u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg); | 1373 | u##x i915_read##x(struct drm_i915_private *dev_priv, u32 reg); |