Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp866240imm; Fri, 28 Sep 2018 08:06:39 -0700 (PDT) X-Google-Smtp-Source: ACcGV62HFtS7YNcGkJ6KqC3XggG6vJa6iRBPhup5AXNab9nQt8yyEiBYdy7xQDv03bOVVB8NFoK/ X-Received: by 2002:a62:63c2:: with SMTP id x185-v6mr17144802pfb.13.1538147199419; Fri, 28 Sep 2018 08:06:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538147199; cv=none; d=google.com; s=arc-20160816; b=CdNCiQJ8ADOF8aJEA6qctueLjVGAWrHGgNtOsoP+NjYriP3G1ma83Y6Fwanr02rvQK 3vu6SPXLDInsRL6ZmJAnxmgHmuraPcv9hXQcxg3UDGy0VX7wUsaXXZ3JZt4oQwVgGZLF mw/DaQctYGJ5JKlVixhUAY/9KDAmyAA/nkSn/ATRdZh+jiVJA28a+jBtRgwgxkbeCF2t 31ywwlHT+g9UuM5UlR3CDqgn1gjC48mqYam5dh0rco96MrelMXh1Ak0ec9GStzacFDEf MwWPJSLQi7WAtpTToLFw9ggvogGrl5utQIPRh0QaNgaAWoWBeqRMr9zE5erGl1gCHFia CmNg== 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:mime-version :references:in-reply-to:organization:message-id:date:subject:cc:to :from:dkim-signature; bh=QYlNk2PsCQZSqJ17ArnMTs2BCFCqM10TYyfTE0WxGgw=; b=Z2VRqJSaBxrylFHWkmE9+YCt7ofQ5eIeYdCV/XgbUSCrHZbMwPhOYdCrkQNXNCm8Uj 6ovt4QuAh7aafO6nZ7iagcryz3+FXh0cCD52OUmZ9kvrNNfRmTeqVHbA0TihmXYjGp1N Dfr6hqZeDp+rrpcoaDBK6q+uOyagweC+frBdvGQeTN2uVwEFntgkz9K464zPos3nNdQ+ ifTAO6Kmt2IvXUXEPEOWYjUgZi/bMAUFkbqgyzFqOkSLKaiJSFIJhBSeEKdz2k2kCY5F 5l2r2y3Mw7n975biI8N8/gPGSI+L83zSE7ooszCoOT5/tlDdlCpGTFEIYof6XJY7rusq 5SZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=phh7bcg7; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 31-v6si5038992plg.296.2018.09.28.08.06.23; Fri, 28 Sep 2018 08:06:39 -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 (test mode) header.i=@ideasonboard.com header.s=mail header.b=phh7bcg7; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729217AbeI1V3S (ORCPT + 99 others); Fri, 28 Sep 2018 17:29:18 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:53832 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729119AbeI1V3R (ORCPT ); Fri, 28 Sep 2018 17:29:17 -0400 Received: from avalon.localnet (nat-242.udc.es [193.144.61.242]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id E7268B8E; Fri, 28 Sep 2018 17:05:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1538147103; bh=h2jaMYyEUnLoDyclcPQNJrUbzymHcVfiFZYlzgUIpqI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=phh7bcg7jRG9qB7Y2xPi9SzlKUn3N0dXyXIwoMQPDCUbX8ro2vlgNF5RO7VpVABbe 1toVONQnasuuaTwxE2tTOogIs1g0wvcyDKVvDv3S2YcOAWITzoA+dlZZ1rjeEAvzo4 d0ICl0GvpdSFKwSQJfj9xx3mb6Owwa/zIzdLZ9dU= 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:05:18 +0300 Message-ID: <1672691.6TUgGLsHUb@avalon> Organization: Ideas on Board Oy In-Reply-To: References: <20180918163903.GA11172@jordon-HP-15-Notebook-PC> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Souptick, Thank you for the patch. 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(). > > > > remove suspend_state field from the rcar_du_device > > structure as it is no more required. > > > > With this conversion, also drm_fbdev_cma_set_suspend_unlocked() > > will left with no consumer. So this function can be removed. > > > > Signed-off-by: Souptick Joarder > > Laurent, any comment on this patch ?? Sorry for the delay, and thanks for pinging me. Reviewed-by: Laurent Pinchart 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 ? > > --- > > > > 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(-) > > > > 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); > > > > - > > -/** > > - * 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) > > - 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) > > > > static int rcar_du_pm_suspend(struct device *dev) > > { > > > > struct rcar_du_device *rcdu = 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 = 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 = 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 = 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/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; > > > > - struct drm_atomic_state *suspend_state; > > > > 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,> > > 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); > > > > struct drm_gem_cma_object *drm_fb_cma_get_gem_obj(struct drm_framebuffer > > *fb, > > unsigned int plane); -- Regards, Laurent Pinchart