From: Daniel Vetter <daniel@ffwll.ch>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] Revert "drm/i915: Lock mode_config.mutex in intel_display_resume."
Date: Wed, 12 Apr 2017 10:53:04 +0200 [thread overview]
Message-ID: <20170412085303.kstidtj7sq2ocp2x@phenom.ffwll.local> (raw)
In-Reply-To: <1491312168-18147-1-git-send-email-maarten.lankhorst@linux.intel.com>
On Tue, Apr 04, 2017 at 03:22:48PM +0200, Maarten Lankhorst wrote:
> This reverts commit ea49c9acf2db7082f0406bb3a570cc6bad37082b.
>
> mode_config.mutex was originally added to fix WARNs in connector
> functions, but now that atomic nonblocking modeset support is
> included, we will likely never hold any any lock at all.
>
> The WARN mentioned in commit bbf35e9defb9a6d1 ("drm/i915:
> Pass atomic state to intel_audio_codec_enable, v2."), so it's
> safe to revert this now.
>
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
I think you can push that right after the backmerge went out.
-Daniel
> ---
> drivers/gpu/drm/i915/intel_display.c | 8 --------
> 1 file changed, 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index 65aa8e586ec5..4698503c156b 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -15606,13 +15606,6 @@ void intel_display_resume(struct drm_device *dev)
> if (state)
> state->acquire_ctx = &ctx;
>
> - /*
> - * This is a cludge because with real atomic modeset mode_config.mutex
> - * won't be taken. Unfortunately some probed state like
> - * audio_codec_enable is still protected by mode_config.mutex, so lock
> - * it here for now.
> - */
> - mutex_lock(&dev->mode_config.mutex);
> drm_modeset_acquire_init(&ctx, 0);
>
> while (1) {
> @@ -15628,7 +15621,6 @@ void intel_display_resume(struct drm_device *dev)
>
> drm_modeset_drop_locks(&ctx);
> drm_modeset_acquire_fini(&ctx);
> - mutex_unlock(&dev->mode_config.mutex);
>
> if (ret)
> DRM_ERROR("Restoring old state failed with %i\n", ret);
> --
> 2.7.4
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2017-04-12 8:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-04 13:22 [PATCH] Revert "drm/i915: Lock mode_config.mutex in intel_display_resume." Maarten Lankhorst
2017-04-04 14:20 ` ✓ Fi.CI.BAT: success for " Patchwork
2017-04-12 8:53 ` Daniel Vetter [this message]
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=20170412085303.kstidtj7sq2ocp2x@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=maarten.lankhorst@linux.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.