Merge branch 'drm-intel-fixes' into drm-intel-next

Conflicts:
	drivers/gpu/drm/i915/intel_drv.h

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_drv.h
index 5154e31,e52c612..7273c9e
--- 1/drivers/gpu/drm/i915/intel_drv.h
--- 2/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@@ -236,9 -236,8 +236,9 @@@ void intel_dip_infoframe_csum(struct di
  extern bool intel_sdvo_init(struct drm_device *dev, int output_device);
  extern void intel_dvo_init(struct drm_device *dev);
  extern void intel_tv_init(struct drm_device *dev);
 -extern void intel_mark_busy(struct drm_device *dev, struct drm_gem_object *obj);
 +extern void intel_mark_busy(struct drm_device *dev,
 +                          struct drm_i915_gem_object *obj);
- extern void intel_lvds_init(struct drm_device *dev);
+ extern bool intel_lvds_init(struct drm_device *dev);
  extern void intel_dp_init(struct drm_device *dev, int dp_reg);
  void
  intel_dp_set_m_n(struct drm_crtc *crtc, struct drm_display_mode *mode,

diff --cc drivers/gpu/drm/i915/intel_lvds.c
Simple merge