diff options
| author | Eric Anholt <eric@anholt.net> | 2010-08-01 22:23:53 -0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-08-01 22:34:47 -0400 |
| commit | 2bd34f6ca86b5a5f9b749624f73310820e7a93fd (patch) | |
| tree | 9e42100423e78f400412dfa974a6a13bac94d2c0 /drivers/gpu/drm/i915/intel_drv.h | |
| parent | a2757b6fab6dee3dbf43bdb7d7226d03747fbdb1 (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
Merge remote branch 'origin/master' into drm-intel-next
This resolves the conflict in the EDP code, which has been rather
popular to hack on recently.
Conflicts:
drivers/gpu/drm/i915/intel_dp.c
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_drv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index 3fbedd829965..8c941da8ca38 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h | |||
| @@ -216,6 +216,9 @@ extern void intel_init_clock_gating(struct drm_device *dev); | |||
| 216 | extern void ironlake_enable_drps(struct drm_device *dev); | 216 | extern void ironlake_enable_drps(struct drm_device *dev); |
| 217 | extern void ironlake_disable_drps(struct drm_device *dev); | 217 | extern void ironlake_disable_drps(struct drm_device *dev); |
| 218 | 218 | ||
| 219 | extern int intel_pin_and_fence_fb_obj(struct drm_device *dev, | ||
| 220 | struct drm_gem_object *obj); | ||
| 221 | |||
| 219 | extern int intel_framebuffer_init(struct drm_device *dev, | 222 | extern int intel_framebuffer_init(struct drm_device *dev, |
| 220 | struct intel_framebuffer *ifb, | 223 | struct intel_framebuffer *ifb, |
| 221 | struct drm_mode_fb_cmd *mode_cmd, | 224 | struct drm_mode_fb_cmd *mode_cmd, |