Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp2035812ybi; Thu, 20 Jun 2019 08:06:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqxpNXGAP7olvhjtsRSDLKDGrE/8MRqWQFvHgZadF1qgJ5p1YyMFfbTPdVKN3WSgdoxj2eSf X-Received: by 2002:a65:6686:: with SMTP id b6mr13336354pgw.125.1561043170066; Thu, 20 Jun 2019 08:06:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561043170; cv=none; d=google.com; s=arc-20160816; b=gtkb2gEUK5UEcikFrimYnq/qF2cwZTGXluk4oRN9uUd6y4puOWDy5+5d01xZmoyS+f GGNzJTBDBLzQf22hNXCPFkAw8rr5Ov0fQDXvWzkKHdLG9bO3qKVXufrOYyktqPUbVpGX gIM1sjE+DkzQhPxduL5jCjeJC8eJVt2TJDKAUmeLFcejoKyGp+RknwDpcenVyKZj9n9X NcosWcGGot+htsgkwIt9G0OHL+AWnFrgrFDREnG/zmz8/xKbDNy8LrkKk/lfUJzVGLiF sqQQVNYzIiypI+3C/c3dtjkZVY/TCIKiexbeE1Icb3UgfYA/k8wQQuK0U4U3KSZRpBVF 4sng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=+SlWqt7mGdvs9AkWDoKN464Wi1itv44/ucax1MjY5Lc=; b=AIhVBqqlnQEhRGLuZDlpAYgIjvBqD6u410sjENA0inxovKV0nRFMlD/nltH0yu+vXb JK/ZUNvTvtaTtlXoYKtB4GnuqMaku/g7RS9nxCeS+Lf0hOnF0ztllapLBb89zMwaPBwz pfP71WdHgp7xYelg0uPQkmloJZvfebGcJUsgLUwP2f6XCBwh3tBNOHnZEQrt20i/+1r5 T9k2HuZwZtB0T3cBfwB06h9tGKw27tQUpxLRhZuY1ZffZYf4ucm84siXe8aDr0LXrfxy f4IOL+Mp7SxNNlWdffdtLTokyv5Ev5nA9/HCFFdhPdSbU/tGAtHDZde7sOHZCR5/9WrP BTNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sy2yUH85; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u2si16983pjb.25.2019.06.20.08.05.53; Thu, 20 Jun 2019 08:06:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sy2yUH85; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731655AbfFTPFo (ORCPT + 99 others); Thu, 20 Jun 2019 11:05:44 -0400 Received: from mail-qt1-f193.google.com ([209.85.160.193]:45578 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726798AbfFTPFo (ORCPT ); Thu, 20 Jun 2019 11:05:44 -0400 Received: by mail-qt1-f193.google.com with SMTP id j19so3468157qtr.12 for ; Thu, 20 Jun 2019 08:05:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=+SlWqt7mGdvs9AkWDoKN464Wi1itv44/ucax1MjY5Lc=; b=sy2yUH85O64yGVV1H0EJrjQcDOaj/CH5ejtqXd/eWKCNUQyDKLJ4Ox5EJnSlDquSXm SD8EasjV3UB1B5KBD4BJnBVokm+WRQoyVw89nAbRcPXDVbtLQlWLKqGtZ4VKNAIE+OPn oZDLcU3qBcF0A3LMaG/5XdlCcXF5Ba2qpye539vqcAVjLvl5CfKX5ey0UqOToFh2swiE KiXL6zKImj1xSO+JXDDiNFj4/bXj9QiS8Gf2Eh6SuPs3Z0YBFOxUIaJEAo/rbguyBbq8 GaZJroCvZZk8cxlYXqtTx9MgwqhC9iVzV2T8mO6IRsQWKuNSzTapj4JuUQRDWb+n1Tdy W3UQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=+SlWqt7mGdvs9AkWDoKN464Wi1itv44/ucax1MjY5Lc=; b=MZ0jyfC5YOfCl13TbpFbApdtr0ICPcmjjbhg8h9k0oIkTEhXfMbSsv3Cx+e4s/CkG9 v+3fEYLB76fSi8b0SwpL/m/ZlKtSEHsXZW1NBsikKg1Uwj74av0aHELp3xEQzF7cgdRa s96uoR1jo8TJ3wwnjQFlxdf1Kd/+O4Qb7ywdPk1I3VAQ7MfzOCF2V4lAAlB5mSLlvj4z L51Mh/abcsBWNK++lvd3jFpafK7wDL+5ELWWK3izSf0Bsgd+CioTW3TD1BC7XaTCzCJ3 yV3XgKx6haMG7Ik8vbjOJe+/bMV7jfVzSdceoNJgJwORMS4VrN4bJ4tWyqTZNXK4nHQ1 YZPA== X-Gm-Message-State: APjAAAXTfdzX4FzHF4sABP/RLqukXSOpZc5DVrkbguJLb/73sAKGErlp gawlRyaIyBs+bJbqh42OQiE+3rnmIk7hZRtPc+s8BQ== X-Received: by 2002:ac8:395b:: with SMTP id t27mr115053664qtb.115.1561043142986; Thu, 20 Jun 2019 08:05:42 -0700 (PDT) MIME-Version: 1.0 References: <1560755897-5002-1-git-send-email-yannick.fertre@st.com> <7e6a87b6-e442-20cb-0d4e-68eb40c56042@st.com> In-Reply-To: <7e6a87b6-e442-20cb-0d4e-68eb40c56042@st.com> From: Benjamin Gaignard Date: Thu, 20 Jun 2019 17:05:32 +0200 Message-ID: Subject: Re: [PATCH 1/3] drm/stm: drv: fix suspend/resume To: Philippe CORNU Cc: Yannick FERTRE , Benjamin GAIGNARD , Vincent ABRIOU , David Airlie , Daniel Vetter , Maxime Coquelin , Alexandre TORGUE , "dri-devel@lists.freedesktop.org" , "linux-stm32@st-md-mailman.stormreply.com" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Le mar. 18 juin 2019 =C3=A0 11:57, Philippe CORNU a= =C3=A9crit : > > Hi Yannick, > > Thank you for your patch. > > Acked-by: Philippe Cornu I have corrected Fixes sha1 (should be 12 digits) Applied on drm-misc-next. Benjamin > > Philippe :-) > > On 6/17/19 9:18 AM, Yannick Fertr=C3=A9 wrote: > > Without this fix, the system can not go in "suspend" mode > > due to an error in drv_suspend function. > > > > Fixes: 35ab6cf ("drm/stm: support runtime power management") > > > > Signed-off-by: Yannick Fertr=C3=A9 > > --- > > drivers/gpu/drm/stm/drv.c | 15 ++++++++------- > > 1 file changed, 8 insertions(+), 7 deletions(-) > > > > diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c > > index 5659572..9dee4e4 100644 > > --- a/drivers/gpu/drm/stm/drv.c > > +++ b/drivers/gpu/drm/stm/drv.c > > @@ -136,8 +136,7 @@ static __maybe_unused int drv_suspend(struct device= *dev) > > struct ltdc_device *ldev =3D ddev->dev_private; > > struct drm_atomic_state *state; > > > > - if (WARN_ON(!ldev->suspend_state)) > > - return -ENOENT; > > + WARN_ON(ldev->suspend_state); > > > > state =3D drm_atomic_helper_suspend(ddev); > > if (IS_ERR(state)) > > @@ -155,15 +154,17 @@ static __maybe_unused int drv_resume(struct devic= e *dev) > > struct ltdc_device *ldev =3D ddev->dev_private; > > int ret; > > > > + if (WARN_ON(!ldev->suspend_state)) > > + return -ENOENT; > > + > > pm_runtime_force_resume(dev); > > ret =3D drm_atomic_helper_resume(ddev, ldev->suspend_state); > > - if (ret) { > > + if (ret) > > pm_runtime_force_suspend(dev); > > - ldev->suspend_state =3D NULL; > > - return ret; > > - } > > > > - return 0; > > + ldev->suspend_state =3D NULL; > > + > > + return ret; > > } > > > > static __maybe_unused int drv_runtime_suspend(struct device *dev) > > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel