From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFF9EC43142 for ; Thu, 2 Aug 2018 09:55:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 98BCC214FB for ; Thu, 2 Aug 2018 09:55:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uwHy4q/n" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 98BCC214FB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731364AbeHBLpx (ORCPT ); Thu, 2 Aug 2018 07:45:53 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:39021 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726238AbeHBLpx (ORCPT ); Thu, 2 Aug 2018 07:45:53 -0400 Received: by mail-lj1-f196.google.com with SMTP id l15-v6so1378717lji.6; Thu, 02 Aug 2018 02:55:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=yioKygymfBPxgugkZjdqtPpKG/cR1WxfM6YDZsnlANQ=; b=uwHy4q/nf3mr0+WUlGoKy2maVhyRuxRVlJltUvoZ1zr/Y+kRuPunJvkkmVmpp63PP6 mWD/HCUAbyhzq+5vksDAwF53TbqL7V2Iq48e4c1nz/sdWvlkc/aEu8cvXqx0F3/BvRQv j5awzcv5ebEKR23jBXjxTJIJlaEL+Ut5OWvjnXjWDwvPFlh6yivEcnep9p/gUsg6Z3AM WgvtvnJamx5B6hqPXBjx+Ka+pYIB9Yi92EoIBwpL4vdTR96EivwtX7aSvavSUrGcEp2a 83gSrhvUBeRUgfwPRp0FG6Q7tLkW0bWXUXamvGFebZpsZJLnnXSOR3Inp63E5CcRyI2m 9/oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=yioKygymfBPxgugkZjdqtPpKG/cR1WxfM6YDZsnlANQ=; b=Tqx1iliePZPXPxvLpoogf4mBIOJuH9iUTkwIphwZowwU86wBf0ptV4x9NoEeDJkZJq E0fqNtcDmR2A/tLkwOh6scCOlVQR5rnxwZcDa1+1QQubZWiZTEELEfCEJ6bMXlh/6RvQ c6Kj1iOYNcaSz3H1iR6qgUYdEPWmjzz3/DQT9L+8+8wtGtkkWzeHDdXmQFZQG2IqSmwQ /FgtSaQyIFYthEXFlmLQGa8wQJvBe58QeYVyXaUfuEVz3otxPI1foppUSDLsTgKIYkTZ SffizJNl2VoNRwRoxNTrKKcjZ3QGbZBtveBBOgJuhAArb8kyp/zNLWkjuv5sESLroGz6 1wgg== X-Gm-Message-State: AOUpUlE/rdlSlxgFUsxhP+gJEQT3k0Fx8ONYenqlRQxGo/5lfmZQVOCu cyMXn+F1tysjlWIEvpbOF8dvDuXAVd9hOFQkYZZbwKXV X-Google-Smtp-Source: AAOMgpcJCnuGGxBBn7bDkJ0EPYpJi5macIwtDnP/yAVBOrHqTn7fwEG5jZRIuAo9TKBbfPyJR5ZmAwABKNVOIlskgt4= X-Received: by 2002:a2e:1301:: with SMTP id 1-v6mr1585584ljt.56.1533203725852; Thu, 02 Aug 2018 02:55:25 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a19:2b14:0:0:0:0:0 with HTTP; Thu, 2 Aug 2018 02:55:24 -0700 (PDT) In-Reply-To: References: <20180730190137.GA25420@jordon-HP-15-Notebook-PC> <20180731103440.GD17455@e110455-lin.cambridge.arm.com> From: Souptick Joarder Date: Thu, 2 Aug 2018 15:25:24 +0530 Message-ID: Subject: Re: [PATCH] drm: Convert drm_atomic_helper_suspend/resume() To: Liviu Dudau Cc: Brian Starkey , malidp@foss.arm.com, airlied@linux.ie, Gustavo Padovan , Maarten Lankhorst , Sean Paul , Laurent Pinchart , Ajit Linux , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-renesas-soc@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 On Wed, Aug 1, 2018 at 12:11 AM, Souptick Joarder wr= ote: > On Tue, Jul 31, 2018 at 4:04 PM, Liviu Dudau wrote: >> Hi Souptick, >> >> On Tue, Jul 31, 2018 at 12:31:37AM +0530, Souptick Joarder wrote: >>> convert drm_atomic_helper_suspend/resume() to use >>> drm_mode_config_helper_suspend/resume(). >>> >>> With this conversion, drm_fbdev_cma_set_suspend_unlocked() >>> will left with no consumer. So this function can be removed. >>> >>> Signed-off-by: Souptick Joarder >>> Signed-off-by: Ajit Negi >>> --- >>> drivers/gpu/drm/arm/hdlcd_drv.c | 26 ++------------------------ >>> drivers/gpu/drm/drm_fb_cma_helper.c | 18 ------------------ >>> drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++------------------- >>> include/drm/drm_fb_cma_helper.h | 2 -- >>> 4 files changed, 4 insertions(+), 63 deletions(-) >>> >>> diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlc= d_drv.c >>> index feaa8bc..4e617e0 100644 >>> --- a/drivers/gpu/drm/arm/hdlcd_drv.c >>> +++ b/drivers/gpu/drm/arm/hdlcd_drv.c >>> @@ -427,37 +427,15 @@ static int hdlcd_remove(struct platform_device *p= dev) >>> static int __maybe_unused hdlcd_pm_suspend(struct device *dev) >>> { >>> struct drm_device *drm =3D dev_get_drvdata(dev); >>> - struct hdlcd_drm_private *hdlcd =3D drm ? drm->dev_private : NULL= ; >>> >>> - if (!hdlcd) >>> - return 0; >>> - >>> - drm_kms_helper_poll_disable(drm); >>> - drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 1); >>> - >>> - hdlcd->state =3D drm_atomic_helper_suspend(drm); >>> - if (IS_ERR(hdlcd->state)) { >>> - drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0); >>> - drm_kms_helper_poll_enable(drm); >>> - return PTR_ERR(hdlcd->state); >>> - } >>> - >>> - return 0; >>> + return drm_mode_config_helper_suspend(drm); >>> } >>> >>> static int __maybe_unused hdlcd_pm_resume(struct device *dev) >>> { >>> struct drm_device *drm =3D dev_get_drvdata(dev); >>> - struct hdlcd_drm_private *hdlcd =3D drm ? drm->dev_private : NULL= ; >>> - >>> - if (!hdlcd) >>> - return 0; >>> >>> - drm_atomic_helper_resume(drm, hdlcd->state); >>> - drm_fbdev_cma_set_suspend_unlocked(hdlcd->fbdev, 0); >>> - drm_kms_helper_poll_enable(drm); >>> - >>> - return 0; >>> + return drm_mode_config_helper_resume(drm); >>> } >> >> This patch is similar to the one Noralf Tr=C3=B8nnes submitted, and his = is >> also cleaning up the state variable in hdlcd_drm_private. The patch has >> been queued as commit f69d9686e5d9 in git://linux-arm.org/linux-ld.git >> for-upstream/hdlcd and I will send a pull request today for it. >> >> Best regards, >> Liviu > > unable to clone this repository. > can you please post the patchwork link ? Liviu, is commit f69d9686e5d9 in git://linux-arm.org/linux-ld.gitfor-upstream/hdlcd contains only changes in drivers/gpu/drm/arm/hdlcd_drv.c driver ?? > >> >>> >>> static SIMPLE_DEV_PM_OPS(hdlcd_pm_ops, hdlcd_pm_suspend, hdlcd_pm_resu= me); >>> diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c b/drivers/gpu/drm/drm_= fb_cma_helper.c >>> index 186d00a..f604a84 100644 >>> --- a/drivers/gpu/drm/drm_fb_cma_helper.c >>> +++ b/drivers/gpu/drm/drm_fb_cma_helper.c >>> @@ -529,21 +529,3 @@ void drm_fbdev_cma_set_suspend(struct drm_fbdev_cm= a *fbdev_cma, bool state) >>> drm_fb_helper_set_suspend(&fbdev_cma->fb_helper, state); >>> } >>> EXPORT_SYMBOL(drm_fbdev_cma_set_suspend); >>> - >>> -/** >>> - * drm_fbdev_cma_set_suspend_unlocked - wrapper around >>> - * drm_fb_helper_set_suspend_unlo= cked >>> - * @fbdev_cma: The drm_fbdev_cma struct, may be NULL >>> - * @state: desired state, zero to resume, non-zero to suspend >>> - * >>> - * Calls drm_fb_helper_set_suspend, which is a wrapper around >>> - * fb_set_suspend implemented by fbdev core. >>> - */ >>> -void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cm= a, >>> - bool state) >>> -{ >>> - if (fbdev_cma) >>> - drm_fb_helper_set_suspend_unlocked(&fbdev_cma->fb_helper, >>> - state); >>> -} >>> -EXPORT_SYMBOL(drm_fbdev_cma_set_suspend_unlocked); >>> diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rc= ar-du/rcar_du_drv.c >>> index 02aee6c..288220f 100644 >>> --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c >>> +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c >>> @@ -357,32 +357,15 @@ static void rcar_du_lastclose(struct drm_device *= dev) >>> static int rcar_du_pm_suspend(struct device *dev) >>> { >>> struct rcar_du_device *rcdu =3D dev_get_drvdata(dev); >>> - struct drm_atomic_state *state; >>> >>> - drm_kms_helper_poll_disable(rcdu->ddev); >>> - drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, true); >>> - >>> - state =3D drm_atomic_helper_suspend(rcdu->ddev); >>> - if (IS_ERR(state)) { >>> - drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false); >>> - drm_kms_helper_poll_enable(rcdu->ddev); >>> - return PTR_ERR(state); >>> - } >>> - >>> - rcdu->suspend_state =3D state; >>> - >>> - return 0; >>> + return drm_mode_config_helper_suspend(rcdu->ddev); >>> } >>> >>> static int rcar_du_pm_resume(struct device *dev) >>> { >>> struct rcar_du_device *rcdu =3D dev_get_drvdata(dev); >>> >>> - drm_atomic_helper_resume(rcdu->ddev, rcdu->suspend_state); >>> - drm_fbdev_cma_set_suspend_unlocked(rcdu->fbdev, false); >>> - drm_kms_helper_poll_enable(rcdu->ddev); >>> - >>> - return 0; >>> + return drm_mode_config_helper_resume(rcdu->ddev); >>> } >>> #endif >>> >>> diff --git a/include/drm/drm_fb_cma_helper.h b/include/drm/drm_fb_cma_h= elper.h >>> index d532f88a..15c4569 100644 >>> --- a/include/drm/drm_fb_cma_helper.h >>> +++ b/include/drm/drm_fb_cma_helper.h >>> @@ -33,8 +33,6 @@ struct drm_fbdev_cma *drm_fbdev_cma_init(struct drm_d= evice *dev, >>> void drm_fbdev_cma_restore_mode(struct drm_fbdev_cma *fbdev_cma); >>> void drm_fbdev_cma_hotplug_event(struct drm_fbdev_cma *fbdev_cma); >>> void drm_fbdev_cma_set_suspend(struct drm_fbdev_cma *fbdev_cma, bool s= tate); >>> -void drm_fbdev_cma_set_suspend_unlocked(struct drm_fbdev_cma *fbdev_cm= a, >>> - bool state); >>> >>> struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuff= er *fb, >>> unsigned int plane); >>> -- >>> 1.9.1 >>> >> >> -- >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D >> | I would like to | >> | fix the world, | >> | but they're not | >> | giving me the | >> \ source code! / >> --------------- >> =C2=AF\_(=E3=83=84)_/=C2=AF