Signed-off-by: Maarten Lankhorst <maarten.lankho...@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_display.c 
b/drivers/gpu/drm/i915/intel_display.c
index b809ee2a8678..f41ca558ba3b 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -15353,9 +15353,9 @@ void intel_modeset_gem_init(struct drm_device *dev)
                        DRM_ERROR("failed to pin boot fb on pipe %d\n",
                                  to_intel_crtc(c)->pipe);
                        drm_framebuffer_unreference(c->primary->fb);
-                       c->primary->fb = NULL;
+                       drm_framebuffer_unreference(c->primary->state->fb);
+                       c->primary->fb = c->primary->state->fb = NULL;
                        c->primary->crtc = c->primary->state->crtc = NULL;
-                       update_state_fb(c->primary);
                        c->state->plane_mask &= ~(1 << 
drm_plane_index(c->primary));
                }
        }
-- 
2.1.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reply via email to