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=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 6AFAFC43382 for ; Fri, 28 Sep 2018 15:30:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 297A12082C for ; Fri, 28 Sep 2018 15:30:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="IlisMdzR" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 297A12082C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.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 S1729327AbeI1Vyk (ORCPT ); Fri, 28 Sep 2018 17:54:40 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:54052 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726867AbeI1Vyk (ORCPT ); Fri, 28 Sep 2018 17:54:40 -0400 Received: from avalon.localnet (nat-242.udc.es [193.144.61.242]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D9EC8B8E; Fri, 28 Sep 2018 17:30:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1538148621; bh=hQRpxKBYt54jUMWYZHYjDmOUSs6Q+hHfgjQ5dJ9ApoQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IlisMdzR43AIzO4rLn8KYP+9r7q8f4awwUgb4/2qPHBlPOhDxY4sWFUsZ2vKjUlHP 1gQBoZ+BQ98t+BxuvB6Kn3jUOrEJQe+yabEKdHpLqjyc2YM0pDw41ZmVTBZc2RDArA dboMkzFDOBcXDS4TaDZojgwIS+GBkkuhaXQYEkJM= From: Laurent Pinchart To: Souptick Joarder Cc: Gustavo Padovan , Maarten Lankhorst , sean@poorly.run, airlied@linux.ie, Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org Subject: Re: [PATCH] drm/rcar-du: Convert drm_atomic_helper_suspend/resume() Date: Fri, 28 Sep 2018 18:30:35 +0300 Message-ID: <20809880.gF2CxujBy3@avalon> Organization: Ideas on Board Oy In-Reply-To: <1672691.6TUgGLsHUb@avalon> References: <20180918163903.GA11172@jordon-HP-15-Notebook-PC> <1672691.6TUgGLsHUb@avalon> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="iso-8859-1" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Souptick, On Friday, 28 September 2018 18:05:18 EEST Laurent Pinchart wrote: > On Thursday, 27 September 2018 09:34:18 EEST Souptick Joarder wrote: > > On Tue, Sep 18, 2018 at 10:05 PM Souptick Joarder wrote: > >> convert drm_atomic_helper_suspend/resume() to use > >> drm_mode_config_helper_suspend/resume(). > >>=20 > >> remove suspend_state field from the rcar_du_device > >> structure as it is no more required. > >>=20 > >> With this conversion, also drm_fbdev_cma_set_suspend_unlocked() > >> will left with no consumer. So this function can be removed. > >>=20 > >> Signed-off-by: Souptick Joarder > >=20 > > Laurent, any comment on this patch ?? >=20 > Sorry for the delay, and thanks for pinging me. >=20 > Reviewed-by: Laurent Pinchart >=20 > Should I apply this to my tree or do you plan to merge it through drm-misc > as it touches drm_fb_cma_helper.c ? I just realized that the same patch got supplied by Noralf Tr=F8nnes nearly= a=20 year ago, and was later superseded by https://patchwork.freedesktop.org/pat= ch/ 247861/. I think we should thus apply Noralf's patches instead (once he sen= ds=20 v4 out). > >> --- > >>=20 > >> drivers/gpu/drm/drm_fb_cma_helper.c | 18 ------------------ > >> drivers/gpu/drm/rcar-du/rcar_du_drv.c | 21 ++------------------- > >> drivers/gpu/drm/rcar-du/rcar_du_drv.h | 1 - > >> include/drm/drm_fb_cma_helper.h | 2 -- > >> 4 files changed, 2 insertions(+), 40 deletions(-) > >>=20 > >> diff --git a/drivers/gpu/drm/drm_fb_cma_helper.c > >> b/drivers/gpu/drm/drm_fb_cma_helper.c index 47e0e2f..96efc88 100644 > >> --- a/drivers/gpu/drm/drm_fb_cma_helper.c > >> +++ b/drivers/gpu/drm/drm_fb_cma_helper.c > >> @@ -224,21 +224,3 @@ void drm_fbdev_cma_hotplug_event(struct > >> drm_fbdev_cma *fbdev_cma) > >> drm_fb_helper_hotplug_event(&fbdev_cma->fb_helper); > >> } > >> EXPORT_SYMBOL_GPL(drm_fbdev_cma_hotplug_event); > >>=20 > >> - > >> -/** > >> - * drm_fbdev_cma_set_suspend_unlocked - wrapper around > >> - * > >> drm_fb_helper_set_suspend_unlocked > >> - * @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_cma, > >> - bool state) > >> -{ > >> - if (fbdev_cma) > >> - =20 > >> 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/rcar-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) > >>=20 > >> static int rcar_du_pm_suspend(struct device *dev) > >> { > >> struct rcar_du_device *rcdu =3D dev_get_drvdata(dev); > >> - struct drm_atomic_state *state; > >>=20 > >> - 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); > >> } > >> =20 > >> static int rcar_du_pm_resume(struct device *dev) > >> { > >> struct rcar_du_device *rcdu =3D dev_get_drvdata(dev); > >>=20 > >> - 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 > >>=20 > >> diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h > >> b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index b3a25e8..ff25c8d 100644 > >> --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h > >> +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h > >> @@ -78,7 +78,6 @@ struct rcar_du_device { > >> struct drm_device *ddev; > >> struct drm_fbdev_cma *fbdev; > >>=20 > >> - struct drm_atomic_state *suspend_state; > >>=20 > >> struct rcar_du_crtc crtcs[RCAR_DU_MAX_CRTCS]; > >> unsigned int num_crtcs; > >> diff --git a/include/drm/drm_fb_cma_helper.h > >> b/include/drm/drm_fb_cma_helper.h index 4a65f0d..8dbbe1e 100644 > >> --- a/include/drm/drm_fb_cma_helper.h > >> +++ b/include/drm/drm_fb_cma_helper.h > >> @@ -26,8 +26,6 @@ struct drm_fbdev_cma *drm_fbdev_cma_init(struct > >> drm_device *dev, > >>=20 > >> 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_unlocked(struct drm_fbdev_cma > >> *fbdev_cma, > >> - bool state); > >>=20 > >> struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct > >> drm_framebuffer *fb, > >> unsigned int plane); =2D-=20 Regards, Laurent Pinchart