Merge tag 'drm-intel-fixes-2015-03-19' into drm-intel-next

Backmerge because of numerous and interleaving conflicts and git
rerere getting confused a bit too often.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c

All conflicts are because of -next patches backported to -fixes, so
just go with the code in -next.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

diff --cc drivers/gpu/drm/drm_crtc.c
Simple merge

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

diff --cc drivers/gpu/drm/i915/intel_display.c
index 10af910c3d262e5ead2965e3704b3965a7e953b6,6d22128d97b1b8ce732208fe93ed897dc0a2cdcd..90b460cf2b57d275ce1b9d49d58a0d28ecd19e89
--- 1/drivers/gpu/drm/i915/intel_display.c
--- 2/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -2537,7 -2471,8 +2538,6 @@@ intel_find_plane_obj(struct intel_crtc 
                        break;
                }
        }
--
 -      update_state_fb(intel_crtc->base.primary);
  }
  
  static void i9xx_update_primary_plane(struct drm_crtc *crtc,