| Message ID | 1436902154-6979-3-git-send-email-przanoni@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jul 14, 2015 at 12:30 PM Paulo Zanoni <przanoni@gmail.com> wrote: > From: Paulo Zanoni <paulo.r.zanoni@intel.com> > > 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: Paulo Zanoni <paulo.r.zanoni@intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index ad0fc6a..37b2528 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -10765,15 +10765,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); > \o/ let's kill it! Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> > - > if (work->flip_queued_req) > i915_gem_request_assign(&work->flip_queued_req, NULL); > mutex_unlock(&dev->struct_mutex); > -- > 2.1.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx >
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index ad0fc6a..37b2528 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -10765,15 +10765,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);