diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-02-24 12:39:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-02-24 12:39:02 +1000 |
| commit | a497bfe9dbbc0fbacd61295986372a626e73f452 (patch) | |
| tree | 9b568e1fecfe8e471fd5606de461374471cc7ec8 /drivers/gpu/drm/i915/intel_drv.h | |
| parent | a3b1097c037ae992510fe8f1e933072280ef19b0 (diff) | |
| parent | 202adf4b9f5957b26a1cb97267d78e0edb319c5e (diff) | |
| download | op-kernel-dev-a497bfe9dbbc0fbacd61295986372a626e73f452.zip op-kernel-dev-a497bfe9dbbc0fbacd61295986372a626e73f452.tar.gz | |
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
Two regressions fixes from snowboarding land
* 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel:
drm/i915: Revert hdmi HDP pin checks
drm/i915: Handle untiled planes when computing their offsets
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 d282052..07ebac6 100644 --- 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); |
