Revert i915 commit that causes boot hangs on at least some headless machines

2 files changed, 102 insertions, 0 deletions

diff --git a/Revert-drm-i915-Ensure-plane-state-fb-stays-in-sync-.patch b/Revert-drm-i915-Ensure-plane-state-fb-stays-in-sync-.patch
new file mode 100644
index 000000000..9f5c96767
--- /dev/null
+++ b/Revert-drm-i915-Ensure-plane-state-fb-stays-in-sync-.patch
@@ -0,0 +1,97 @@
+From: Josh Boyer <jwboyer@fedoraproject.org>
+Date: Mon, 23 Mar 2015 13:50:33 -0400
+Subject: [PATCH] Revert "drm/i915: Ensure plane->state->fb stays in sync with
+ plane->fb"
+
+This reverts commit 319c1d420a0b62d9dbb88104afebaabc968cdbfa.
+---
+ drivers/gpu/drm/i915/intel_display.c | 17 -----------------
+ 1 file changed, 17 deletions(-)
+
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index e116dee10cf9..ac8112d86237 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -37,7 +37,6 @@
+ #include <drm/i915_drm.h>
+ #include "i915_drv.h"
+ #include "i915_trace.h"
+-#include <drm/drm_atomic.h>
+ #include <drm/drm_atomic_helper.h>
+ #include <drm/drm_dp_helper.h>
+ #include <drm/drm_crtc_helper.h>
+@@ -2417,14 +2416,6 @@ out_unref_obj:
+ 	return false;
+ }
+ 
+-/* Update plane->state->fb to match plane->fb after driver-internal updates */
+-static void
+-update_state_fb(struct drm_plane *plane)
+-{
+-	if (plane->fb != plane->state->fb)
+-		drm_atomic_set_fb_for_plane(plane->state, plane->fb);
+-}
+-
+ static void
+ intel_find_plane_obj(struct intel_crtc *intel_crtc,
+ 		     struct intel_initial_plane_config *plane_config)
+@@ -2471,8 +2462,6 @@ intel_find_plane_obj(struct intel_crtc *intel_crtc,
+ 			break;
+ 		}
+ 	}
+-
+-	update_state_fb(intel_crtc->base.primary);
+ }
+ 
+ static void i9xx_update_primary_plane(struct drm_crtc *crtc,
+@@ -6663,7 +6652,6 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc,
+ 		      plane_config->size);
+ 
+ 	crtc->base.primary->fb = fb;
+-	update_state_fb(crtc->base.primary);
+ }
+ 
+ static void chv_crtc_clock_get(struct intel_crtc *crtc,
+@@ -7704,7 +7692,6 @@ skylake_get_initial_plane_config(struct intel_crtc *crtc,
+ 		      plane_config->size);
+ 
+ 	crtc->base.primary->fb = fb;
+-	update_state_fb(crtc->base.primary);
+ 	return;
+ 
+ error:
+@@ -7798,7 +7785,6 @@ ironlake_get_initial_plane_config(struct intel_crtc *crtc,
+ 		      plane_config->size);
+ 
+ 	crtc->base.primary->fb = fb;
+-	update_state_fb(crtc->base.primary);
+ }
+ 
+ static bool ironlake_get_pipe_config(struct intel_crtc *crtc,
+@@ -9837,7 +9823,6 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc,
+ 	drm_gem_object_reference(&obj->base);
+ 
+ 	crtc->primary->fb = fb;
+-	update_state_fb(crtc->primary);
+ 
+ 	work->pending_flip_obj = obj;
+ 
+@@ -9906,7 +9891,6 @@ cleanup_unpin:
+ cleanup_pending:
+ 	atomic_dec(&intel_crtc->unpin_work_count);
+ 	crtc->primary->fb = old_fb;
+-	update_state_fb(crtc->primary);
+ 	drm_gem_object_unreference(&work->old_fb_obj->base);
+ 	drm_gem_object_unreference(&obj->base);
+ 	mutex_unlock(&dev->struct_mutex);
+@@ -13741,7 +13725,6 @@ void intel_modeset_gem_init(struct drm_device *dev)
+ 				  to_intel_crtc(c)->pipe);
+ 			drm_framebuffer_unreference(c->primary->fb);
+ 			c->primary->fb = NULL;
+-			update_state_fb(c->primary);
+ 		}
+ 	}
+ 	mutex_unlock(&dev->struct_mutex);
+-- 
+2.1.0
+
diff --git a/kernel.spec b/kernel.spec
index e5f9a7820..dde1ea17c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -633,6 +633,8 @@ Patch26168: HID-multitouch-add-support-of-clickpads.patch
 Patch26170: acpi-video-Allow-forcing-native-backlight-on-non-win.patch
 Patch26171: acpi-video-Add-force-native-backlight-quirk-for-Leno.patch
 
+Patch26172: Revert-drm-i915-Ensure-plane-state-fb-stays-in-sync-.patch
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1371,6 +1373,8 @@ ApplyPatch HID-multitouch-add-support-of-clickpads.patch
 ApplyPatch acpi-video-Allow-forcing-native-backlight-on-non-win.patch
 ApplyPatch acpi-video-Add-force-native-backlight-quirk-for-Leno.patch
 
+ApplyPatch Revert-drm-i915-Ensure-plane-state-fb-stays-in-sync-.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2222,6 +2226,7 @@ fi
 # 
 %changelog
 * Mon Mar 23 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc5.git0.1
+- Revert i915 commit that causes boot hangs on at least some headless machines
 - Linux v4.0-rc5
 
 * Fri Mar 20 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc4.git2.1