From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 5 Aug 2013 02:02:41 +0000 (+1000)
Subject: Merge remote-tracking branch 'drm-intel/for-linux-next'
X-Git-Tag: next-20130805~59
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=052e6a4d63e0b277e544270c8746fd154dd79043;p=karo-tx-linux.git

Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c
	drivers/gpu/drm/i915/intel_pm.c
---

052e6a4d63e0b277e544270c8746fd154dd79043
diff --cc drivers/gpu/drm/i915/i915_drv.h
index a7fbefaa1c4a,82ea281b2182..f31a1b0adbda
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@@ -1624,10 -1672,15 +1672,16 @@@ void i915_hangcheck_elapsed(unsigned lo
  void i915_handle_error(struct drm_device *dev, bool wedged);
  
  extern void intel_irq_init(struct drm_device *dev);
 +extern void intel_pm_init(struct drm_device *dev);
  extern void intel_hpd_init(struct drm_device *dev);
- extern void intel_gt_init(struct drm_device *dev);
- extern void intel_gt_sanitize(struct drm_device *dev);
+ extern void intel_pm_init(struct drm_device *dev);
+ 
+ extern void intel_uncore_sanitize(struct drm_device *dev);
+ extern void intel_uncore_early_sanitize(struct drm_device *dev);
+ extern void intel_uncore_init(struct drm_device *dev);
+ extern void intel_uncore_reset(struct drm_device *dev);
+ extern void intel_uncore_clear_errors(struct drm_device *dev);
+ extern void intel_uncore_check_errors(struct drm_device *dev);
  
  void
  i915_enable_pipestat(drm_i915_private_t *dev_priv, int pipe, u32 mask);