Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel...

[karo-tx-linux.git] / drivers / gpu / drm / i915 / intel_drv.h

diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index d282052aadd4f53a22dc7ede6992b42218cc863f..07ebac6fe8cace004082913a325da446ebb4b07d 100644 (file)
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -648,9 +648,10 @@ extern void intel_update_sprite_watermarks(struct drm_device *dev, int pipe,
 extern void intel_update_linetime_watermarks(struct drm_device *dev, int pipe,
                         struct drm_display_mode *mode);
 
-extern unsigned long intel_gen4_compute_offset_xtiled(int *x, int *y,
-                                                     unsigned int bpp,
-                                                     unsigned int pitch);
+extern unsigned long intel_gen4_compute_page_offset(int *x, int *y,
+                                                   unsigned int tiling_mode,
+                                                   unsigned int bpp,
+                                                   unsigned int pitch);
 
 extern int intel_sprite_set_colorkey(struct drm_device *dev, void *data,
                                     struct drm_file *file_priv);