From: Paulo Zanoni <przanoni@gmail.com>
To: intel-gfx@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: [PATCH 4/8] drm/i915: remove struct_mutex lock from the FBC work function
Date: Tue, 30 Jun 2015 10:53:08 -0300 [thread overview]
Message-ID: <1435672392-7329-5-git-send-email-przanoni@gmail.com> (raw)
In-Reply-To: <1435672392-7329-1-git-send-email-przanoni@gmail.com>
From: Paulo Zanoni <paulo.r.zanoni@intel.com>
Now that we have the FBC mutex to protect the actual FBC data, we can
remove the struct_mutex from here since we're not dealing with stolen
memory at this point.
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
---
drivers/gpu/drm/i915/intel_fbc.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_fbc.c b/drivers/gpu/drm/i915/intel_fbc.c
index 543b7a2..316feb1 100644
--- a/drivers/gpu/drm/i915/intel_fbc.c
+++ b/drivers/gpu/drm/i915/intel_fbc.c
@@ -335,7 +335,6 @@ static void intel_fbc_work_fn(struct work_struct *__work)
struct drm_device *dev = work->crtc->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
- mutex_lock(&dev->struct_mutex);
mutex_lock(&dev_priv->fbc.lock);
if (work == dev_priv->fbc.fbc_work) {
/* Double check that we haven't switched fb without cancelling
@@ -352,7 +351,6 @@ static void intel_fbc_work_fn(struct work_struct *__work)
dev_priv->fbc.fbc_work = NULL;
}
mutex_unlock(&dev_priv->fbc.lock);
- mutex_unlock(&dev->struct_mutex);
kfree(work);
}
--
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-06-30 13:54 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-30 13:53 [PATCH 0/8] FBC locking v3 Paulo Zanoni
2015-06-30 13:53 ` [PATCH 1/8] drm/i915: don't increment the FBC threshold at fbc_enable Paulo Zanoni
2015-06-30 14:22 ` Chris Wilson
2015-07-01 13:52 ` Daniel Vetter
2015-06-30 13:53 ` [PATCH 2/8] drm/i915: add the FBC mutex Paulo Zanoni
2015-06-30 14:10 ` Chris Wilson
2015-06-30 14:12 ` Chris Wilson
2015-06-30 14:25 ` Chris Wilson
2015-06-30 14:34 ` Paulo Zanoni
2015-06-30 13:53 ` [PATCH 3/8] drm/i915: remove unneded locks on debugs FBC functions Paulo Zanoni
2015-06-30 13:53 ` Paulo Zanoni [this message]
2015-06-30 13:53 ` [PATCH 5/8] drm/i915: simplify FBC start/stop at invalidate/flush Paulo Zanoni
2015-06-30 14:34 ` Chris Wilson
2015-06-30 21:12 ` Paulo Zanoni
2015-07-01 14:04 ` Chris Wilson
2015-06-30 13:53 ` [PATCH 6/8] drm/i915: add struct_mutex WARNs to i915_gem_stolen.c Paulo Zanoni
2015-06-30 14:15 ` Chris Wilson
2015-06-30 14:26 ` Paulo Zanoni
2015-06-30 14:36 ` Chris Wilson
2015-06-30 20:30 ` Jesse Barnes
2015-06-30 21:00 ` Chris Wilson
2015-07-01 13:56 ` Daniel Vetter
2015-07-01 15:17 ` Jesse Barnes
2015-07-01 15:43 ` Daniel Vetter
2015-06-30 14:34 ` Chris Wilson
2015-07-01 14:00 ` Daniel Vetter
2015-07-01 14:02 ` Chris Wilson
2015-07-01 14:03 ` Paulo Zanoni
2015-06-30 13:53 ` [PATCH 7/8] drm/i915: reduce struct_mutex coverage at intel_crtc_page_flip() Paulo Zanoni
2015-06-30 13:53 ` [PATCH 8/8] drm/i915: remove struct_mutex lock from intel_modeset_cleanup() Paulo Zanoni
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=1435672392-7329-5-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.