| Message ID | 20240815124306.189282-2-pZ010001011111@proton.me (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v4] rockchip/drm: vop2: add support for gamma LUT | expand |
Hi Piotr， At 2024-08-16 15:39:35, "Piotr Zalewski" <pZ010001011111@proton.me> wrote: >Add support for gamma LUT in VOP2 driver. The implementation was inspired >by one found in VOP1 driver. Blue and red channels in gamma LUT register >write were swapped with respect to how gamma LUT values are written in >VOP1. If the current SoC is RK3566 or RK3568 and gamma LUT is to be >written, full modeset is triggered to synchronize disable, write, enable >process and hint userspace that it is not seamless transition[1]. If the >current SoC is RK3588 full modeset isn't triggered because gamma LUT need >not to be disabled before the LUT write[1]. In case of RK356x as well as >RK3588 respective LUT port sel register write was added before the LUT >write[2]. In case of RK3588, gamma update enable bit is set after setting >gamma LUT enable bit[2]. Gamma size is set and drm color management is >enabled for each video port's CRTC except ones which have no associated >device. Tested on RK3566 (Pinetab2). > >[1] https://lore.kernel.org/linux-rockchip/CAPj87rOM=j0zmuWL9frGKV1xzPbJrk=Q9ip7F_HAPYnbCqPouw@mail.gmail.com/ >[2] https://lore.kernel.org/linux-rockchip/7d998e4c-e1d3-4e8b-af76-c5bc83b43647@rock-chips.com/ > >Helped-by: Daniel Stone <daniel@fooishbar.org> >Helped-by: Dragan Simic <dsimic@manjaro.org> >Helped-by: Diederik de Haas <didi.debian@cknow.org> >Helped-by: Andy Yan <andy.yan@rock-chips.com> >Signed-off-by: Piotr Zalewski <pZ010001011111@proton.me> >--- > >Notes: > WASN'T tested on RK3588. > > Changes in v4: > - rework the implementation to better utilize DRM atomic updates[2] > - handle the RK3588 case[2][3] > > Changes in v3: > - v3 is patch v2 "resend", by mistake the incremental patch was > sent in v2 > > Changes in v2: > - Apply code styling corrections[1] > - Move gamma LUT write inside the vop2 lock > > Link to v3: https://lore.kernel.org/linux-rockchip/TkgKVivuaLFLILPY-n3iZo_8KF-daKdqdu-0_e0HP-5Ar_8DALDeNWog2suwWKjX7eomcbGET0KZe7DlzdhK2YM6CbLbeKeFZr-MJzJMtw0=@proton.me/ > Link to v2: https://lore.kernel.org/linux-rockchip/Hk03HDb6wSSHWtEFZHUye06HR0-9YzP5nCHx9A8_kHzWSZawDrU1o1pjEGkCOJFoRg0nTB4BWEv6V0XBOjF4-0Mj44lp2TrjaQfnytzp-Pk=@proton.me/T/#u > Link to v1: https://lore.kernel.org/linux-rockchip/9736eadf6a9d8e97eef919c6b3d88828@manjaro.org/T/#t > > [1] https://lore.kernel.org/linux-rockchip/d019761504b540600d9fc7a585d6f95f@manjaro.org > [2] https://lore.kernel.org/linux-rockchip/CAPj87rOM=j0zmuWL9frGKV1xzPbJrk=Q9ip7F_HAPYnbCqPouw@mail.gmail.com > [3] https://lore.kernel.org/linux-rockchip/7d998e4c-e1d3-4e8b-af76-c5bc83b43647@rock-chips.com > > drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 148 +++++++++++++++++++ > drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 5 + > 2 files changed, 153 insertions(+) > >diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c >index 9873172e3fd3..fe7657984909 100644 >--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c >+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c >@@ -278,6 +278,15 @@ static u32 vop2_readl(struct vop2 *vop2, u32 offset) > return val; > } > >+static u32 vop2_vp_read(struct vop2_video_port *vp, u32 offset) >+{ >+ u32 val; >+ >+ regmap_read(vp->vop2->map, vp->data->offset + offset, &val); >+ >+ return val; >+} >+ > static void vop2_win_write(const struct vop2_win *win, unsigned int reg, u32 v) > { > regmap_field_write(win->reg[reg], v); >@@ -998,6 +1007,30 @@ static void vop2_disable(struct vop2 *vop2) > clk_disable_unprepare(vop2->hclk); > } > >+static void vop2_vp_dsp_lut_disable(struct vop2_video_port *vp) >+{ >+ u32 dsp_ctrl = vop2_vp_read(vp, RK3568_VP_DSP_CTRL); >+ >+ dsp_ctrl &= ~RK3568_VP_DSP_CTRL__DSP_LUT_EN; >+ vop2_vp_write(vp, RK3568_VP_DSP_CTRL, dsp_ctrl); >+} >+ >+static void vop2_vp_dsp_lut_enable(struct vop2_video_port *vp) >+{ >+ u32 dsp_ctrl = vop2_vp_read(vp, RK3568_VP_DSP_CTRL); >+ >+ dsp_ctrl |= RK3568_VP_DSP_CTRL__DSP_LUT_EN; >+ vop2_vp_write(vp, RK3568_VP_DSP_CTRL, dsp_ctrl); >+} >+ >+static void vop2_vp_dsp_lut_update_enable(struct vop2_video_port *vp) >+{ >+ u32 dsp_ctrl = vop2_vp_read(vp, RK3568_VP_DSP_CTRL); >+ >+ dsp_ctrl |= RK3588_VP_DSP_CTRL__GAMMA_UPDATE_EN; >+ vop2_vp_write(vp, RK3568_VP_DSP_CTRL, dsp_ctrl); >+} >+ > static void vop2_crtc_atomic_disable(struct drm_crtc *crtc, > struct drm_atomic_state *state) > { >@@ -1482,6 +1515,24 @@ static bool vop2_crtc_mode_fixup(struct drm_crtc *crtc, > return true; > } > >+static void vop2_crtc_write_gamma_lut(struct vop2 *vop2, struct drm_crtc *crtc) >+{ >+ const struct vop2_video_port *vp = to_vop2_video_port(crtc); >+ const struct vop2_video_port_data *vp_data = &vop2->data->vp[vp->id]; >+ >+ struct drm_color_lut *lut = crtc->state->gamma_lut->data; >+ unsigned int i, bpc = ilog2(vp_data->gamma_lut_len); >+ u32 word; >+ >+ for (i = 0; i < crtc->gamma_size; i++) { >+ word = (drm_color_lut_extract(lut[i].blue, bpc) << (2 * bpc)) | >+ (drm_color_lut_extract(lut[i].green, bpc) << bpc) | >+ drm_color_lut_extract(lut[i].red, bpc); >+ >+ writel(word, vop2->lut_regs + i * 4); >+ } >+} >+ > static void vop2_dither_setup(struct drm_crtc *crtc, u32 *dsp_ctrl) > { > struct rockchip_crtc_state *vcstate = to_rockchip_crtc_state(crtc->state); >@@ -2062,6 +2113,42 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, > vop2_unlock(vop2); > } > >+static int vop2_crtc_atomic_check_gamma(struct vop2_video_port *vp, >+ struct drm_crtc *crtc, >+ struct drm_atomic_state *state, >+ struct drm_crtc_state *crtc_state) >+{ >+ struct vop2 *vop2 = vp->vop2; >+ unsigned int len; >+ >+ if (!vp->vop2->lut_regs || !crtc_state->color_mgmt_changed || >+ !crtc_state->gamma_lut) >+ return 0; >+ >+ 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; >+ } >+ >+ // trigger full modeset only when SoC is 356x >+ if (!crtc_state->mode_changed && (vop2->data->soc_id == 3566 || >+ vop2->data->soc_id == 3568)) { >+ int ret; >+ >+ crtc_state->mode_changed = true; >+ state->allow_modeset = true; We don't need to trigger a modeset here. We just need to disable dsp_lut befor we write gamma lut data for rk3566/8. >+ >+ ret = drm_atomic_helper_check_modeset(crtc->dev, >+ crtc_state->state); >+ if (ret) >+ return ret; >+ } >+ >+ return 0; >+} >+ > static int vop2_crtc_atomic_check(struct drm_crtc *crtc, > struct drm_atomic_state *state) > { >@@ -2069,6 +2156,11 @@ static int vop2_crtc_atomic_check(struct drm_crtc *crtc, > struct drm_plane *plane; > int nplanes = 0; > struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc); >+ int ret; >+ >+ ret = vop2_crtc_atomic_check_gamma(vp, crtc, state, crtc_state); >+ if (ret) >+ return ret; > > drm_atomic_crtc_state_for_each_plane(plane, crtc_state) > nplanes++; >@@ -2456,9 +2548,32 @@ static void vop2_setup_dly_for_windows(struct vop2 *vop2) > vop2_writel(vop2, RK3568_SMART_DLY_NUM, sdly); > } > >+static void vop2_crtc_atomic_begin_gamma(struct vop2 *vop2, >+ struct vop2_video_port *vp, >+ struct drm_crtc *crtc, >+ struct drm_crtc_state *crtc_state) >+{ >+ if (vop2->lut_regs && crtc_state->color_mgmt_changed && >+ crtc_state->gamma_lut) { >+ vop2_lock(vop2); >+ if (vop2->data->soc_id == 3566 || vop2->data->soc_id == 3568) { >+ vop2_writel(vop2, RK3568_LUT_PORT_SEL, vp->id); >+ } else { >+ vop2_writel(vop2, RK3568_LUT_PORT_SEL, FIELD_PREP( >+ RK3588_LUT_PORT_SEL__GAMMA_AHB_WRITE_SEL, >+ vp->id)); >+ } >+ vop2_crtc_write_gamma_lut(vop2, crtc); >+ >+ vop2_unlock(vop2); >+ } >+} >+ > static void vop2_crtc_atomic_begin(struct drm_crtc *crtc, > struct drm_atomic_state *state) > { >+ struct drm_crtc_state *crtc_state = >+ drm_atomic_get_new_crtc_state(state, crtc); > struct vop2_video_port *vp = to_vop2_video_port(crtc); > struct vop2 *vop2 = vp->vop2; > struct drm_plane *plane; >@@ -2482,13 +2597,39 @@ static void vop2_crtc_atomic_begin(struct drm_crtc *crtc, > vop2_setup_layer_mixer(vp); > vop2_setup_alpha(vp); > vop2_setup_dly_for_windows(vop2); >+ >+ vop2_crtc_atomic_begin_gamma(vop2, vp, crtc, crtc_state); >+} >+ >+static void vop2_crtc_atomic_flush_gamma(struct vop2 *vop2, >+ struct vop2_video_port *vp, >+ struct drm_crtc_state *crtc_state) >+{ >+ if (vop2->lut_regs && crtc_state->color_mgmt_changed) { >+ vop2_lock(vop2); >+ >+ if (crtc_state->gamma_lut) { >+ vop2_vp_dsp_lut_enable(vp); >+ if (vop2->data->soc_id != 3566 && >+ vop2->data->soc_id != 3568) >+ vop2_vp_dsp_lut_update_enable(vp); >+ >+ } else >+ vop2_vp_dsp_lut_disable(vp); >+ >+ vop2_unlock(vop2); >+ } > } > > static void vop2_crtc_atomic_flush(struct drm_crtc *crtc, > struct drm_atomic_state *state) > { >+ struct drm_crtc_state *crtc_state = >+ drm_atomic_get_new_crtc_state(state, crtc); > struct vop2_video_port *vp = to_vop2_video_port(crtc); > >+ vop2_crtc_atomic_flush_gamma(vp->vop2, vp, crtc_state); >+ > vop2_post_config(crtc); > > vop2_cfg_done(vp); >@@ -2791,6 +2932,13 @@ static int vop2_create_crtcs(struct vop2 *vop2) > > drm_crtc_helper_add(&vp->crtc, &vop2_crtc_helper_funcs); > >+ if (vop2->lut_regs && vp->crtc.dev != NULL) { >+ const struct vop2_video_port_data *vp_data = &vop2_data->vp[vp->id]; >+ >+ drm_mode_crtc_set_gamma_size(&vp->crtc, vp_data->gamma_lut_len); >+ drm_crtc_enable_color_mgmt(&vp->crtc, 0, false, >+ vp_data->gamma_lut_len); >+ } > init_completion(&vp->dsp_hold_completion); > } > >diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h >index 615a16196aff..510dda6f9092 100644 >--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h >+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h >@@ -394,6 +394,7 @@ enum dst_factor_mode { > #define RK3568_REG_CFG_DONE__GLB_CFG_DONE_EN BIT(15) > > #define RK3568_VP_DSP_CTRL__STANDBY BIT(31) >+#define RK3568_VP_DSP_CTRL__DSP_LUT_EN BIT(28) > #define RK3568_VP_DSP_CTRL__DITHER_DOWN_MODE BIT(20) > #define RK3568_VP_DSP_CTRL__DITHER_DOWN_SEL GENMASK(19, 18) > #define RK3568_VP_DSP_CTRL__DITHER_DOWN_EN BIT(17) >@@ -408,6 +409,8 @@ enum dst_factor_mode { > #define RK3568_VP_DSP_CTRL__CORE_DCLK_DIV BIT(4) > #define RK3568_VP_DSP_CTRL__OUT_MODE GENMASK(3, 0) > >+#define RK3588_VP_DSP_CTRL__GAMMA_UPDATE_EN BIT(22) >+ > #define RK3588_VP_CLK_CTRL__DCLK_OUT_DIV GENMASK(3, 2) > #define RK3588_VP_CLK_CTRL__DCLK_CORE_DIV GENMASK(1, 0) > >@@ -460,6 +463,8 @@ enum dst_factor_mode { > #define RK3588_DSP_IF_POL__DP1_PIN_POL GENMASK(14, 12) > #define RK3588_DSP_IF_POL__DP0_PIN_POL GENMASK(10, 8) > >+#define RK3588_LUT_PORT_SEL__GAMMA_AHB_WRITE_SEL GENMASK(13, 12) >+ > #define RK3568_VP0_MIPI_CTRL__DCLK_DIV2_PHASE_LOCK BIT(5) > #define RK3568_VP0_MIPI_CTRL__DCLK_DIV2 BIT(4) > >-- >2.46.0 >
On Tuesday, August 20th, 2024 at 3:12 AM, Andy Yan <andyshrk@163.com> wrote: > > Hi Piotr， Hi Andy! > > +static int vop2_crtc_atomic_check_gamma(struct vop2_video_port *vp, > > + struct drm_crtc *crtc, > > + struct drm_atomic_state *state, > > + struct drm_crtc_state *crtc_state) > > +{ > > + struct vop2 *vop2 = vp->vop2; > > + unsigned int len; > > + > > + if (!vp->vop2->lut_regs || !crtc_state->color_mgmt_changed || > > + !crtc_state->gamma_lut) > > + return 0; > > + > > + 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; > > + } > > + > > + // trigger full modeset only when SoC is 356x > > + if (!crtc_state->mode_changed && (vop2->data->soc_id == 3566 || > > + vop2->data->soc_id == 3568)) { > > + int ret; > > + > > + crtc_state->mode_changed = true; > > + state->allow_modeset = true; > > > > > We don't need to trigger a modeset here. We just need to disable dsp_lut befor we write gamma lut data for rk3566/8. Formerly my patch didn't trigger a modeset. Though Daniel Stone in his reply to v3[1] suggested it as the clean way to handle RK356x case[2], quote, "it would probably be better to set mode_changed when the colour management configuration changes". Let's wait for his reply to this version of the patch, perhaps he meant something different or not exactly what I did. [1] https://lore.kernel.org/linux-rockchip/CAPj87rOM=j0zmuWL9frGKV1xzPbJrk=Q9ip7F_HAPYnbCqPouw@mail.gmail.com/ [2] https://lore.kernel.org/linux-rockchip/TkgKVivuaLFLILPY-n3iZo_8KF-daKdqdu-0_e0HP-5Ar_8DALDeNWog2suwWKjX7eomcbGET0KZe7DlzdhK2YM6CbLbeKeFZr-MJzJMtw0=@proton.me/ Best Regards, Piotr Zalewski
Hi Daniel, Can you comment on or review this? This version of the patch was based on your suggestions and it has been stuck for some time now. I appreciate your time and help :) Best Regards, Piotr Zalewski On Thursday, August 15th, 2024 at 2:46 PM, Piotr Zalewski <pZ010001011111@proton.me> wrote: > Add support for gamma LUT in VOP2 driver. The implementation was inspired > by one found in VOP1 driver. Blue and red channels in gamma LUT register > write were swapped with respect to how gamma LUT values are written in > VOP1. If the current SoC is RK3566 or RK3568 and gamma LUT is to be > written, full modeset is triggered to synchronize disable, write, enable > process and hint userspace that it is not seamless transition[1]. If the > current SoC is RK3588 full modeset isn't triggered because gamma LUT need > not to be disabled before the LUT write[1]. In case of RK356x as well as > RK3588 respective LUT port sel register write was added before the LUT > write[2]. In case of RK3588, gamma update enable bit is set after setting > gamma LUT enable bit[2]. Gamma size is set and drm color management is > enabled for each video port's CRTC except ones which have no associated > device. Tested on RK3566 (Pinetab2). > > [1] https://lore.kernel.org/linux-rockchip/CAPj87rOM=j0zmuWL9frGKV1xzPbJrk=Q9ip7F_HAPYnbCqPouw@mail.gmail.com/ > [2] https://lore.kernel.org/linux-rockchip/7d998e4c-e1d3-4e8b-af76-c5bc83b43647@rock-chips.com/ > > Helped-by: Daniel Stone daniel@fooishbar.org > > Helped-by: Dragan Simic dsimic@manjaro.org > > Helped-by: Diederik de Haas didi.debian@cknow.org > > Helped-by: Andy Yan andy.yan@rock-chips.com > > Signed-off-by: Piotr Zalewski pZ010001011111@proton.me > > --- > > Notes: > WASN'T tested on RK3588. > > Changes in v4: > - rework the implementation to better utilize DRM atomic updates[2] > - handle the RK3588 case[2][3] > > Changes in v3: > - v3 is patch v2 "resend", by mistake the incremental patch was > sent in v2 > > Changes in v2: > - Apply code styling corrections[1] > - Move gamma LUT write inside the vop2 lock > > Link to v3: https://lore.kernel.org/linux-rockchip/TkgKVivuaLFLILPY-n3iZo_8KF-daKdqdu-0_e0HP-5Ar_8DALDeNWog2suwWKjX7eomcbGET0KZe7DlzdhK2YM6CbLbeKeFZr-MJzJMtw0=@proton.me/ > Link to v2: https://lore.kernel.org/linux-rockchip/Hk03HDb6wSSHWtEFZHUye06HR0-9YzP5nCHx9A8_kHzWSZawDrU1o1pjEGkCOJFoRg0nTB4BWEv6V0XBOjF4-0Mj44lp2TrjaQfnytzp-Pk=@proton.me/T/#u > Link to v1: https://lore.kernel.org/linux-rockchip/9736eadf6a9d8e97eef919c6b3d88828@manjaro.org/T/#t > > [1] https://lore.kernel.org/linux-rockchip/d019761504b540600d9fc7a585d6f95f@manjaro.org > [2] https://lore.kernel.org/linux-rockchip/CAPj87rOM=j0zmuWL9frGKV1xzPbJrk=Q9ip7F_HAPYnbCqPouw@mail.gmail.com > [3] https://lore.kernel.org/linux-rockchip/7d998e4c-e1d3-4e8b-af76-c5bc83b43647@rock-chips.com > > drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 148 +++++++++++++++++++ > drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 5 + > 2 files changed, 153 insertions(+) > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c > index 9873172e3fd3..fe7657984909 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c > @@ -278,6 +278,15 @@ static u32 vop2_readl(struct vop2 *vop2, u32 offset) > return val; > } > > +static u32 vop2_vp_read(struct vop2_video_port *vp, u32 offset) > +{ > + u32 val; > + > + regmap_read(vp->vop2->map, vp->data->offset + offset, &val); > > + > + return val; > +} > + > static void vop2_win_write(const struct vop2_win *win, unsigned int reg, u32 v) > { > regmap_field_write(win->reg[reg], v); > > @@ -998,6 +1007,30 @@ static void vop2_disable(struct vop2 *vop2) > clk_disable_unprepare(vop2->hclk); > > } > > +static void vop2_vp_dsp_lut_disable(struct vop2_video_port *vp) > +{ > + u32 dsp_ctrl = vop2_vp_read(vp, RK3568_VP_DSP_CTRL); > + > + dsp_ctrl &= ~RK3568_VP_DSP_CTRL__DSP_LUT_EN; > + vop2_vp_write(vp, RK3568_VP_DSP_CTRL, dsp_ctrl); > +} > + > +static void vop2_vp_dsp_lut_enable(struct vop2_video_port *vp) > +{ > + u32 dsp_ctrl = vop2_vp_read(vp, RK3568_VP_DSP_CTRL); > + > + dsp_ctrl |= RK3568_VP_DSP_CTRL__DSP_LUT_EN; > + vop2_vp_write(vp, RK3568_VP_DSP_CTRL, dsp_ctrl); > +} > + > +static void vop2_vp_dsp_lut_update_enable(struct vop2_video_port *vp) > +{ > + u32 dsp_ctrl = vop2_vp_read(vp, RK3568_VP_DSP_CTRL); > + > + dsp_ctrl |= RK3588_VP_DSP_CTRL__GAMMA_UPDATE_EN; > + vop2_vp_write(vp, RK3568_VP_DSP_CTRL, dsp_ctrl); > +} > + > static void vop2_crtc_atomic_disable(struct drm_crtc *crtc, > struct drm_atomic_state *state) > { > @@ -1482,6 +1515,24 @@ static bool vop2_crtc_mode_fixup(struct drm_crtc *crtc, > return true; > } > > +static void vop2_crtc_write_gamma_lut(struct vop2 *vop2, struct drm_crtc *crtc) > +{ > + const struct vop2_video_port *vp = to_vop2_video_port(crtc); > + const struct vop2_video_port_data *vp_data = &vop2->data->vp[vp->id]; > > + > + struct drm_color_lut *lut = crtc->state->gamma_lut->data; > > + unsigned int i, bpc = ilog2(vp_data->gamma_lut_len); > > + u32 word; > + > + for (i = 0; i < crtc->gamma_size; i++) { > > + word = (drm_color_lut_extract(lut[i].blue, bpc) << (2 * bpc)) | > + (drm_color_lut_extract(lut[i].green, bpc) << bpc) | > + drm_color_lut_extract(lut[i].red, bpc); > + > + writel(word, vop2->lut_regs + i * 4); > > + } > +} > + > static void vop2_dither_setup(struct drm_crtc *crtc, u32 *dsp_ctrl) > { > struct rockchip_crtc_state *vcstate = to_rockchip_crtc_state(crtc->state); > > @@ -2062,6 +2113,42 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, > vop2_unlock(vop2); > } > > +static int vop2_crtc_atomic_check_gamma(struct vop2_video_port *vp, > + struct drm_crtc *crtc, > + struct drm_atomic_state *state, > + struct drm_crtc_state *crtc_state) > +{ > + struct vop2 *vop2 = vp->vop2; > > + unsigned int len; > + > + if (!vp->vop2->lut_regs || !crtc_state->color_mgmt_changed || > > + !crtc_state->gamma_lut) > > + return 0; > + > + 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; > + } > + > + // trigger full modeset only when SoC is 356x > + if (!crtc_state->mode_changed && (vop2->data->soc_id == 3566 || > > + vop2->data->soc_id == 3568)) { > > + int ret; > + > + crtc_state->mode_changed = true; > > + state->allow_modeset = true; > > + > + ret = drm_atomic_helper_check_modeset(crtc->dev, > > + crtc_state->state); > > + if (ret) > + return ret; > + } > + > + return 0; > +} > + > static int vop2_crtc_atomic_check(struct drm_crtc *crtc, > struct drm_atomic_state *state) > { > @@ -2069,6 +2156,11 @@ static int vop2_crtc_atomic_check(struct drm_crtc *crtc, > struct drm_plane *plane; > int nplanes = 0; > struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc); > + int ret; > + > + ret = vop2_crtc_atomic_check_gamma(vp, crtc, state, crtc_state); > + if (ret) > + return ret; > > drm_atomic_crtc_state_for_each_plane(plane, crtc_state) > nplanes++; > @@ -2456,9 +2548,32 @@ static void vop2_setup_dly_for_windows(struct vop2 *vop2) > vop2_writel(vop2, RK3568_SMART_DLY_NUM, sdly); > } > > +static void vop2_crtc_atomic_begin_gamma(struct vop2 *vop2, > + struct vop2_video_port *vp, > + struct drm_crtc *crtc, > + struct drm_crtc_state *crtc_state) > +{ > + if (vop2->lut_regs && crtc_state->color_mgmt_changed && > > + crtc_state->gamma_lut) { > > + vop2_lock(vop2); > + if (vop2->data->soc_id == 3566 || vop2->data->soc_id == 3568) { > > + vop2_writel(vop2, RK3568_LUT_PORT_SEL, vp->id); > > + } else { > + vop2_writel(vop2, RK3568_LUT_PORT_SEL, FIELD_PREP( > + RK3588_LUT_PORT_SEL__GAMMA_AHB_WRITE_SEL, > + vp->id)); > > + } > + vop2_crtc_write_gamma_lut(vop2, crtc); > + > + vop2_unlock(vop2); > + } > +} > + > static void vop2_crtc_atomic_begin(struct drm_crtc *crtc, > struct drm_atomic_state *state) > { > + struct drm_crtc_state *crtc_state = > + drm_atomic_get_new_crtc_state(state, crtc); > struct vop2_video_port *vp = to_vop2_video_port(crtc); > struct vop2 *vop2 = vp->vop2; > > struct drm_plane *plane; > @@ -2482,13 +2597,39 @@ static void vop2_crtc_atomic_begin(struct drm_crtc *crtc, > vop2_setup_layer_mixer(vp); > vop2_setup_alpha(vp); > vop2_setup_dly_for_windows(vop2); > + > + vop2_crtc_atomic_begin_gamma(vop2, vp, crtc, crtc_state); > +} > + > +static void vop2_crtc_atomic_flush_gamma(struct vop2 *vop2, > + struct vop2_video_port *vp, > + struct drm_crtc_state *crtc_state) > +{ > + if (vop2->lut_regs && crtc_state->color_mgmt_changed) { > > + vop2_lock(vop2); > + > + if (crtc_state->gamma_lut) { > > + vop2_vp_dsp_lut_enable(vp); > + if (vop2->data->soc_id != 3566 && > > + vop2->data->soc_id != 3568) > > + vop2_vp_dsp_lut_update_enable(vp); > + > + } else > + vop2_vp_dsp_lut_disable(vp); > + > + vop2_unlock(vop2); > + } > } > > static void vop2_crtc_atomic_flush(struct drm_crtc *crtc, > struct drm_atomic_state *state) > { > + struct drm_crtc_state *crtc_state = > + drm_atomic_get_new_crtc_state(state, crtc); > struct vop2_video_port *vp = to_vop2_video_port(crtc); > > + vop2_crtc_atomic_flush_gamma(vp->vop2, vp, crtc_state); > > + > vop2_post_config(crtc); > > vop2_cfg_done(vp); > @@ -2791,6 +2932,13 @@ static int vop2_create_crtcs(struct vop2 *vop2) > > drm_crtc_helper_add(&vp->crtc, &vop2_crtc_helper_funcs); > > > + if (vop2->lut_regs && vp->crtc.dev != NULL) { > > + const struct vop2_video_port_data *vp_data = &vop2_data->vp[vp->id]; > > + > + drm_mode_crtc_set_gamma_size(&vp->crtc, vp_data->gamma_lut_len); > > + drm_crtc_enable_color_mgmt(&vp->crtc, 0, false, > > + vp_data->gamma_lut_len); > > + } > init_completion(&vp->dsp_hold_completion); > > } > > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h > index 615a16196aff..510dda6f9092 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h > @@ -394,6 +394,7 @@ enum dst_factor_mode { > #define RK3568_REG_CFG_DONE__GLB_CFG_DONE_EN BIT(15) > > #define RK3568_VP_DSP_CTRL__STANDBY BIT(31) > +#define RK3568_VP_DSP_CTRL__DSP_LUT_EN BIT(28) > #define RK3568_VP_DSP_CTRL__DITHER_DOWN_MODE BIT(20) > #define RK3568_VP_DSP_CTRL__DITHER_DOWN_SEL GENMASK(19, 18) > #define RK3568_VP_DSP_CTRL__DITHER_DOWN_EN BIT(17) > @@ -408,6 +409,8 @@ enum dst_factor_mode { > #define RK3568_VP_DSP_CTRL__CORE_DCLK_DIV BIT(4) > #define RK3568_VP_DSP_CTRL__OUT_MODE GENMASK(3, 0) > > +#define RK3588_VP_DSP_CTRL__GAMMA_UPDATE_EN BIT(22) > + > #define RK3588_VP_CLK_CTRL__DCLK_OUT_DIV GENMASK(3, 2) > #define RK3588_VP_CLK_CTRL__DCLK_CORE_DIV GENMASK(1, 0) > > @@ -460,6 +463,8 @@ enum dst_factor_mode { > #define RK3588_DSP_IF_POL__DP1_PIN_POL GENMASK(14, 12) > #define RK3588_DSP_IF_POL__DP0_PIN_POL GENMASK(10, 8) > > +#define RK3588_LUT_PORT_SEL__GAMMA_AHB_WRITE_SEL GENMASK(13, 12) > + > #define RK3568_VP0_MIPI_CTRL__DCLK_DIV2_PHASE_LOCK BIT(5) > #define RK3568_VP0_MIPI_CTRL__DCLK_DIV2 BIT(4) > > -- > 2.46.0
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c index 9873172e3fd3..fe7657984909 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.c @@ -278,6 +278,15 @@ static u32 vop2_readl(struct vop2 *vop2, u32 offset) return val; } +static u32 vop2_vp_read(struct vop2_video_port *vp, u32 offset) +{ + u32 val; + + regmap_read(vp->vop2->map, vp->data->offset + offset, &val); + + return val; +} + static void vop2_win_write(const struct vop2_win *win, unsigned int reg, u32 v) { regmap_field_write(win->reg[reg], v); @@ -998,6 +1007,30 @@ static void vop2_disable(struct vop2 *vop2) clk_disable_unprepare(vop2->hclk); } +static void vop2_vp_dsp_lut_disable(struct vop2_video_port *vp) +{ + u32 dsp_ctrl = vop2_vp_read(vp, RK3568_VP_DSP_CTRL); + + dsp_ctrl &= ~RK3568_VP_DSP_CTRL__DSP_LUT_EN; + vop2_vp_write(vp, RK3568_VP_DSP_CTRL, dsp_ctrl); +} + +static void vop2_vp_dsp_lut_enable(struct vop2_video_port *vp) +{ + u32 dsp_ctrl = vop2_vp_read(vp, RK3568_VP_DSP_CTRL); + + dsp_ctrl |= RK3568_VP_DSP_CTRL__DSP_LUT_EN; + vop2_vp_write(vp, RK3568_VP_DSP_CTRL, dsp_ctrl); +} + +static void vop2_vp_dsp_lut_update_enable(struct vop2_video_port *vp) +{ + u32 dsp_ctrl = vop2_vp_read(vp, RK3568_VP_DSP_CTRL); + + dsp_ctrl |= RK3588_VP_DSP_CTRL__GAMMA_UPDATE_EN; + vop2_vp_write(vp, RK3568_VP_DSP_CTRL, dsp_ctrl); +} + static void vop2_crtc_atomic_disable(struct drm_crtc *crtc, struct drm_atomic_state *state) { @@ -1482,6 +1515,24 @@ static bool vop2_crtc_mode_fixup(struct drm_crtc *crtc, return true; } +static void vop2_crtc_write_gamma_lut(struct vop2 *vop2, struct drm_crtc *crtc) +{ + const struct vop2_video_port *vp = to_vop2_video_port(crtc); + const struct vop2_video_port_data *vp_data = &vop2->data->vp[vp->id]; + + struct drm_color_lut *lut = crtc->state->gamma_lut->data; + unsigned int i, bpc = ilog2(vp_data->gamma_lut_len); + u32 word; + + for (i = 0; i < crtc->gamma_size; i++) { + word = (drm_color_lut_extract(lut[i].blue, bpc) << (2 * bpc)) | + (drm_color_lut_extract(lut[i].green, bpc) << bpc) | + drm_color_lut_extract(lut[i].red, bpc); + + writel(word, vop2->lut_regs + i * 4); + } +} + static void vop2_dither_setup(struct drm_crtc *crtc, u32 *dsp_ctrl) { struct rockchip_crtc_state *vcstate = to_rockchip_crtc_state(crtc->state); @@ -2062,6 +2113,42 @@ static void vop2_crtc_atomic_enable(struct drm_crtc *crtc, vop2_unlock(vop2); } +static int vop2_crtc_atomic_check_gamma(struct vop2_video_port *vp, + struct drm_crtc *crtc, + struct drm_atomic_state *state, + struct drm_crtc_state *crtc_state) +{ + struct vop2 *vop2 = vp->vop2; + unsigned int len; + + if (!vp->vop2->lut_regs || !crtc_state->color_mgmt_changed || + !crtc_state->gamma_lut) + return 0; + + 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; + } + + // trigger full modeset only when SoC is 356x + if (!crtc_state->mode_changed && (vop2->data->soc_id == 3566 || + vop2->data->soc_id == 3568)) { + int ret; + + crtc_state->mode_changed = true; + state->allow_modeset = true; + + ret = drm_atomic_helper_check_modeset(crtc->dev, + crtc_state->state); + if (ret) + return ret; + } + + return 0; +} + static int vop2_crtc_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state) { @@ -2069,6 +2156,11 @@ static int vop2_crtc_atomic_check(struct drm_crtc *crtc, struct drm_plane *plane; int nplanes = 0; struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc); + int ret; + + ret = vop2_crtc_atomic_check_gamma(vp, crtc, state, crtc_state); + if (ret) + return ret; drm_atomic_crtc_state_for_each_plane(plane, crtc_state) nplanes++; @@ -2456,9 +2548,32 @@ static void vop2_setup_dly_for_windows(struct vop2 *vop2) vop2_writel(vop2, RK3568_SMART_DLY_NUM, sdly); } +static void vop2_crtc_atomic_begin_gamma(struct vop2 *vop2, + struct vop2_video_port *vp, + struct drm_crtc *crtc, + struct drm_crtc_state *crtc_state) +{ + if (vop2->lut_regs && crtc_state->color_mgmt_changed && + crtc_state->gamma_lut) { + vop2_lock(vop2); + if (vop2->data->soc_id == 3566 || vop2->data->soc_id == 3568) { + vop2_writel(vop2, RK3568_LUT_PORT_SEL, vp->id); + } else { + vop2_writel(vop2, RK3568_LUT_PORT_SEL, FIELD_PREP( + RK3588_LUT_PORT_SEL__GAMMA_AHB_WRITE_SEL, + vp->id)); + } + vop2_crtc_write_gamma_lut(vop2, crtc); + + vop2_unlock(vop2); + } +} + static void vop2_crtc_atomic_begin(struct drm_crtc *crtc, struct drm_atomic_state *state) { + struct drm_crtc_state *crtc_state = + drm_atomic_get_new_crtc_state(state, crtc); struct vop2_video_port *vp = to_vop2_video_port(crtc); struct vop2 *vop2 = vp->vop2; struct drm_plane *plane; @@ -2482,13 +2597,39 @@ static void vop2_crtc_atomic_begin(struct drm_crtc *crtc, vop2_setup_layer_mixer(vp); vop2_setup_alpha(vp); vop2_setup_dly_for_windows(vop2); + + vop2_crtc_atomic_begin_gamma(vop2, vp, crtc, crtc_state); +} + +static void vop2_crtc_atomic_flush_gamma(struct vop2 *vop2, + struct vop2_video_port *vp, + struct drm_crtc_state *crtc_state) +{ + if (vop2->lut_regs && crtc_state->color_mgmt_changed) { + vop2_lock(vop2); + + if (crtc_state->gamma_lut) { + vop2_vp_dsp_lut_enable(vp); + if (vop2->data->soc_id != 3566 && + vop2->data->soc_id != 3568) + vop2_vp_dsp_lut_update_enable(vp); + + } else + vop2_vp_dsp_lut_disable(vp); + + vop2_unlock(vop2); + } } static void vop2_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state) { + struct drm_crtc_state *crtc_state = + drm_atomic_get_new_crtc_state(state, crtc); struct vop2_video_port *vp = to_vop2_video_port(crtc); + vop2_crtc_atomic_flush_gamma(vp->vop2, vp, crtc_state); + vop2_post_config(crtc); vop2_cfg_done(vp); @@ -2791,6 +2932,13 @@ static int vop2_create_crtcs(struct vop2 *vop2) drm_crtc_helper_add(&vp->crtc, &vop2_crtc_helper_funcs); + if (vop2->lut_regs && vp->crtc.dev != NULL) { + const struct vop2_video_port_data *vp_data = &vop2_data->vp[vp->id]; + + drm_mode_crtc_set_gamma_size(&vp->crtc, vp_data->gamma_lut_len); + drm_crtc_enable_color_mgmt(&vp->crtc, 0, false, + vp_data->gamma_lut_len); + } init_completion(&vp->dsp_hold_completion); } diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h index 615a16196aff..510dda6f9092 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop2.h @@ -394,6 +394,7 @@ enum dst_factor_mode { #define RK3568_REG_CFG_DONE__GLB_CFG_DONE_EN BIT(15) #define RK3568_VP_DSP_CTRL__STANDBY BIT(31) +#define RK3568_VP_DSP_CTRL__DSP_LUT_EN BIT(28) #define RK3568_VP_DSP_CTRL__DITHER_DOWN_MODE BIT(20) #define RK3568_VP_DSP_CTRL__DITHER_DOWN_SEL GENMASK(19, 18) #define RK3568_VP_DSP_CTRL__DITHER_DOWN_EN BIT(17) @@ -408,6 +409,8 @@ enum dst_factor_mode { #define RK3568_VP_DSP_CTRL__CORE_DCLK_DIV BIT(4) #define RK3568_VP_DSP_CTRL__OUT_MODE GENMASK(3, 0) +#define RK3588_VP_DSP_CTRL__GAMMA_UPDATE_EN BIT(22) + #define RK3588_VP_CLK_CTRL__DCLK_OUT_DIV GENMASK(3, 2) #define RK3588_VP_CLK_CTRL__DCLK_CORE_DIV GENMASK(1, 0) @@ -460,6 +463,8 @@ enum dst_factor_mode { #define RK3588_DSP_IF_POL__DP1_PIN_POL GENMASK(14, 12) #define RK3588_DSP_IF_POL__DP0_PIN_POL GENMASK(10, 8) +#define RK3588_LUT_PORT_SEL__GAMMA_AHB_WRITE_SEL GENMASK(13, 12) + #define RK3568_VP0_MIPI_CTRL__DCLK_DIV2_PHASE_LOCK BIT(5) #define RK3568_VP0_MIPI_CTRL__DCLK_DIV2 BIT(4)
Add support for gamma LUT in VOP2 driver. The implementation was inspired by one found in VOP1 driver. Blue and red channels in gamma LUT register write were swapped with respect to how gamma LUT values are written in VOP1. If the current SoC is RK3566 or RK3568 and gamma LUT is to be written, full modeset is triggered to synchronize disable, write, enable process and hint userspace that it is not seamless transition[1]. If the current SoC is RK3588 full modeset isn't triggered because gamma LUT need not to be disabled before the LUT write[1]. In case of RK356x as well as RK3588 respective LUT port sel register write was added before the LUT write[2]. In case of RK3588, gamma update enable bit is set after setting gamma LUT enable bit[2]. Gamma size is set and drm color management is enabled for each video port's CRTC except ones which have no associated device. Tested on RK3566 (Pinetab2). [1] https://lore.kernel.org/linux-rockchip/CAPj87rOM=j0zmuWL9frGKV1xzPbJrk=Q9ip7F_HAPYnbCqPouw@mail.gmail.com/ [2] https://lore.kernel.org/linux-rockchip/7d998e4c-e1d3-4e8b-af76-c5bc83b43647@rock-chips.com/ Helped-by: Daniel Stone <daniel@fooishbar.org> Helped-by: Dragan Simic <dsimic@manjaro.org> Helped-by: Diederik de Haas <didi.debian@cknow.org> Helped-by: Andy Yan <andy.yan@rock-chips.com> Signed-off-by: Piotr Zalewski <pZ010001011111@proton.me> --- Notes: WASN'T tested on RK3588. Changes in v4: - rework the implementation to better utilize DRM atomic updates[2] - handle the RK3588 case[2][3] Changes in v3: - v3 is patch v2 "resend", by mistake the incremental patch was sent in v2 Changes in v2: - Apply code styling corrections[1] - Move gamma LUT write inside the vop2 lock Link to v3: https://lore.kernel.org/linux-rockchip/TkgKVivuaLFLILPY-n3iZo_8KF-daKdqdu-0_e0HP-5Ar_8DALDeNWog2suwWKjX7eomcbGET0KZe7DlzdhK2YM6CbLbeKeFZr-MJzJMtw0=@proton.me/ Link to v2: https://lore.kernel.org/linux-rockchip/Hk03HDb6wSSHWtEFZHUye06HR0-9YzP5nCHx9A8_kHzWSZawDrU1o1pjEGkCOJFoRg0nTB4BWEv6V0XBOjF4-0Mj44lp2TrjaQfnytzp-Pk=@proton.me/T/#u Link to v1: https://lore.kernel.org/linux-rockchip/9736eadf6a9d8e97eef919c6b3d88828@manjaro.org/T/#t [1] https://lore.kernel.org/linux-rockchip/d019761504b540600d9fc7a585d6f95f@manjaro.org [2] https://lore.kernel.org/linux-rockchip/CAPj87rOM=j0zmuWL9frGKV1xzPbJrk=Q9ip7F_HAPYnbCqPouw@mail.gmail.com [3] https://lore.kernel.org/linux-rockchip/7d998e4c-e1d3-4e8b-af76-c5bc83b43647@rock-chips.com drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 148 +++++++++++++++++++ drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 5 + 2 files changed, 153 insertions(+)