On Mon, Sep 30, 2019 at 07:28:00PM -0300, Ezequiel Garcia wrote:

Add an optional CRTC gamma LUT support, and enable it on RK3288. This is currently enabled via a separate address resource, which needs to be specified in the devicetree.

The address resource is required because on some SoCs, such as RK3288, the LUT address is after the MMU address, and the latter is supported by a different driver. This prevents the DRM driver from requesting an entire register space.

The current implementation works for RGB 10-bit tables, as that is what seems to work on RK3288.

Signed-off-by: Ezequiel Garcia ezequiel@collabora.com Reviewed-by: Douglas Anderson dianders@chromium.org Reviewed-by: Jacopo Mondi jacopo+renesas@jmondi.org

---

Changes from v2:

• None.

Changes from v1:

• drop explicit linear LUT after finding a proper way to disable gamma correction.
• avoid setting gamma is the CRTC is not active.
• s/int/unsigned int as suggested by Jacopo.
• only enable color management and set gamma size if gamma LUT is supported, suggested by Doug.
• drop the reg-names usage, and instead just use indexed reg specifiers, suggested by Doug.

Changes from RFC:

• Request (an optional) address resource for the LUT.
• Drop support for RK3399, which doesn't seem to work out of the box and needs more research.
• Support pass-thru setting when GAMMA_LUT is NULL.
• Add a check for the gamma size, as suggested by Ilia.
• Move gamma setting to atomic_commit_tail, as pointed out by Jacopo/Laurent, is the correct way.

---

drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 114 ++++++++++++++++++++ drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 ++ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2 + 4 files changed, 126 insertions(+)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c index dba352ec0ee3..fd1d987698ab 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -17,6 +17,7 @@ #include "rockchip_drm_drv.h" #include "rockchip_drm_fb.h" #include "rockchip_drm_gem.h" +#include "rockchip_drm_vop.h"

static const struct drm_framebuffer_funcs rockchip_drm_fb_funcs = { .destroy = drm_gem_fb_destroy, @@ -112,6 +113,8 @@ rockchip_atomic_helper_commit_tail_rpm(struct drm_atomic_state *old_state)

drm_atomic_helper_commit_modeset_disables(dev, old_state);

• rockchip_drm_vop_gamma_set(old_state);

Instead of duplicating the commit_tail helper, could you just implement .atomic_begin() and call this from there? I think the only hitch is if you need this to be completed before crtc->atomic_enable(), at which point you might need to call it from vop_crtc_atomic_enable() and then detect that in atomic_begin()

That would prevent the revert in patch 1 and keep rockchip on the helper train.

Sean

drm_atomic_helper_commit_modeset_enables(dev, old_state);

drm_atomic_helper_commit_planes(dev, old_state, diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 2f821c58007c..3a49794c6a43 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -141,6 +141,7 @@ struct vop {

uint32_t *regsbak; void __iomem *regs;

• void __iomem *lut_regs;

  /* physical map length of vop register */ uint32_t len;

@@ -1193,6 +1194,102 @@ static void vop_wait_for_irq_handler(struct vop *vop) synchronize_irq(vop->irq); }

+static bool vop_dsp_lut_is_enable(struct vop *vop) +{

• return vop_read_reg(vop, 0, &vop->data->common->dsp_lut_en);

+}

+static void vop_crtc_write_gamma_lut(struct vop *vop, struct drm_crtc *crtc) +{

• struct drm_color_lut *lut = crtc->state->gamma_lut->data;
• unsigned int i;
• for (i = 0; i < crtc->gamma_size; i++) {

• u32 word;
  

• word = (drm_color_lut_extract(lut[i].red, 10) << 20) |
  

•        (drm_color_lut_extract(lut[i].green, 10) << 10) |
  

• 	drm_color_lut_extract(lut[i].blue, 10);
  

• writel(word, vop->lut_regs + i * 4);
  

• }

+}

+static void vop_crtc_gamma_set(struct vop *vop, struct drm_crtc *crtc,

• 	       struct drm_crtc_state *old_state)
  

+{

• unsigned int idle;
• int ret;
• /*

• * In order to write the LUT to the internal RAM memory,
  

• * we need to first make sure the dsp_lut_en bit is cleared.
  

• */
  

• spin_lock(&vop->reg_lock);
• VOP_REG_SET(vop, common, dsp_lut_en, 0);
• vop_cfg_done(vop);
• spin_unlock(&vop->reg_lock);
• /*

• * If the CRTC is not active, dsp_lut_en will not get cleared.
  

• * Apparently we still need to do the above step to for
  

• * gamma correction to be disabled.
  

• */
  

• if (!crtc->state->active)

• return;
  

• ret = readx_poll_timeout(vop_dsp_lut_is_enable, vop,

• 		 idle, !idle, 5, 30 * 1000);
  

• if (ret) {

• DRM_DEV_ERROR(vop->dev, "display LUT RAM enable timeout!\n");
  

• return;
  

• }
• spin_lock(&vop->reg_lock);
• if (crtc->state->gamma_lut &&

•   (!old_state->gamma_lut || (crtc->state->gamma_lut->base.id !=
  

• 		      old_state->gamma_lut->base.id)))
  

• vop_crtc_write_gamma_lut(vop, crtc);
  

• VOP_REG_SET(vop, common, dsp_lut_en, 1);
• vop_cfg_done(vop);
• spin_unlock(&vop->reg_lock);

+}

+static int vop_crtc_atomic_check(struct drm_crtc *crtc,

• 		 struct drm_crtc_state *crtc_state)
  

+{

• struct vop *vop = to_vop(crtc);
• if (vop->lut_regs && crtc_state->color_mgmt_changed &&

•    crtc_state->gamma_lut) {
  

• unsigned int len;
  

• len = drm_color_lut_size(crtc_state->gamma_lut);
  

• if (len != crtc->gamma_size) {
  

• 	DRM_DEBUG_KMS("Invalid LUT size; got %d, expected %d\n",
  

• 		      len, crtc->gamma_size);
  

• 	return -EINVAL;
  

• }
  

• }
• return 0;

+}

+void rockchip_drm_vop_gamma_set(struct drm_atomic_state *state) +{

• struct drm_crtc_state *old_crtc_state;
• struct drm_crtc *crtc;
• unsigned int i;
• for_each_old_crtc_in_state(state, crtc, old_crtc_state, i) {

• struct vop *vop = to_vop(crtc);
  

• if (vop->lut_regs && crtc->state->color_mgmt_changed)
  

• 	vop_crtc_gamma_set(vop, crtc, old_crtc_state);
  

• }

+}

static void vop_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_crtc_state *old_crtc_state) { @@ -1245,6 +1342,7 @@ static void vop_crtc_atomic_flush(struct drm_crtc *crtc,

static const struct drm_crtc_helper_funcs vop_crtc_helper_funcs = { .mode_fixup = vop_crtc_mode_fixup,

• .atomic_check = vop_crtc_atomic_check, .atomic_flush = vop_crtc_atomic_flush, .atomic_enable = vop_crtc_atomic_enable, .atomic_disable = vop_crtc_atomic_disable,

@@ -1363,6 +1461,7 @@ static const struct drm_crtc_funcs vop_crtc_funcs = { .disable_vblank = vop_crtc_disable_vblank, .set_crc_source = vop_crtc_set_crc_source, .verify_crc_source = vop_crtc_verify_crc_source,

• .gamma_set = drm_atomic_helper_legacy_gamma_set,

};

static void vop_fb_unref_worker(struct drm_flip_work *work, void *val) @@ -1520,6 +1619,10 @@ static int vop_create_crtc(struct vop *vop) goto err_cleanup_planes;

drm_crtc_helper_add(crtc, &vop_crtc_helper_funcs);

• if (vop->lut_regs) {

• drm_mode_crtc_set_gamma_size(crtc, vop_data->lut_size);
  

• drm_crtc_enable_color_mgmt(crtc, 0, false, vop_data->lut_size);
  

• }

  /*

  • Create drm_planes for overlay windows with possible_crtcs restricted

@@ -1825,6 +1928,17 @@ static int vop_bind(struct device *dev, struct device *master, void *data) if (IS_ERR(vop->regs)) return PTR_ERR(vop->regs);

• res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
• if (res) {

• if (!vop_data->lut_size) {
  

• 	DRM_DEV_ERROR(dev, "no gamma LUT size defined\n");
  

• 	return -EINVAL;
  

• }
  

• vop->lut_regs = devm_ioremap_resource(dev, res);
  

• if (IS_ERR(vop->lut_regs))
  

• 	return PTR_ERR(vop->lut_regs);
  

• }
• vop->regsbak = devm_kzalloc(dev, vop->len, GFP_KERNEL); if (!vop->regsbak) return -ENOMEM;

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h index 2149a889c29d..bd1bcd5a14e9 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -7,6 +7,8 @@ #ifndef _ROCKCHIP_DRM_VOP_H #define _ROCKCHIP_DRM_VOP_H

+#include <drm/drm_atomic.h>

/*

• major: IP major version, used for IP structure
• minor: big feature change under same structure

@@ -67,6 +69,7 @@ struct vop_common { struct vop_reg dither_down_mode; struct vop_reg dither_down_en; struct vop_reg dither_up;

• struct vop_reg dsp_lut_en; struct vop_reg gate_en; struct vop_reg mmu_en; struct vop_reg out_mode;

@@ -170,6 +173,7 @@ struct vop_data { const struct vop_win_yuv2yuv_data *win_yuv2yuv; const struct vop_win_data *win; unsigned int win_size;

• unsigned int lut_size;

#define VOP_FEATURE_OUTPUT_RGB10 BIT(0) #define VOP_FEATURE_INTERNAL_RGB BIT(1) @@ -373,4 +377,7 @@ static inline int scl_vop_cal_lb_mode(int width, bool is_yuv) }

extern const struct component_ops vop_component_ops;

+void rockchip_drm_vop_gamma_set(struct drm_atomic_state *state);

#endif /* _ROCKCHIP_DRM_VOP_H */ diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c index d1494be14471..42ddcb698c82 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -598,6 +598,7 @@ static const struct vop_common rk3288_common = { .dither_down_en = VOP_REG(RK3288_DSP_CTRL1, 0x1, 2), .pre_dither_down = VOP_REG(RK3288_DSP_CTRL1, 0x1, 1), .dither_up = VOP_REG(RK3288_DSP_CTRL1, 0x1, 6),

• .dsp_lut_en = VOP_REG(RK3288_DSP_CTRL1, 0x1, 0), .data_blank = VOP_REG(RK3288_DSP_CTRL0, 0x1, 19), .dsp_blank = VOP_REG(RK3288_DSP_CTRL0, 0x3, 18), .out_mode = VOP_REG(RK3288_DSP_CTRL0, 0xf, 0),

@@ -646,6 +647,7 @@ static const struct vop_data rk3288_vop = { .output = &rk3288_output, .win = rk3288_vop_win_data, .win_size = ARRAY_SIZE(rk3288_vop_win_data),

• .lut_size = 1024,

};

static const int rk3368_vop_intrs[] = {

2.22.0

On Tue, 2019-10-08 at 16:23 -0300, Ezequiel Garcia wrote:

Hello Sean,

On Mon, 2019-10-07 at 14:54 -0400, Sean Paul wrote:

...

On Mon, Sep 30, 2019 at 07:28:00PM -0300, Ezequiel Garcia wrote:

...

Add an optional CRTC gamma LUT support, and enable it on RK3288. This is currently enabled via a separate address resource, which needs to be specified in the devicetree.

The address resource is required because on some SoCs, such as RK3288, the LUT address is after the MMU address, and the latter is supported by a different driver. This prevents the DRM driver from requesting an entire register space.

The current implementation works for RGB 10-bit tables, as that is what seems to work on RK3288.

Signed-off-by: Ezequiel Garcia ezequiel@collabora.com Reviewed-by: Douglas Anderson dianders@chromium.org Reviewed-by: Jacopo Mondi jacopo+renesas@jmondi.org

---

Changes from v2:

• None.

Changes from v1:

• drop explicit linear LUT after finding a proper way to disable gamma correction.
• avoid setting gamma is the CRTC is not active.
• s/int/unsigned int as suggested by Jacopo.
• only enable color management and set gamma size if gamma LUT is supported, suggested by Doug.
• drop the reg-names usage, and instead just use indexed reg specifiers, suggested by Doug.

Changes from RFC:

• Request (an optional) address resource for the LUT.
• Drop support for RK3399, which doesn't seem to work out of the box and needs more research.
• Support pass-thru setting when GAMMA_LUT is NULL.
• Add a check for the gamma size, as suggested by Ilia.
• Move gamma setting to atomic_commit_tail, as pointed out by Jacopo/Laurent, is the correct way.

---

drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 114 ++++++++++++++++++++ drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 ++ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2 + 4 files changed, 126 insertions(+)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c index dba352ec0ee3..fd1d987698ab 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -17,6 +17,7 @@ #include "rockchip_drm_drv.h" #include "rockchip_drm_fb.h" #include "rockchip_drm_gem.h" +#include "rockchip_drm_vop.h"

static const struct drm_framebuffer_funcs rockchip_drm_fb_funcs = { .destroy = drm_gem_fb_destroy, @@ -112,6 +113,8 @@ rockchip_atomic_helper_commit_tail_rpm(struct drm_atomic_state *old_state)

drm_atomic_helper_commit_modeset_disables(dev, old_state);

• rockchip_drm_vop_gamma_set(old_state);

Instead of duplicating the commit_tail helper, could you just implement .atomic_begin() and call this from there? I think the only hitch is if you need this to be completed before crtc->atomic_enable(), at which point you might need to call it from vop_crtc_atomic_enable() and then detect that in atomic_begin()

I think moving this to .atomic_begin might be enough. Let me send a new series and we can see how that goes.

Oh, before going forward, pleaste note that the first iteration of this patch (as noted in the changelog) was applying the gamma lut on .atomic_flush. However, Laurent and Jacopo pointed out that it might add some tearing to do so, and that's why it was moved to commit_tail.

I have to admit I'm not too sure about the difference between applying this gamma LUT on atomic_begin or atomic_flush, perhaps you can clarify that?

Thanks! Ezequiel

On Tue, 2019-10-08 at 16:03 -0400, Sean Paul wrote:

On Tue, Oct 08, 2019 at 04:33:35PM -0300, Ezequiel Garcia wrote:

...

On Tue, 2019-10-08 at 16:23 -0300, Ezequiel Garcia wrote:

...

Hello Sean,

On Mon, 2019-10-07 at 14:54 -0400, Sean Paul wrote:

...

On Mon, Sep 30, 2019 at 07:28:00PM -0300, Ezequiel Garcia wrote:

...

Add an optional CRTC gamma LUT support, and enable it on RK3288. This is currently enabled via a separate address resource, which needs to be specified in the devicetree.

The address resource is required because on some SoCs, such as RK3288, the LUT address is after the MMU address, and the latter is supported by a different driver. This prevents the DRM driver from requesting an entire register space.

The current implementation works for RGB 10-bit tables, as that is what seems to work on RK3288.

Signed-off-by: Ezequiel Garcia ezequiel@collabora.com Reviewed-by: Douglas Anderson dianders@chromium.org Reviewed-by: Jacopo Mondi jacopo+renesas@jmondi.org

---

Changes from v2:

• None.

Changes from v1:

• drop explicit linear LUT after finding a proper way to disable gamma correction.
• avoid setting gamma is the CRTC is not active.
• s/int/unsigned int as suggested by Jacopo.
• only enable color management and set gamma size if gamma LUT is supported, suggested by Doug.
• drop the reg-names usage, and instead just use indexed reg specifiers, suggested by Doug.

Changes from RFC:

• Request (an optional) address resource for the LUT.
• Drop support for RK3399, which doesn't seem to work out of the box and needs more research.
• Support pass-thru setting when GAMMA_LUT is NULL.
• Add a check for the gamma size, as suggested by Ilia.
• Move gamma setting to atomic_commit_tail, as pointed out by Jacopo/Laurent, is the correct way.

---

drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 114 ++++++++++++++++++++ drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 7 ++ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2 + 4 files changed, 126 insertions(+)

diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c index dba352ec0ee3..fd1d987698ab 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -17,6 +17,7 @@ #include "rockchip_drm_drv.h" #include "rockchip_drm_fb.h" #include "rockchip_drm_gem.h" +#include "rockchip_drm_vop.h"

static const struct drm_framebuffer_funcs rockchip_drm_fb_funcs = { .destroy = drm_gem_fb_destroy, @@ -112,6 +113,8 @@ rockchip_atomic_helper_commit_tail_rpm(struct drm_atomic_state *old_state)

drm_atomic_helper_commit_modeset_disables(dev, old_state);

• rockchip_drm_vop_gamma_set(old_state);

Instead of duplicating the commit_tail helper, could you just implement .atomic_begin() and call this from there? I think the only hitch is if you need this to be completed before crtc->atomic_enable(), at which point you might need to call it from vop_crtc_atomic_enable() and then detect that in atomic_begin()

I think moving this to .atomic_begin might be enough. Let me send a new series and we can see how that goes.

Oh, before going forward, pleaste note that the first iteration of this patch (as noted in the changelog) was applying the gamma lut on .atomic_flush. However, Laurent and Jacopo pointed out that it might add some tearing to do so, and that's why it was moved to commit_tail.

I have to admit I'm not too sure about the difference between applying this gamma LUT on atomic_begin or atomic_flush, perhaps you can clarify that?

The only difference between what you have now and calling it in atomic_begin is that as you have it now, it's set before crtc->atomic_enable() is called. I think in order to address Ville's concerns on the other patch, you'll need to set it the lut in .atomic_enable() anyways, so here's what I would suggest:

• Set the LUT in .atomic_enable() wherever it makes sense (you have it at the start now)
• Add an .atomic_begin() implementation and check state->color_mgmt_changed and state->active_changed. color_mgmt_changed && !active_changed, set the lut
• Remove patches 1 & 5

...I think :-)

OK, that helped! Patches in 3...2...

Regards, Ezequiel

On Mon, Sep 30, 2019 at 07:28:02PM -0300, Ezequiel Garcia wrote:

Some platforms are not able to maintain the color transformation state after a system suspend/resume cycle.

Set the colog_mgmt_changed flag so that CMM on the CRTCs in the suspend state are reapplied after system resume.

Signed-off-by: Ezequiel Garcia ezequiel@collabora.com

This is an RFC, and it's mostly based on Jacopo Mondi's work https://lkml.org/lkml/2019/9/6/498.

Changes from v2:

• New patch.

---

drivers/gpu/drm/drm_atomic_helper.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index e41db0f202ca..518488125575 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -3234,8 +3234,20 @@ int drm_atomic_helper_resume(struct drm_device *dev, struct drm_atomic_state *state) { struct drm_modeset_acquire_ctx ctx;

• struct drm_crtc_state *crtc_state;

• struct drm_crtc *crtc;

• unsigned int i; int err;

• for_each_new_crtc_in_state(state, crtc, crtc_state, i) {

• /*
  

•  * Force re-enablement of CMM after system resume if any
  

•  * of the DRM color transformation properties was set in
  

•  * the state saved at system suspend time.
  

•  */
  

• if (crtc_state->gamma_lut)
  

You say "any" but you check the one?

• 	crtc_state->color_mgmt_changed = true;
  

But I'm not convinced this is the best way to go about it. I would generally expect that you repgrogram everything when doing a full modeset since the state was possibly lost while the crtc was disabled.

• } drm_mode_config_reset(dev);

  DRM_MODESET_LOCK_ALL_BEGIN(dev, ctx, 0, err);

-- 2.22.0

---

dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel