From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751161AbdAONxn (ORCPT ); Sun, 15 Jan 2017 08:53:43 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:32817 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750953AbdAONxm (ORCPT ); Sun, 15 Jan 2017 08:53:42 -0500 Subject: Re: [PATCH] drm/i915: Avoid drm_atomic_state_put(NULL) in intel_display_resume To: Chris Wilson , linux-kernel@vger.kernel.org References: <20170115125825.18597-1-chris@chris-wilson.co.uk> Cc: intel-gfx@lists.freedesktop.org, Daniel Vetter , Jani Nikula , "# v4 . 10-rc1+" From: Stefan Seyfried Message-ID: <285856d8-ae1c-b86a-36f4-f5ffa6ae6db7@message-id.googlemail.com> Date: Sun, 15 Jan 2017 14:53:38 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <20170115125825.18597-1-chris@chris-wilson.co.uk> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Chris, this fixes the problem for me, thanks! Tested-by: Stefan Seyfried 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 > Fixes: 0853695c3ba4 ("drm: Add reference counting to drm_atomic_state") > Signed-off-by: Chris Wilson > Cc: Daniel Vetter > Cc: Jani Nikula > Cc: # 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