Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 698e84ed authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Daniel Vetter
Browse files

drm/i915: don't call intel_fbc_update() at intel_unpin_work_fn() 



Because intel_unpin_work_fn() already calls
intel_frontbuffer_flip_complete() which will call intel_fbc_flush()
which will call intel_fbc_update() when needed.

We couldn't fix this previously due to the fact that FBC was not
properly behaving as intended on frontbuffer flushes, but now that
this is fixed, we can remove the additional call.

Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 6f4551fe

drivers/gpu/drm/i915/intel_display.c

+0 −3
Original line number Diff line number Diff line
@@ -10762,15 +10762,12 @@ static void intel_unpin_work_fn(struct work_struct *__work) 
		container_of(__work, struct intel_unpin_work, work);

	struct intel_crtc *crtc = to_intel_crtc(work->crtc);

	struct drm_device *dev = crtc->base.dev;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_plane *primary = crtc->base.primary;



	mutex_lock(&dev->struct_mutex);

	intel_unpin_fb_obj(work->old_fb, primary->state);

	drm_gem_object_unreference(&work->pending_flip_obj->base);



	intel_fbc_update(dev_priv);



	if (work->flip_queued_req)

		i915_gem_request_assign(&work->flip_queued_req, NULL);

	mutex_unlock(&dev->struct_mutex);