Re: [PATCH] drm/i915: Avoid drm_atomic_state_put(NULL) in intel_display_resume

From	Stefan Seyfried <stefan.seyfried@googlemail.com>
Newsgroups	linux.kernel
Subject	Re: [PATCH] drm/i915: Avoid drm_atomic_state_put(NULL) in intel_display_resume
Date	2017-01-15 15:00 +0100
Message-ID	<sZTvH-3b6-7@gated-at.bofh.it> (permalink)
References	<sZQo9-1qj-3@gated-at.bofh.it> <sZSzD-2CX-5@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Chris,

this fixes the problem for me, thanks!

Tested-by: Stefan Seyfried <stefan.seyfried@googlemail.com>

Am 15.01.2017 um 13:58 schrieb Chris Wilson:
> 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)

-- 
Stefan Seyfried

"For a successful technology, reality must take precedence over
 public relations, for nature cannot be fooled." -- Richard Feynman

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

4.10 regression drm/i915: BUG/oops on lid open Stefan Seyfried <stefan.seyfried@googlemail.com> - 2017-01-15 11:40 +0100
  [PATCH] drm/i915: Avoid drm_atomic_state_put(NULL) in intel_display_resume Chris Wilson <chris@chris-wilson.co.uk> - 2017-01-15 14:00 +0100
    Re: [PATCH] drm/i915: Avoid drm_atomic_state_put(NULL) in  intel_display_resume Stefan Seyfried <stefan.seyfried@googlemail.com> - 2017-01-15 15:00 +0100

csiph-web