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=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable 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 78853C5ACAE for ; Thu, 12 Sep 2019 09:51:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 44187208C2 for ; Thu, 12 Sep 2019 09:51:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="dXwiRlP/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730979AbfILJvy (ORCPT ); Thu, 12 Sep 2019 05:51:54 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:53652 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730706AbfILJvy (ORCPT ); Thu, 12 Sep 2019 05:51:54 -0400 Received: from [192.168.0.20] (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D52C633A; Thu, 12 Sep 2019 11:51:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1568281911; bh=0vaA9MXuOyAixI7XcsbPoskxiQ0wNfVGgt11YMkmqQc=; h=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From; b=dXwiRlP/+nR/tZRSj59YAZY8RgvwOkNHEODTy8M+DykX9eyaDVnS1FVcu9loZaMky SM81FppS6CIRAjJNjGR4ILxRiv6pUxvu650LL2JViHlob+xfWHI7uB02xoJzNnd28Z 2/LkVycdG+wGpllxuqpbulRgczfdt8i/+qeE+edo= Reply-To: kieran.bingham+renesas@ideasonboard.com Subject: Re: [PATCH v4 8/9] drm: rcar-du: kms: Update CMM in atomic commit tail To: Jacopo Mondi , laurent.pinchart@ideasonboard.com, geert@linux-m68k.org, horms@verge.net.au, uli+renesas@fpond.eu, VenkataRajesh.Kalakodima@in.bosch.com, airlied@linux.ie, daniel@ffwll.ch Cc: koji.matsuoka.xm@renesas.com, muroya@ksk.co.jp, Harsha.ManjulaMallikarjun@in.bosch.com, linux-renesas-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20190906135436.10622-1-jacopo+renesas@jmondi.org> <20190906135436.10622-9-jacopo+renesas@jmondi.org> From: Kieran Bingham Organization: Ideas on Board Message-ID: Date: Thu, 12 Sep 2019 10:51:47 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190906135436.10622-9-jacopo+renesas@jmondi.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Hi Jacopo, On 06/09/2019 14:54, Jacopo Mondi wrote: > Update CMM settings at in the atomic commit tail helper method. > The CMM is updated with new gamma values provided to the driver > in the GAMMA_LUT blob property. > > When resuming from system suspend, the DU driver is responsible for > reprogramming and enabling the CMM unit if it was in use at the time the > system entered the suspend state. Force the color_mgmt_changed flag to > true if the DRM gamma lut color transformation property was set in the > CRTC state duplicated at suspend time, as the CMM gets reprogrammed only > if said flag is active in the rcar_du_atomic_commit_update_cmm() method. > > Reviewed-by: Ulrich Hecht > Reviewed-by: Laurent Pinchart > Signed-off-by: Jacopo Mondi Also throwing in an LGTM here. Reviewed-by: Kieran Bingham > --- > > Daniel could you have a look if resume bits are worth being moved to the > DRM core? The color_mgmt_changed flag is set to false when the state is > duplicated if I read the code correctly, but when this happens in a > suspend/resume sequence its value should probably be restored to true if > any color management property was set in the crtc state when system entered > suspend. > > --- > > drivers/gpu/drm/rcar-du/rcar_du_drv.c | 20 ++++++++++++++ > drivers/gpu/drm/rcar-du/rcar_du_kms.c | 38 +++++++++++++++++++++++++++ > 2 files changed, 58 insertions(+) > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c > index 018480a8f35c..d1003d31cfaf 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c > @@ -17,6 +17,7 @@ > #include > #include > > +#include > #include > #include > #include > @@ -482,6 +483,25 @@ static int rcar_du_pm_suspend(struct device *dev) > static int rcar_du_pm_resume(struct device *dev) > { > struct rcar_du_device *rcdu = dev_get_drvdata(dev); > + struct drm_atomic_state *state = rcdu->ddev->mode_config.suspend_state; > + unsigned int i; > + > + for (i = 0; i < rcdu->num_crtcs; ++i) { > + struct drm_crtc *crtc = &rcdu->crtcs[i].crtc; > + struct drm_crtc_state *crtc_state; > + > + crtc_state = drm_atomic_get_new_crtc_state(state, crtc); > + if (!crtc_state) > + continue; > + > + /* > + * Force re-enablement of CMM after system resume if any > + * of the DRM color transformation properties was set in > + * the state saved at system suspend time. > + */ > + if (crtc_state->gamma_lut) > + crtc_state->color_mgmt_changed = true; > + } > > return drm_mode_config_helper_resume(rcdu->ddev); > } > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c > index 294630e56992..fc30fff0eb8d 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c > @@ -22,6 +22,7 @@ > #include > #include > > +#include "rcar_cmm.h" > #include "rcar_du_crtc.h" > #include "rcar_du_drv.h" > #include "rcar_du_encoder.h" > @@ -368,6 +369,40 @@ rcar_du_fb_create(struct drm_device *dev, struct drm_file *file_priv, > * Atomic Check and Update > */ > > +static void rcar_du_atomic_commit_update_cmm(struct drm_crtc *crtc, > + struct drm_crtc_state *old_state) > +{ > + struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc); > + struct rcar_cmm_config cmm_config = {}; > + struct device *dev = rcrtc->dev->dev; > + struct drm_property_blob *lut_blob; > + > + if (!rcrtc->cmm || !crtc->state->color_mgmt_changed) > + return; > + > + if (!crtc->state->gamma_lut) { > + cmm_config.lut.enable = false; > + rcar_cmm_setup(rcrtc->cmm, &cmm_config); > + return; > + } > + > + lut_blob = crtc->state->gamma_lut; > + if (lut_blob->length != (CM2_LUT_SIZE * sizeof(struct drm_color_lut))) { > + /* > + * We only accept fully populated LUT tables; > + * be loud here, otherwise the CMM gets silently ignored. > + */ > + dev_err(dev, "invalid gamma lut size of %lu bytes\n", > + lut_blob->length); > + return; > + } > + > + cmm_config.lut.enable = true; > + cmm_config.lut.table = (struct drm_color_lut *)lut_blob->data; > + > + rcar_cmm_setup(rcrtc->cmm, &cmm_config); > +} > + > static int rcar_du_atomic_check(struct drm_device *dev, > struct drm_atomic_state *state) > { > @@ -410,6 +445,9 @@ static void rcar_du_atomic_commit_tail(struct drm_atomic_state *old_state) > rcdu->dpad1_source = rcrtc->index; > } > > + for_each_old_crtc_in_state(old_state, crtc, crtc_state, i) > + rcar_du_atomic_commit_update_cmm(crtc, crtc_state); > + > /* Apply the atomic update. */ > drm_atomic_helper_commit_modeset_disables(dev, old_state); > drm_atomic_helper_commit_planes(dev, old_state, > -- > 2.23.0 >