Skip to content

Commit

Permalink
drm/i915: Put update_state_fb() next to the fb update
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Damien Lespiau authored and Daniel Vetter committed Feb 13, 2015
1 parent 60ee5cd commit 5ba76c4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 5ba76c4

Please sign in to comment.