commit bd04eff92152f4ae66bbb3f26df0383d30a3846f
author Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> Tue Sep 17 11:49:44 2019 +0100
committer Kieran Bingham <kieran.bingham+renesas@ideasonboard.com> Fri Jun 19 23:14:22 2020 +0100
tree 9adc35e7ba7b839f528c7e5af6a6f02ff400423d
parent aaf73db1576e431c7c87a6facb2f313e73990ee6

drm: rcar-du: kms: Configure the CLU

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

Signed-off-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>

drivers/gpu/drm/rcar-du/rcar_du_crtc.c

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
index d73e88d..001e1f2 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
@@ -484,25 +484,33 @@ 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->clu;
 	struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
 	struct device *dev = rcrtc->dev->dev;
 
-	if (!drm_lut)
+	if (!drm_lut || !drm_clu)
 		return 0;
 
 	/* We only accept fully populated LUT tables. */
-	if (drm_color_lut_size(drm_lut) != CM2_LUT_SIZE) {
+	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 3D-CLU size: %lu bytes\n",
+			drm_lut->length);
+		return -EINVAL;
+	}
+
 	return 0;
 }
 
 static void rcar_du_cmm_setup(struct drm_crtc *crtc)
 {
 	struct drm_property_blob *drm_lut = crtc->state->gamma_lut;
+	struct drm_property_blob *drm_clu = crtc->state->clu;
 	struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
 	struct rcar_cmm_config cmm_config = {};
 
@@ -512,6 +520,9 @@ static void rcar_du_cmm_setup(struct drm_crtc *crtc)
 	if (drm_lut)
 		cmm_config.lut.table = (struct drm_color_lut *)drm_lut->data;
 
+	if (drm_clu)
+		cmm_config.clu.table = (struct drm_color_lut *)drm_clu->data;
+
 	rcar_cmm_setup(rcrtc->cmm, &cmm_config);
 }