diff options
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 005a91f1f8f5..cba02619ec0f 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
@@ -649,9 +649,10 @@ extern void intel_update_sprite_watermarks(struct drm_device *dev, int pipe, | |||
649 | extern void intel_update_linetime_watermarks(struct drm_device *dev, int pipe, | 649 | extern void intel_update_linetime_watermarks(struct drm_device *dev, int pipe, |
650 | struct drm_display_mode *mode); | 650 | struct drm_display_mode *mode); |
651 | 651 | ||
652 | extern unsigned long intel_gen4_compute_offset_xtiled(int *x, int *y, | 652 | extern unsigned long intel_gen4_compute_page_offset(int *x, int *y, |
653 | unsigned int bpp, | 653 | unsigned int tiling_mode, |
654 | unsigned int pitch); | 654 | unsigned int bpp, |
655 | unsigned int pitch); | ||
655 | 656 | ||
656 | extern int intel_sprite_set_colorkey(struct drm_device *dev, void *data, | 657 | extern int intel_sprite_set_colorkey(struct drm_device *dev, void *data, |
657 | struct drm_file *file_priv); | 658 | struct drm_file *file_priv); |