From patchwork Tue Oct 15 10:46:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 11191153 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2870C1390 for ; Tue, 15 Oct 2019 16:39:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 10BEE20650 for ; Tue, 15 Oct 2019 16:39:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 10BEE20650 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=jmondi.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1F1D76E867; Tue, 15 Oct 2019 16:39:03 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net [217.70.183.198]) by gabe.freedesktop.org (Postfix) with ESMTPS id C11956E359 for ; Tue, 15 Oct 2019 10:44:48 +0000 (UTC) X-Originating-IP: 2.224.242.101 Received: from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101]) (Authenticated sender: jacopo@jmondi.org) by relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 77817C0004; Tue, 15 Oct 2019 10:44:40 +0000 (UTC) From: Jacopo Mondi To: laurent.pinchart@ideasonboard.com, kieran.bingham+renesas@ideasonboard.com, geert@linux-m68k.org, horms@verge.net.au, uli+renesas@fpond.eu, VenkataRajesh.Kalakodima@in.bosch.com Subject: [PATCH v5 0/8] drm: rcar-du: Add Color Management Module (CMM) Date: Tue, 15 Oct 2019 12:46:13 +0200 Message-Id: <20191015104621.62514-1-jacopo+renesas@jmondi.org> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 15 Oct 2019 16:38:12 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: muroya@ksk.co.jp, airlied@linux.ie, koji.matsuoka.xm@renesas.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Jacopo Mondi , seanpaul@chromium.org, Harsha.ManjulaMallikarjun@in.bosch.com, ezequiel@collabora.com Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" References: A reference to the v1 cover letter, with some background on the CMM is available here: https://lkml.org/lkml/2019/6/6/583 v2: https://lore.kernel.org/linux-renesas-soc/20190706140746.29132-10-jacopo+renesas@jmondi.org/ v3: https://lore.kernel.org/linux-renesas-soc/20190825135154.11488-1-jacopo+renesas@jmondi.org/ v4: https://lore.kernel.org/linux-renesas-soc/20190906135436.10622-1-jacopo+renesas@jmondi.org/ Again, quite a consistent changelog, mostly due to the developments happened on Ezequiel's VOP unit following Sean's advices. I here implemented the same, and moved the CMM handling to the crtc being and enable callbacks. As a result the overall implementation results quite a lot simplified, mostly on the CMM driver side. I have dropped tags and acks on the CMM driver and CMM enablement patches in DU crtc driver because of the number of changes. A more detailed change log: - Rebased on renesas-devel-2019-10-07-v5.4-rc4 * Bindings/DT - Included Rob's comments on the yaml file license and the use of 'OneOf' in the compatible property description - Use the bracketed style suggested by Kieran for the 'renesas,cmm' property introduced in patch 2 - Re-order the properties in the SoC DTS files as suggested by Kieran * CMM/DU - As anticipated, moved CMM management to the crtc from the atomic commit tail helper where it was implemented in v4 This allow to correctly support resume/suspend and proper ordering of the CMM enable and setup operations (enable -before- setup) - As a consequence the CMM driver is greatly simplified by removing the need to cache the LUT table entries provided to cmm_setup() and later re-apply them at enable time. - Better support handling of disabled CMM config option by returning -ENODEV at cmm_init() time as suggested by Kieran. * Testing I have tested by injecting a color inversion LUT table and enabling/disabling it every 50 displayed frames: https://jmondi.org/cgit/kmsxx/log/?h=gamma_lut CMM functionalities are retained between suspend/resume cycles (tested with suspend-to-idle) without requiring a re-programming of the LUT tables. Testing with real world use cases might be beneficial. Rajesh are you still interested in giving this series a spin? Laurent, Kieran, could we fast-track review of this and hopefully try to have it merged for v5.5 ? Thanks Ezequiel for having suggested me this solution. Thanks j Jacopo Mondi (8): dt-bindings: display: renesas,cmm: Add R-Car CMM documentation dt-bindings: display, renesas,du: Document cmms property drm: rcar-du: Add support for CMM drm: rcar-du: kms: Initialize CMM instances drm: rcar-du: crtc: Control CMM operations drm: rcar-du: crtc: Register GAMMA_LUT properties arm64: dts: renesas: Add CMM units to Gen3 SoCs drm: rcar-du: kms: Expand comment in vsps parsing routine .../bindings/display/renesas,cmm.yaml | 67 ++++++ .../bindings/display/renesas,du.txt | 5 + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 39 ++++ arch/arm64/boot/dts/renesas/r8a7796.dtsi | 31 ++- arch/arm64/boot/dts/renesas/r8a77965.dtsi | 31 ++- arch/arm64/boot/dts/renesas/r8a77990.dtsi | 21 ++ arch/arm64/boot/dts/renesas/r8a77995.dtsi | 21 ++ drivers/gpu/drm/rcar-du/Kconfig | 7 + drivers/gpu/drm/rcar-du/Makefile | 1 + drivers/gpu/drm/rcar-du/rcar_cmm.c | 198 ++++++++++++++++++ drivers/gpu/drm/rcar-du/rcar_cmm.h | 60 ++++++ drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 89 ++++++++ drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 2 + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 2 + drivers/gpu/drm/rcar-du/rcar_du_group.c | 5 + drivers/gpu/drm/rcar-du/rcar_du_group.h | 2 + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 82 +++++++- drivers/gpu/drm/rcar-du/rcar_du_regs.h | 5 + 18 files changed, 665 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/renesas,cmm.yaml create mode 100644 drivers/gpu/drm/rcar-du/rcar_cmm.c create mode 100644 drivers/gpu/drm/rcar-du/rcar_cmm.h --- 2.23.0