All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ander Conselvan De Oliveira <conselvan2@gmail.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, linux-kernel@vger.kernel.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	intel-gfx@lists.freedesktop.org,
	"# v4 . 10-rc1+" <drm-intel-fixes@lists.freedesktop.org>,
	Stefan Seyfried <stefan.seyfried@googlemail.com>
Subject: Re: [PATCH] drm/i915: Avoid drm_atomic_state_put(NULL) in intel_display_resume
Date: Wed, 18 Jan 2017 13:35:33 +0200	[thread overview]
Message-ID: <1484739333.4635.3.camel@gmail.com> (raw)
In-Reply-To: <20170115125825.18597-1-chris@chris-wilson.co.uk>

On Sun, 2017-01-15 at 12:58 +0000, Chris Wilson wrote:
> intel_display_resume() may be called without a atomic state to restore,
> i.e. dev_priv->modeset_reset_restore state is NULL. One such case is
> following a lid open/close event and the forced modeset in
> intel_lid_notiy().
> 
> Reported-by: Stefan Seyfried <stefan.seyfried@googlemail.com>
> Fixes: 0853695c3ba4 ("drm: Add reference counting to drm_atomic_state")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: <drm-intel-fixes@lists.freedesktop.org> # v4.10-rc1+
> ---
>  drivers/gpu/drm/i915/intel_display.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index 3dc8724df400..260bbe8881e6 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -17024,7 +17024,8 @@ void intel_display_resume(struct drm_device *dev)
>  
>  	if (ret)
>  		DRM_ERROR("Restoring old state failed with %i\n", ret);
> -	drm_atomic_state_put(state);
> +	if (state)
> +		drm_atomic_state_put(state);
>  }
>  
>  void intel_modeset_gem_init(struct drm_device *dev)


Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

WARNING: multiple messages have this Message-ID (diff)
From: Ander Conselvan De Oliveira <conselvan2@gmail.com>
To: Chris Wilson <chris@chris-wilson.co.uk>, linux-kernel@vger.kernel.org
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>,
	intel-gfx@lists.freedesktop.org,
	"# v4 . 10-rc1+" <drm-intel-fixes@lists.freedesktop.org>,
	Stefan Seyfried <stefan.seyfried@googlemail.com>
Subject: Re: [Intel-gfx] [PATCH] drm/i915: Avoid drm_atomic_state_put(NULL) in intel_display_resume
Date: Wed, 18 Jan 2017 13:35:33 +0200	[thread overview]
Message-ID: <1484739333.4635.3.camel@gmail.com> (raw)
In-Reply-To: <20170115125825.18597-1-chris@chris-wilson.co.uk>

On Sun, 2017-01-15 at 12:58 +0000, Chris Wilson wrote:
> intel_display_resume() may be called without a atomic state to restore,
> i.e. dev_priv->modeset_reset_restore state is NULL. One such case is
> following a lid open/close event and the forced modeset in
> intel_lid_notiy().
> 
> Reported-by: Stefan Seyfried <stefan.seyfried@googlemail.com>
> Fixes: 0853695c3ba4 ("drm: Add reference counting to drm_atomic_state")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: <drm-intel-fixes@lists.freedesktop.org> # v4.10-rc1+
> ---
>  drivers/gpu/drm/i915/intel_display.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c
> b/drivers/gpu/drm/i915/intel_display.c
> index 3dc8724df400..260bbe8881e6 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -17024,7 +17024,8 @@ void intel_display_resume(struct drm_device *dev)
>  
>  	if (ret)
>  		DRM_ERROR("Restoring old state failed with %i\n", ret);
> -	drm_atomic_state_put(state);
> +	if (state)
> +		drm_atomic_state_put(state);
>  }
>  
>  void intel_modeset_gem_init(struct drm_device *dev)


Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>

  parent reply	other threads:[~2017-01-18 11:35 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-15 10:39 4.10 regression drm/i915: BUG/oops on lid open Stefan Seyfried
2017-01-15 12:58 ` [PATCH] drm/i915: Avoid drm_atomic_state_put(NULL) in intel_display_resume Chris Wilson
2017-01-15 13:53   ` Stefan Seyfried
2017-01-18 11:35   ` Ander Conselvan De Oliveira [this message]
2017-01-18 11:35     ` [Intel-gfx] " Ander Conselvan De Oliveira
2017-01-18 11:42     ` Chris Wilson
2017-01-18 11:42       ` [Intel-gfx] " Chris Wilson
2017-01-15 13:24 ` ✓ Fi.CI.BAT: success for " Patchwork

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=1484739333.4635.3.camel@gmail.com \
    --to=conselvan2@gmail.com \
    --cc=chris@chris-wilson.co.uk \
    --cc=daniel.vetter@ffwll.ch \
    --cc=drm-intel-fixes@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stefan.seyfried@googlemail.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.