Commit 5ba76c41 authored Feb 05, 2015 by Damien Lespiau Committed by Daniel Vetter Feb 13, 2015

drm/i915: Put update_state_fb() next to the fb update



update_state_fb() at the end of intel_find_plane_obj() is misleading as
it leads us to believe the update is done for all code path.

A successful call to intel_alloc_plane_obj() will return and
update_state_fb() is then only needed when we share a fb from another
CRTC. Put the update() function there then.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

parent 60ee5cd2

drivers/gpu/drm/i915/intel_display.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2466,12 +2466,12 @@ intel_find_plane_obj(struct intel_crtc *intel_crtc,

		drm_framebuffer_reference(c->primary->fb);
		intel_crtc->base.primary->fb = c->primary->fb;
		update_state_fb(intel_crtc->base.primary);
		obj->frontbuffer_bits \|= INTEL_FRONTBUFFER_PRIMARY(intel_crtc->pipe);
		break;
		}
		}

		update_state_fb(intel_crtc->base.primary);
		}

		static void i9xx_update_primary_plane(struct drm_crtc *crtc,