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.3 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 8A2BEC3A5A4 for ; Tue, 27 Aug 2019 00:19:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6030120850 for ; Tue, 27 Aug 2019 00:19:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="aVOS0QUT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727483AbfH0ATh (ORCPT ); Mon, 26 Aug 2019 20:19:37 -0400 Received: from perceval.ideasonboard.com ([213.167.242.64]:58186 "EHLO perceval.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726404AbfH0ATh (ORCPT ); Mon, 26 Aug 2019 20:19:37 -0400 Received: from pendragon.ideasonboard.com (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id A98522EE; Tue, 27 Aug 2019 02:19:33 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1566865173; bh=b1IWTKBE4UNZojeNpwZ778+qPdPRYX/fimB2+YFE358=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=aVOS0QUTdeeEKHIc3la6YAwSZ4hRlcpUZkCOo9xF4/y1qt4UKquoWQ/7pq4fD/BjA oRXwFZueDweOSokmQU2WI1pFEw1nhmJ2Ve4W1eL9JJzLkA2sJ70eO0gV2YRow5VqGF Syn/9Qvg/FInHN0XpSjg5Br/0bXzW5+74797AzAQ= Date: Tue, 27 Aug 2019 03:19:27 +0300 From: Laurent Pinchart To: Jacopo Mondi Cc: kieran.bingham+renesas@ideasonboard.com, geert@linux-m68k.org, horms@verge.net.au, uli@fpond.eu, airlied@linux.ie, daniel@ffwll.ch, koji.matsuoka.xm@renesas.com, muroya@ksk.co.jp, VenkataRajesh.Kalakodima@in.bosch.com, Harsha.ManjulaMallikarjun@in.bosch.com, linux-renesas-soc@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Ulrich Hecht Subject: Re: [PATCH v3 13/14] drm: rcar-du: kms: Update CMM in atomic commit tail Message-ID: <20190827001927.GA5926@pendragon.ideasonboard.com> References: <20190825135154.11488-1-jacopo+renesas@jmondi.org> <20190825135154.11488-14-jacopo+renesas@jmondi.org> <20190827000017.GB5274@pendragon.ideasonboard.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20190827000017.GB5274@pendragon.ideasonboard.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Aug 27, 2019 at 03:00:17AM +0300, Laurent Pinchart wrote: > Hi Jacopo, > > Thank you for the patch. > > On Sun, Aug 25, 2019 at 03:51:53PM +0200, 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. > > > > Reviewed-by: Ulrich Hecht > > Reviewed-by: Laurent Pinchart > > Signed-off-by: Jacopo Mondi > > --- > > drivers/gpu/drm/rcar-du/rcar_du_kms.c | 35 +++++++++++++++++++++++++++ > > 1 file changed, 35 insertions(+) > > > > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c > > index 61ca1d3c379a..047fdb982a11 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,37 @@ 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 = {}; > > + > > + 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; > > + } > > + > > + cmm_config.lut.enable = true; > > + cmm_config.lut.table = (struct drm_color_lut *) > > + crtc->state->gamma_lut->data; > > + > > + /* Set LUT table size to 0 if entries should not be updated. */ > > + if (!old_state->gamma_lut || > > + old_state->gamma_lut->base.id != crtc->state->gamma_lut->base.id) > > + cmm_config.lut.size = crtc->state->gamma_lut->length > > + / sizeof(cmm_config.lut.table[0]); > > It has just occurred to me that the hardware only support LUTs of > exactly 256 entries. Should we remove cmm_config.lut.size (simplifying > the code in the CMM driver), and add a check to the CRTC .atomic_check() > handler to reject invalid LUTs ? Sorry for not having caught this > earlier. Just an additional comment, if we drop the size field, then the cmm_config.lut.table pointer should be set to NULL when the LUT contents don't need to be updated. > > + else > > + cmm_config.lut.size = 0; > > + > > + rcar_cmm_setup(rcrtc->cmm, &cmm_config); > > +} > > + > > static int rcar_du_atomic_check(struct drm_device *dev, > > struct drm_atomic_state *state) > > { > > @@ -410,6 +442,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, > > -- > Regards, > > Laurent Pinchart -- Regards, Laurent Pinchart