linux-renesas-soc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 v2 16/19] drm: rcar-du: kms: Collect CMM instances
Date: Sat,  6 Jul 2019 16:07:43 +0200	[thread overview]
Message-ID: <20190706140746.29132-17-jacopo+renesas@jmondi.org> (raw)
In-Reply-To: <20190706140746.29132-1-jacopo+renesas@jmondi.org>

Implement device tree parsing to collect the available CMM instances
described by the 'cmms' property. Associate CMMs with CRTCs and store a
mask of active CMMs in the DU group for later enablement.

Signed-off-by: Jacopo Mondi <jacopo+renesas@jmondi.org>
---
 drivers/gpu/drm/rcar-du/rcar_du_crtc.c  |  6 +++
 drivers/gpu/drm/rcar-du/rcar_du_crtc.h  |  2 +
 drivers/gpu/drm/rcar-du/rcar_du_drv.h   |  3 ++
 drivers/gpu/drm/rcar-du/rcar_du_group.h |  2 +
 drivers/gpu/drm/rcar-du/rcar_du_kms.c   | 50 +++++++++++++++++++++++++
 5 files changed, 63 insertions(+)

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
index 2da46e3dc4ae..23f1d6cc1719 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
@@ -1194,6 +1194,12 @@ int rcar_du_crtc_create(struct rcar_du_group *rgrp, unsigned int swindex,
 	if (ret < 0)
 		return ret;
 
+	/* CMM might be disabled for this CRTC. */
+	if (rcdu->cmms[swindex]) {
+		rcrtc->cmm = rcdu->cmms[swindex];
+		rgrp->cmms_mask |= BIT(hwindex % 2);
+	}
+
 	drm_crtc_helper_add(crtc, &crtc_helper_funcs);
 
 	/* Start with vertical blanking interrupt reporting disabled. */
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
index 3b7fc668996f..5f2940c42225 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h
@@ -39,6 +39,7 @@ struct rcar_du_vsp;
  * @vblank_wait: wait queue used to signal vertical blanking
  * @vblank_count: number of vertical blanking interrupts to wait for
  * @group: CRTC group this CRTC belongs to
+ * @cmm: CMM associated with this CRTC
  * @vsp: VSP feeding video to this CRTC
  * @vsp_pipe: index of the VSP pipeline feeding video to this CRTC
  * @writeback: the writeback connector
@@ -64,6 +65,7 @@ struct rcar_du_crtc {
 	unsigned int vblank_count;
 
 	struct rcar_du_group *group;
+	struct platform_device *cmm;
 	struct rcar_du_vsp *vsp;
 	unsigned int vsp_pipe;
 
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
index a00dccc447aa..300ec60ba31b 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h
@@ -13,6 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/wait.h>
 
+#include "rcar_cmm.h"
 #include "rcar_du_crtc.h"
 #include "rcar_du_group.h"
 #include "rcar_du_vsp.h"
@@ -70,6 +71,7 @@ struct rcar_du_device_info {
 
 #define RCAR_DU_MAX_CRTCS		4
 #define RCAR_DU_MAX_GROUPS		DIV_ROUND_UP(RCAR_DU_MAX_CRTCS, 2)
+#define RCAR_DU_MAX_CMMS		4
 #define RCAR_DU_MAX_VSPS		4
 
 struct rcar_du_device {
@@ -86,6 +88,7 @@ struct rcar_du_device {
 	struct rcar_du_encoder *encoders[RCAR_DU_OUTPUT_MAX];
 
 	struct rcar_du_group groups[RCAR_DU_MAX_GROUPS];
+	struct platform_device *cmms[RCAR_DU_MAX_CMMS];
 	struct rcar_du_vsp vsps[RCAR_DU_MAX_VSPS];
 
 	struct {
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_group.h b/drivers/gpu/drm/rcar-du/rcar_du_group.h
index 87950c1f6a52..b0c1466593a3 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_group.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_group.h
@@ -22,6 +22,7 @@ struct rcar_du_device;
  * @mmio_offset: registers offset in the device memory map
  * @index: group index
  * @channels_mask: bitmask of populated DU channels in this group
+ * @cmms_mask: bitmask of enabled CMMs in this group
  * @num_crtcs: number of CRTCs in this group (1 or 2)
  * @use_count: number of users of the group (rcar_du_group_(get|put))
  * @used_crtcs: number of CRTCs currently in use
@@ -37,6 +38,7 @@ struct rcar_du_group {
 	unsigned int index;
 
 	unsigned int channels_mask;
+	unsigned int cmms_mask;
 	unsigned int num_crtcs;
 	unsigned int use_count;
 	unsigned int used_crtcs;
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index f8f7fff34dff..b79cda2f5531 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
@@ -18,6 +18,7 @@
 #include <drm/drm_vblank.h>
 
 #include <linux/of_graph.h>
+#include <linux/of_platform.h>
 #include <linux/wait.h>
 
 #include "rcar_du_crtc.h"
@@ -534,6 +535,51 @@ static int rcar_du_vsps_init(struct rcar_du_device *rcdu)
 	return ret;
 }
 
+static int rcar_du_cmm_init(struct rcar_du_device *rcdu)
+{
+	const struct device_node *np = rcdu->dev->of_node;
+	unsigned int i;
+	int cells;
+
+	cells = of_property_count_u32_elems(np, "cmms");
+	if (cells == -EINVAL)
+		return 0;
+
+	if (cells > RCAR_DU_MAX_CMMS || cells > rcdu->num_crtcs) {
+		dev_err(rcdu->dev, "Invalid 'cmms' property format\n");
+		return -EINVAL;
+	}
+
+	for (i = 0; i < cells; ++i) {
+		struct platform_device *pdev;
+		struct device_node *cmm;
+
+		cmm = of_parse_phandle(np, "cmms", i);
+		if (IS_ERR(cmm)) {
+			dev_err(rcdu->dev, "Failed to parse 'cmms' property\n");
+			return PTR_ERR(cmm);
+		}
+
+		pdev = of_find_device_by_node(cmm);
+		if (IS_ERR(pdev)) {
+			dev_err(rcdu->dev, "No device found for cmms[%u]\n", i);
+			of_node_put(cmm);
+			return PTR_ERR(pdev);
+		}
+
+		if (!of_device_is_available(cmm)) {
+			/* It's fine to have a phandle to a non-enabled CMM. */
+			of_node_put(cmm);
+			continue;
+		}
+
+		of_node_put(cmm);
+		rcdu->cmms[i] = pdev;
+	}
+
+	return 0;
+}
+
 int rcar_du_modeset_init(struct rcar_du_device *rcdu)
 {
 	static const unsigned int mmio_offsets[] = {
@@ -624,6 +670,10 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu)
 			return ret;
 	}
 
+	/* Initialize the Color Management Modules. */
+	if (rcar_du_cmm_init(rcdu))
+		return ret;
+
 	/* Create the CRTCs. */
 	for (swindex = 0, hwindex = 0; swindex < rcdu->num_crtcs; ++hwindex) {
 		struct rcar_du_group *rgrp;
-- 
2.21.0


  parent reply	other threads:[~2019-07-06 14:07 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-06 14:07 [PATCH v2 00/19] drm: rcar-du: Add Color Management Module (CMM) Jacopo Mondi
2019-07-06 14:07 ` [PATCH v2 01/19] dt-bindings: display: renesas,cmm: Add R-Car CMM documentation Jacopo Mondi
2019-07-08  7:58   ` Geert Uytterhoeven
2019-08-19 13:45     ` Geert Uytterhoeven
2019-08-20  7:48       ` Jacopo Mondi
2019-08-20  7:53         ` Geert Uytterhoeven
2019-08-20  8:05           ` Jacopo Mondi
2019-08-20 17:41           ` Laurent Pinchart
2019-08-20 18:08             ` Geert Uytterhoeven
2019-07-06 14:07 ` [PATCH v2 02/19] dt-bindings: display, renesas,du: Document cmms property Jacopo Mondi
2019-07-06 14:07 ` [PATCH v2 03/19] arm64: renesas: Update 'vsps' property Jacopo Mondi
2019-07-08  3:11   ` Laurent Pinchart
2019-07-09 13:10     ` Kieran Bingham
2019-08-21 12:16   ` Geert Uytterhoeven
2019-08-22 10:00     ` Jacopo Mondi
2019-08-22 15:02       ` Laurent Pinchart
2019-07-06 14:07 ` [PATCH v2 04/19] clk: renesas: r8a7796: Add CMM clocks Jacopo Mondi
2019-07-06 14:07 ` [PATCH v2 05/19] clk: renesas: r8a7795: " Jacopo Mondi
2019-07-06 14:07 ` [PATCH v2 06/19] clk: renesas: r8a77965: " Jacopo Mondi
2019-07-06 14:07 ` [PATCH v2 07/19] clk: renesas: r8a77990: " Jacopo Mondi
2019-07-06 14:07 ` [PATCH v2 08/19] clk: renesas: r8a77995: " Jacopo Mondi
2019-07-06 14:07 ` [PATCH v2 09/19] arm64: dts: renesas: r8a7796: Add CMM units Jacopo Mondi
2019-07-06 14:07 ` [PATCH v2 10/19] arm64: dts: renesas: r8a7795: " Jacopo Mondi
2019-07-06 14:07 ` [PATCH v2 11/19] arm64: dts: renesas: r8a77965: " Jacopo Mondi
2019-07-08  3:16   ` Laurent Pinchart
2019-07-06 14:07 ` [PATCH v2 12/19] arm64: dts: renesas: r8a77990: " Jacopo Mondi
2019-07-06 14:07 ` [PATCH v2 13/19] arm64: dts: renesas: r8a77995: " Jacopo Mondi
2019-07-06 14:07 ` [PATCH v2 14/19] drm: rcar-du: Add support for CMM Jacopo Mondi
2019-07-16 13:17   ` Ulrich Hecht
2019-08-20 17:37     ` Laurent Pinchart
2019-08-22 16:44       ` Jacopo Mondi
2019-08-20 17:34   ` Laurent Pinchart
2019-08-22 13:01     ` Jacopo Mondi
2019-08-22 15:10       ` Laurent Pinchart
2019-07-06 14:07 ` [PATCH v2 15/19] drm: rcar-du: Claim CMM support for Gen3 SoCs Jacopo Mondi
2019-07-16 13:18   ` Ulrich Hecht
2019-08-20 17:45   ` Laurent Pinchart
2019-07-06 14:07 ` Jacopo Mondi [this message]
2019-07-16 13:22   ` [PATCH v2 16/19] drm: rcar-du: kms: Collect CMM instances Ulrich Hecht
2019-08-20 17:54   ` Laurent Pinchart
2019-08-22 19:09     ` Jacopo Mondi
2019-07-06 14:07 ` [PATCH v2 17/19] drm: rcar-du: crtc: Enable and disable CMMs Jacopo Mondi
2019-07-16 13:31   ` Ulrich Hecht
2019-08-20 17:57   ` Laurent Pinchart
2019-07-06 14:07 ` [PATCH v2 18/19] drm: rcar-du: crtc: Register GAMMA_LUT properties Jacopo Mondi
2019-07-16 13:32   ` Ulrich Hecht
2019-08-20 18:02   ` Laurent Pinchart
2019-07-06 14:07 ` [PATCH v2 19/19] drm: rcar-du: kms: Update CMM in atomic commit tail Jacopo Mondi
2019-07-16 13:33   ` Ulrich Hecht
2019-08-20 18:42   ` Laurent Pinchart
2019-08-22 19:19     ` Jacopo Mondi
2019-08-22 19:54       ` 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=20190706140746.29132-17-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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).