All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Cc: "Jacopo Mondi" <jacopo.mondi@ideasonboard.com>,
	"Simon Ser" <contact@emersion.fr>,
	"Pekka Paalanen" <pekka.paalanen@collabora.com>,
	"Jonas Ådahl" <jadahl@redhat.com>,
	xaver.hugl@gmail.com, "Melissa Wen" <mwen@igalia.com>,
	wayland-devel <wayland-devel@lists.freedesktop.org>,
	mdaenzer@redhat.com, "Uma Shankar" <uma.shankar@intel.com>,
	"Victoria Brekenfeld" <victoria@system76.com>,
	aleixpol@kde.org, "Sebastian Wick" <sebastian.wick@redhat.com>,
	"Joshua Ashton" <joshua@froggi.es>,
	airlied@gmail.com, alexander.deucher@amd.com,
	christian.koenig@amd.com, daniel@ffwll.ch,
	harry.wentland@amd.com, maarten.lankhorst@linux.intel.com,
	mripard@kernel.org, Rodrigo.Siqueira@amd.com, sunpeng.li@amd.com,
	tzimmermann@suse.de, Xinhui.Pan@amd.com,
	"DRI Development" <dri-devel@lists.freedesktop.org>,
	amd-gfx@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org,
	"Laurent Pinchart" <laurent.pinchart+renesas@ideasonboard.com>
Subject: [RFC 8/9] drm: rcar-du: kms: Configure the CLU
Date: Wed, 21 Jun 2023 10:10:30 +0200	[thread overview]
Message-ID: <20230621081031.7876-9-jacopo.mondi@ideasonboard.com> (raw)
In-Reply-To: <20230621081031.7876-1-jacopo.mondi@ideasonboard.com>

From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

Link the DRM 3D-CLU configuration to the CMM setup configuration.

Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
---
 drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
index a2d477dc5a51..895a23161f7b 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
@@ -521,19 +521,23 @@ static int rcar_du_cmm_check(struct drm_crtc *crtc,
 			     struct drm_crtc_state *state)
 {
 	struct drm_property_blob *drm_lut = state->gamma_lut;
+	struct drm_property_blob *drm_clu = state->lut3d;
 	struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
 	struct device *dev = rcrtc->dev->dev;
 
-	if (!drm_lut)
-		return 0;
-
-	/* We only accept fully populated LUT tables. */
-	if (drm_color_lut_size(drm_lut) != CM2_LUT_SIZE) {
+	/* We only accept fully populated LUTs. */
+	if (drm_lut && drm_color_lut_size(drm_lut) != CM2_LUT_SIZE) {
 		dev_err(dev, "invalid gamma lut size: %zu bytes\n",
 			drm_lut->length);
 		return -EINVAL;
 	}
 
+	if (drm_clu && drm_color_lut_size(drm_clu) != CM2_CLU_SIZE) {
+		dev_err(dev, "invalid cubic lut size: %zu bytes\n",
+			drm_clu->length);
+		return -EINVAL;
+	}
+
 	return 0;
 }
 
@@ -555,6 +559,15 @@ static void rcar_du_cmm_setup(struct rcar_du_crtc *rcrtc,
 				     ? new_state->gamma_lut->data : NULL;
 	}
 
+	if (!old_state ||
+	    !old_state->lut3d != !new_state->lut3d ||
+	    (old_state->lut3d && new_state->lut3d &&
+	     old_state->lut3d->base.id != new_state->lut3d->base.id)) {
+		cmm_config.clu.update = true;
+		cmm_config.clu.table = new_state->lut3d
+				     ? new_state->lut3d->data : NULL;
+	}
+
 	rcar_cmm_setup(rcrtc->cmm, &cmm_config);
 }
 
-- 
2.40.1


WARNING: multiple messages have this Message-ID (diff)
From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Cc: "Victoria Brekenfeld" <victoria@system76.com>,
	"DRI Development" <dri-devel@lists.freedesktop.org>,
	mdaenzer@redhat.com, aleixpol@kde.org,
	"Laurent Pinchart" <laurent.pinchart+renesas@ideasonboard.com>,
	Rodrigo.Siqueira@amd.com, amd-gfx@lists.freedesktop.org,
	wayland-devel <wayland-devel@lists.freedesktop.org>,
	"Jonas Ådahl" <jadahl@redhat.com>,
	"Uma Shankar" <uma.shankar@intel.com>,
	tzimmermann@suse.de, sunpeng.li@amd.com,
	"Sebastian Wick" <sebastian.wick@redhat.com>,
	mripard@kernel.org, "Melissa Wen" <mwen@igalia.com>,
	"Jacopo Mondi" <jacopo.mondi@ideasonboard.com>,
	"Pekka Paalanen" <pekka.paalanen@collabora.com>,
	Xinhui.Pan@amd.com, xaver.hugl@gmail.com,
	linux-renesas-soc@vger.kernel.org, alexander.deucher@amd.com,
	christian.koenig@amd.com, "Joshua Ashton" <joshua@froggi.es>
Subject: [RFC 8/9] drm: rcar-du: kms: Configure the CLU
Date: Wed, 21 Jun 2023 10:10:30 +0200	[thread overview]
Message-ID: <20230621081031.7876-9-jacopo.mondi@ideasonboard.com> (raw)
In-Reply-To: <20230621081031.7876-1-jacopo.mondi@ideasonboard.com>

From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

Link the DRM 3D-CLU configuration to the CMM setup configuration.

Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
---
 drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
index a2d477dc5a51..895a23161f7b 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
@@ -521,19 +521,23 @@ static int rcar_du_cmm_check(struct drm_crtc *crtc,
 			     struct drm_crtc_state *state)
 {
 	struct drm_property_blob *drm_lut = state->gamma_lut;
+	struct drm_property_blob *drm_clu = state->lut3d;
 	struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
 	struct device *dev = rcrtc->dev->dev;
 
-	if (!drm_lut)
-		return 0;
-
-	/* We only accept fully populated LUT tables. */
-	if (drm_color_lut_size(drm_lut) != CM2_LUT_SIZE) {
+	/* We only accept fully populated LUTs. */
+	if (drm_lut && drm_color_lut_size(drm_lut) != CM2_LUT_SIZE) {
 		dev_err(dev, "invalid gamma lut size: %zu bytes\n",
 			drm_lut->length);
 		return -EINVAL;
 	}
 
+	if (drm_clu && drm_color_lut_size(drm_clu) != CM2_CLU_SIZE) {
+		dev_err(dev, "invalid cubic lut size: %zu bytes\n",
+			drm_clu->length);
+		return -EINVAL;
+	}
+
 	return 0;
 }
 
@@ -555,6 +559,15 @@ static void rcar_du_cmm_setup(struct rcar_du_crtc *rcrtc,
 				     ? new_state->gamma_lut->data : NULL;
 	}
 
+	if (!old_state ||
+	    !old_state->lut3d != !new_state->lut3d ||
+	    (old_state->lut3d && new_state->lut3d &&
+	     old_state->lut3d->base.id != new_state->lut3d->base.id)) {
+		cmm_config.clu.update = true;
+		cmm_config.clu.table = new_state->lut3d
+				     ? new_state->lut3d->data : NULL;
+	}
+
 	rcar_cmm_setup(rcrtc->cmm, &cmm_config);
 }
 
-- 
2.40.1


WARNING: multiple messages have this Message-ID (diff)
From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Cc: "Victoria Brekenfeld" <victoria@system76.com>,
	"DRI Development" <dri-devel@lists.freedesktop.org>,
	mdaenzer@redhat.com, airlied@gmail.com, aleixpol@kde.org,
	"Laurent Pinchart" <laurent.pinchart+renesas@ideasonboard.com>,
	Rodrigo.Siqueira@amd.com, amd-gfx@lists.freedesktop.org,
	wayland-devel <wayland-devel@lists.freedesktop.org>,
	"Jonas Ådahl" <jadahl@redhat.com>,
	"Uma Shankar" <uma.shankar@intel.com>,
	harry.wentland@amd.com, tzimmermann@suse.de, sunpeng.li@amd.com,
	maarten.lankhorst@linux.intel.com,
	"Sebastian Wick" <sebastian.wick@redhat.com>,
	mripard@kernel.org, "Melissa Wen" <mwen@igalia.com>,
	"Jacopo Mondi" <jacopo.mondi@ideasonboard.com>,
	"Pekka Paalanen" <pekka.paalanen@collabora.com>,
	"Simon Ser" <contact@emersion.fr>,
	Xinhui.Pan@amd.com, xaver.hugl@gmail.com,
	linux-renesas-soc@vger.kernel.org, daniel@ffwll.ch,
	alexander.deucher@amd.com, christian.koenig@amd.com,
	"Joshua Ashton" <joshua@froggi.es>
Subject: [RFC 8/9] drm: rcar-du: kms: Configure the CLU
Date: Wed, 21 Jun 2023 10:10:30 +0200	[thread overview]
Message-ID: <20230621081031.7876-9-jacopo.mondi@ideasonboard.com> (raw)
In-Reply-To: <20230621081031.7876-1-jacopo.mondi@ideasonboard.com>

From: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

Link the DRM 3D-CLU configuration to the CMM setup configuration.

Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
---
 drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
index a2d477dc5a51..895a23161f7b 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
@@ -521,19 +521,23 @@ static int rcar_du_cmm_check(struct drm_crtc *crtc,
 			     struct drm_crtc_state *state)
 {
 	struct drm_property_blob *drm_lut = state->gamma_lut;
+	struct drm_property_blob *drm_clu = state->lut3d;
 	struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
 	struct device *dev = rcrtc->dev->dev;
 
-	if (!drm_lut)
-		return 0;
-
-	/* We only accept fully populated LUT tables. */
-	if (drm_color_lut_size(drm_lut) != CM2_LUT_SIZE) {
+	/* We only accept fully populated LUTs. */
+	if (drm_lut && drm_color_lut_size(drm_lut) != CM2_LUT_SIZE) {
 		dev_err(dev, "invalid gamma lut size: %zu bytes\n",
 			drm_lut->length);
 		return -EINVAL;
 	}
 
+	if (drm_clu && drm_color_lut_size(drm_clu) != CM2_CLU_SIZE) {
+		dev_err(dev, "invalid cubic lut size: %zu bytes\n",
+			drm_clu->length);
+		return -EINVAL;
+	}
+
 	return 0;
 }
 
@@ -555,6 +559,15 @@ static void rcar_du_cmm_setup(struct rcar_du_crtc *rcrtc,
 				     ? new_state->gamma_lut->data : NULL;
 	}
 
+	if (!old_state ||
+	    !old_state->lut3d != !new_state->lut3d ||
+	    (old_state->lut3d && new_state->lut3d &&
+	     old_state->lut3d->base.id != new_state->lut3d->base.id)) {
+		cmm_config.clu.update = true;
+		cmm_config.clu.table = new_state->lut3d
+				     ? new_state->lut3d->data : NULL;
+	}
+
 	rcar_cmm_setup(rcrtc->cmm, &cmm_config);
 }
 
-- 
2.40.1


  parent reply	other threads:[~2023-06-21  8:11 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-21  8:10 [RFC 0/9] drm: rcar-du: cmm: Enable 3D LUT support Jacopo Mondi
2023-06-21  8:10 ` Jacopo Mondi
2023-06-21  8:10 ` Jacopo Mondi
2023-06-21  8:10 ` [RFC 1/9] drm: Add 3D LUT mode and its attributes Jacopo Mondi
2023-06-21  8:10   ` Jacopo Mondi
2023-06-21  8:10   ` Jacopo Mondi
2023-06-21  8:10 ` [RFC 2/9] drm/drm_color_mgmt: add shaper LUT to color mgmt properties Jacopo Mondi
2023-06-21  8:10   ` Jacopo Mondi
2023-06-21  8:10   ` Jacopo Mondi
2023-06-21  8:10 ` [RFC 3/9] drm/drm_color_mgmt: add 3D LUT props to DRM color mgmt Jacopo Mondi
2023-06-21  8:10   ` Jacopo Mondi
2023-06-21  8:10   ` Jacopo Mondi
2023-06-21  8:10 ` [RFC 4/9] drm/drm_color_mgmt: add function to create 3D LUT modes supported Jacopo Mondi
2023-06-21  8:10   ` Jacopo Mondi
2023-06-21  8:10   ` Jacopo Mondi
2023-06-21  8:10 ` [RFC 5/9] drm/drm_color_mgmt: add function to attach 3D LUT props Jacopo Mondi
2023-06-21  8:10   ` Jacopo Mondi
2023-06-21  8:10   ` Jacopo Mondi
2023-06-21  8:10 ` [RFC 6/9] drm: rcar-du: cmm: Refactor LUT configuration Jacopo Mondi
2023-06-21  8:10   ` Jacopo Mondi
2023-06-21  8:10   ` Jacopo Mondi
2023-06-21  8:10 ` [RFC 7/9] drm: rcar-du: cmm: Provide 3D-CLU support Jacopo Mondi
2023-06-21  8:10   ` Jacopo Mondi
2023-06-21  8:10   ` Jacopo Mondi
2023-06-21  8:10 ` Jacopo Mondi [this message]
2023-06-21  8:10   ` [RFC 8/9] drm: rcar-du: kms: Configure the CLU Jacopo Mondi
2023-06-21  8:10   ` Jacopo Mondi
2023-06-21  8:10 ` [RFC 9/9] drm: rcar-du: crtc: Enable 3D LUT Jacopo Mondi
2023-06-21  8:10   ` Jacopo Mondi
2023-06-21  8:10   ` Jacopo Mondi
2023-06-21 10:33 ` [RFC 0/9] drm: rcar-du: cmm: Enable 3D LUT support Pekka Paalanen
2023-06-21 10:33   ` Pekka Paalanen
2023-06-21 10:33   ` Pekka Paalanen

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=20230621081031.7876-9-jacopo.mondi@ideasonboard.com \
    --to=jacopo.mondi@ideasonboard.com \
    --cc=Rodrigo.Siqueira@amd.com \
    --cc=Xinhui.Pan@amd.com \
    --cc=airlied@gmail.com \
    --cc=aleixpol@kde.org \
    --cc=alexander.deucher@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=christian.koenig@amd.com \
    --cc=contact@emersion.fr \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=harry.wentland@amd.com \
    --cc=jadahl@redhat.com \
    --cc=joshua@froggi.es \
    --cc=kieran.bingham+renesas@ideasonboard.com \
    --cc=laurent.pinchart+renesas@ideasonboard.com \
    --cc=laurent.pinchart@ideasonboard.com \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mdaenzer@redhat.com \
    --cc=mripard@kernel.org \
    --cc=mwen@igalia.com \
    --cc=pekka.paalanen@collabora.com \
    --cc=sebastian.wick@redhat.com \
    --cc=sunpeng.li@amd.com \
    --cc=tzimmermann@suse.de \
    --cc=uma.shankar@intel.com \
    --cc=victoria@system76.com \
    --cc=wayland-devel@lists.freedesktop.org \
    --cc=xaver.hugl@gmail.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.