From: Paulo Zanoni <przanoni@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: [PATCH 2/4] drm/i915: don't call intel_fbc_update() at intel_unpin_work_fn()
Date: Tue, 14 Jul 2015 16:29:11 -0300 [thread overview]
Message-ID: <1436902154-6979-3-git-send-email-przanoni@gmail.com> (raw)
In-Reply-To: <1436902154-6979-1-git-send-email-przanoni@gmail.com>
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);
-
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
next prev parent reply other threads:[~2015-07-14 19:29 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-14 19:29 [PATCH 0/4] FBC frontbuffer tracking + MMAP_WC fixes Paulo Zanoni
2015-07-14 19:29 ` [PATCH 1/4] drm/i915: fix FBC frontbuffer tracking flushing code Paulo Zanoni
2015-07-30 23:37 ` Rodrigo Vivi
2015-07-31 15:26 ` Paulo Zanoni
2015-07-14 19:29 ` Paulo Zanoni [this message]
2015-07-30 23:40 ` [PATCH 2/4] drm/i915: don't call intel_fbc_update() at intel_unpin_work_fn() Rodrigo Vivi
2015-07-14 19:29 ` [PATCH igt] kms_frontbuffer_tracking: use the dirty ioctl after MMAP_WC calls Paulo Zanoni
2015-07-14 19:29 ` [PATCH 3/4] drm/i915: don't disable FBC for pipe A when flipping pipe B Paulo Zanoni
2015-07-15 12:33 ` Daniel Vetter
2015-07-30 23:46 ` Rodrigo Vivi
2015-07-14 19:29 ` [PATCH 4/4] drm/i915: special-case dirtyfb for frontbuffer tracking Paulo Zanoni
2015-07-30 23:48 ` Rodrigo Vivi
2015-08-05 8:01 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1436902154-6979-3-git-send-email-przanoni@gmail.com \
--to=przanoni@gmail.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=paulo.r.zanoni@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox