From: Chris Wilson <chris@chris-wilson.co.uk>
To: ville.syrjala@linux.intel.com
Cc: intel-gfx@lists.freedesktop.org, David Airlie <airlied@linux.ie>,
Daniel Vetter <daniel.vetter@ffwll.ch>,
linux-kernel@vger.kernel.org, Tibor Billes <tbilles@gmx.com>
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Fix lock dropping in intel_tv_detect()
Date: Mon, 1 Sep 2014 09:50:22 +0100 [thread overview]
Message-ID: <20140901085022.GB11648@nuc-i3427.alporthouse.com> (raw)
In-Reply-To: <1409558986-5099-1-git-send-email-ville.syrjala@linux.intel.com>
On Mon, Sep 01, 2014 at 11:09:46AM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> When intel_tv_detect() fails to do load detection it would forget to
> drop the locks and clean up the acquire context. Fix it up.
>
> This is a regression from:
> commit 208bf9fdcd3575aa4a5d48b3e0295f7cdaf6fc44
> Author: Ville Syrjälä <ville.syrjala@linux.intel.com>
> Date: Mon Aug 11 13:15:35 2014 +0300
>
> drm/i915: Fix locking for intel_enable_pipe_a()
>
> Cc: Tibor Billes <tbilles@gmx.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_tv.c | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
> index 32186a6..abbf0ea 100644
> --- a/drivers/gpu/drm/i915/intel_tv.c
> +++ b/drivers/gpu/drm/i915/intel_tv.c
> @@ -1311,7 +1311,8 @@ intel_tv_detect(struct drm_connector *connector, bool force)
> {
> struct drm_display_mode mode;
> struct intel_tv *intel_tv = intel_attached_tv(connector);
> - int type;
> + enum drm_connector_status status = connector->status;
> + int type = -1;
>
> DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force=%d\n",
> connector->base.id, connector->name,
> @@ -1328,21 +1329,23 @@ intel_tv_detect(struct drm_connector *connector, bool force)
> if (intel_get_load_detect_pipe(connector, &mode, &tmp, &ctx)) {
> type = intel_tv_detect_type(intel_tv, connector);
> intel_release_load_detect_pipe(connector, &tmp);
> + status = type < 0 ?
> + connector_status_disconnected :
> + connector_status_connected;
> } else
> - return connector_status_unknown;
> + status = connector_status_unknown;
>
> drm_modeset_drop_locks(&ctx);
> drm_modeset_acquire_fini(&ctx);
> - } else
> - return connector->status;
> + }
>
> if (type < 0)
> - return connector_status_disconnected;
> + return status;
>
> intel_tv->type = type;
> intel_tv_find_better_format(connector);
>
> - return connector_status_connected;
> + return status;
Hmm, this makes the code unclear. if type != -1, status should always be
connected.
I think:
if (status != connector_status_connected)
return status;
if (WARN_ON(type < 0))
return connector_status_disconnected;
intel_tv->type = type;
find_better_format();
return connector_status_connected;
And leave type unset to encourage gcc.
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 32186a6..a109b7b 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1311,6 +1311,7 @@ intel_tv_detect(struct drm_connector *connector, bool force)
{
struct drm_display_mode mode;
struct intel_tv *intel_tv = intel_attached_tv(connector);
+ enum drm_connector_status status = connector->status;
int type;
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force=%d\n",
@@ -1327,17 +1328,20 @@ intel_tv_detect(struct drm_connector *connector, bool force)
if (intel_get_load_detect_pipe(connector, &mode, &tmp, &ctx)) {
type = intel_tv_detect_type(intel_tv, connector);
+ status = type < 0 ?
+ connector_status_disconnected :
+ connector_status_connected;
+
intel_release_load_detect_pipe(connector, &tmp);
} else
- return connector_status_unknown;
+ status = connector_status_unknown;
drm_modeset_drop_locks(&ctx);
drm_modeset_acquire_fini(&ctx);
- } else
- return connector->status;
+ }
- if (type < 0)
- return connector_status_disconnected;
+ if (status != connector_status_connected)
+ return status;
intel_tv->type = type;
intel_tv_find_better_format(connector);
--
Chris Wilson, Intel Open Source Technology Centre
next prev parent reply other threads:[~2014-09-01 8:50 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-31 13:57 Possible regression in 3.17-rc2 in i915 driver Tibor Billes
2014-09-01 6:25 ` Jani Nikula
2014-09-01 8:09 ` [PATCH] drm/i915: Fix lock dropping in intel_tv_detect() ville.syrjala
2014-09-01 8:50 ` Chris Wilson [this message]
2014-09-01 9:45 ` [Intel-gfx] " Ville Syrjälä
2014-09-01 10:02 ` Chris Wilson
2014-09-01 10:07 ` [PATCH v2] " ville.syrjala
2014-09-01 10:20 ` Chris Wilson
2014-09-01 10:36 ` Ville Syrjälä
2014-09-01 10:43 ` Chris Wilson
2014-09-02 7:41 ` Jani Nikula
2014-09-02 8:16 ` Ville Syrjälä
2014-09-02 8:26 ` Chris Wilson
2014-09-02 9:57 ` [PATCH v3] " ville.syrjala
2014-09-02 11:41 ` Jani Nikula
2014-09-01 20:19 ` [PATCH v2] " Tibor Billes
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=20140901085022.GB11648@nuc-i3427.alporthouse.com \
--to=chris@chris-wilson.co.uk \
--cc=airlied@linux.ie \
--cc=daniel.vetter@ffwll.ch \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tbilles@gmx.com \
--cc=ville.syrjala@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).