From: Jacopo Mondi <jacopo+renesas@jmondi.org> To: laurent.pinchart@ideasonboard.com, kieran.bingham+renesas@ideasonboard.com, airlied@linux.ie, daniel@ffwll.ch Cc: Jacopo Mondi <jacopo+renesas@jmondi.org>, 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 Subject: [PATCH 20/20] drm: rcar-du: kms: Update CMM in atomic commit tail Date: Thu, 6 Jun 2019 16:22:20 +0200 Message-ID: <20190606142220.1392-21-jacopo+renesas@jmondi.org> (raw) In-Reply-To: <20190606142220.1392-1-jacopo+renesas@jmondi.org> 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. Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org> --- drivers/gpu/drm/rcar-du/rcar_du_kms.c | 36 +++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c index 5a910a04e1d9..29a2020a46b5 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c @@ -21,6 +21,7 @@ #include <linux/of_platform.h> #include <linux/wait.h> +#include "rcar_cmm.h" #include "rcar_du_crtc.h" #include "rcar_du_drv.h" #include "rcar_du_encoder.h" @@ -367,6 +368,38 @@ 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]); + 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) { @@ -409,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, -- 2.21.0
next prev parent reply index Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-06 14:22 [PATCH 00/20] drm: rcar-du: Add Color Management Module (CMM) Jacopo Mondi 2019-06-06 14:22 ` [PATCH 01/20] dt-bindings: display: renesas,cmm: Add R-Car CMM documentation Jacopo Mondi 2019-06-06 16:52 ` Laurent Pinchart 2019-06-06 18:06 ` Geert Uytterhoeven 2019-06-06 20:19 ` Sergei Shtylyov 2019-06-06 14:22 ` [PATCH 02/20] dt-bindings: display, renesas,du: Document cmms property Jacopo Mondi 2019-06-06 16:52 ` Laurent Pinchart 2019-06-06 14:22 ` [PATCH 03/20] dt-bindings: display, renesas,du: Update 'vsps' in example Jacopo Mondi 2019-06-06 16:53 ` Laurent Pinchart 2019-06-06 20:00 ` Geert Uytterhoeven 2019-06-07 11:36 ` Laurent Pinchart 2019-06-06 14:22 ` [PATCH 04/20] clk: renesas: r8a7796: Add CMM clocks Jacopo Mondi 2019-06-06 14:22 ` [PATCH 05/20] clk: renesas: r8a7795: " Jacopo Mondi 2019-06-06 16:58 ` Laurent Pinchart 2019-06-06 18:18 ` Jacopo Mondi 2019-06-12 7:41 ` Geert Uytterhoeven 2019-06-06 14:22 ` [PATCH 06/20] clk: renesas: r8a77965: " Jacopo Mondi 2019-06-06 16:59 ` Laurent Pinchart 2019-06-12 7:43 ` Geert Uytterhoeven 2019-06-06 14:22 ` [PATCH 07/20] clk: renesas: r8a77990: " Jacopo Mondi 2019-06-06 17:00 ` Laurent Pinchart 2019-06-12 7:43 ` Geert Uytterhoeven 2019-06-06 14:22 ` [PATCH 08/20] clk: renesas: r8a77995: " Jacopo Mondi 2019-06-06 17:00 ` Laurent Pinchart 2019-06-12 7:44 ` Geert Uytterhoeven 2019-06-06 14:22 ` [PATCH 09/20] arm64: dts: renesas: r8a7796: Add CMM units Jacopo Mondi 2019-06-06 17:04 ` Laurent Pinchart 2019-06-06 14:22 ` [PATCH 10/20] arm64: dts: renesas: r8a7795: " Jacopo Mondi 2019-06-06 17:06 ` Laurent Pinchart 2019-06-06 14:22 ` [PATCH 11/20] arm64: dts: renesas: r8a77965: " Jacopo Mondi 2019-06-06 17:06 ` Laurent Pinchart 2019-06-06 14:22 ` [PATCH 12/20] arm64: dts: renesas: r8a77990: " Jacopo Mondi 2019-06-06 17:07 ` Laurent Pinchart 2019-06-06 14:22 ` [PATCH 13/20] arm64: dts: renesas: r8a77995: " Jacopo Mondi 2019-06-06 17:08 ` Laurent Pinchart 2019-06-06 14:22 ` [PATCH 14/20] drm: rcar-du: Add support for CMM Jacopo Mondi 2019-06-07 11:35 ` Laurent Pinchart 2019-06-07 11:44 ` Laurent Pinchart 2019-06-07 12:18 ` Laurent Pinchart 2019-06-14 8:54 ` Jacopo Mondi 2019-06-06 14:22 ` [PATCH 15/20] drm: rcar-du: Claim CMM support for Gen3 SoCs Jacopo Mondi 2019-06-07 11:38 ` Laurent Pinchart 2019-06-06 14:22 ` [PATCH 16/20] drm: rcar-du: kms: Collect CMM instances Jacopo Mondi 2019-06-07 11:49 ` Laurent Pinchart 2019-06-06 14:22 ` [PATCH 17/20] drm: rcar-du: crtc: Enable and disable CMMs Jacopo Mondi 2019-06-07 11:51 ` Laurent Pinchart 2019-06-06 14:22 ` [PATCH 18/20] drm: rcar-du: group: Enable DU's CMM extension Jacopo Mondi 2019-06-07 11:55 ` Laurent Pinchart 2019-06-06 14:22 ` [PATCH 19/20] drm: rcar-du: crtc: Register GAMMA_LUT properties Jacopo Mondi 2019-06-07 12:03 ` Laurent Pinchart 2019-06-14 8:15 ` Jacopo Mondi 2019-06-14 8:42 ` Daniel Vetter 2019-06-14 9:27 ` Jacopo Mondi 2019-06-14 14:47 ` Daniel Vetter 2019-06-06 14:22 ` Jacopo Mondi [this message] 2019-06-07 12:06 ` [PATCH 20/20] drm: rcar-du: kms: Update CMM in atomic commit tail Laurent Pinchart 2019-06-14 8:19 ` Jacopo Mondi 2019-09-12 23:39 ` Laurent Pinchart
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190606142220.1392-21-jacopo+renesas@jmondi.org \ --to=jacopo+renesas@jmondi.org \ --cc=Harsha.ManjulaMallikarjun@in.bosch.com \ --cc=VenkataRajesh.Kalakodima@in.bosch.com \ --cc=airlied@linux.ie \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=kieran.bingham+renesas@ideasonboard.com \ --cc=koji.matsuoka.xm@renesas.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=muroya@ksk.co.jp \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-Renesas-SoC Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-renesas-soc/0 linux-renesas-soc/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-renesas-soc linux-renesas-soc/ https://lore.kernel.org/linux-renesas-soc \ linux-renesas-soc@vger.kernel.org public-inbox-index linux-renesas-soc Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.kernel.vger.linux-renesas-soc AGPL code for this site: git clone https://public-inbox.org/public-inbox.git