Hi Dmitry: > -----Original Message----- > From: Dmitry Baryshkov <[email protected]> > Sent: 2024年5月22日 5:08 > To: Keith Zhao <[email protected]> > Cc: [email protected]; [email protected]; [email protected]; > [email protected]; [email protected]; > [email protected]; [email protected]; > [email protected]; [email protected]; [email protected]; > [email protected]; [email protected]; [email protected]; [email protected]; > [email protected]; [email protected]; [email protected]; Xingyu Wu > <[email protected]>; [email protected]; Jack Zhu > <[email protected]>; Shengyang Chen > <[email protected]>; [email protected]; > [email protected]; [email protected]; > [email protected] > Subject: Re: [PATCH v4 07/10] drm/vs: add ctrc fun > > On Tue, May 21, 2024 at 06:58:14PM +0800, keith wrote: > > add crtc funs and helper funs > > > > Signed-off-by: keith <[email protected]> > > --- > > drivers/gpu/drm/verisilicon/Makefile | 3 +- > > drivers/gpu/drm/verisilicon/vs_crtc.c | 241 > > ++++++++++++++++++++++++++ drivers/gpu/drm/verisilicon/vs_crtc.h | > > 17 ++ > > 3 files changed, 260 insertions(+), 1 deletion(-) create mode 100644 > > drivers/gpu/drm/verisilicon/vs_crtc.c > > create mode 100644 drivers/gpu/drm/verisilicon/vs_crtc.h > > > > diff --git a/drivers/gpu/drm/verisilicon/Makefile > > b/drivers/gpu/drm/verisilicon/Makefile > > index 1c593b943261..26a43ca0fd36 100644 > > --- a/drivers/gpu/drm/verisilicon/Makefile > > +++ b/drivers/gpu/drm/verisilicon/Makefile > > @@ -2,6 +2,7 @@ > > > > vs_drm-objs := vs_dc_hw.o \ > > vs_modeset.o \ > > - vs_plane.o > > + vs_plane.o \ > > + vs_crtc.o > > > > obj-$(CONFIG_DRM_VERISILICON_DC8200) += vs_drm.o diff --git > > a/drivers/gpu/drm/verisilicon/vs_crtc.c > > b/drivers/gpu/drm/verisilicon/vs_crtc.c > > new file mode 100644 > > index 000000000000..ea7640a63c28 > > --- /dev/null > > +++ b/drivers/gpu/drm/verisilicon/vs_crtc.c > > @@ -0,0 +1,241 @@ > > +// SPDX-License-Identifier: GPL-2.0 > > +/* > > + * Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. > > + * > > + */ > > +#include <drm/drm_atomic_helper.h> > > +#include <drm/drm_atomic.h> > > +#include <drm/drm_crtc.h> > > +#include <drm/drm_gem_atomic_helper.h> #include <drm/drm_vblank.h> > > + > > +#include "vs_crtc.h" > > + > > +static void vs_crtc_atomic_destroy_state(struct drm_crtc *crtc, > > + struct drm_crtc_state *state) > > +{ > > + __drm_atomic_helper_crtc_destroy_state(state); > > + kfree(to_vs_crtc_state(state)); > > +} > > + > > +static void vs_crtc_reset(struct drm_crtc *crtc) { > > + struct vs_crtc_state *state; > > + > > + if (crtc->state) > > + vs_crtc_atomic_destroy_state(crtc, crtc->state); > > + > > + state = kzalloc(sizeof(*state), GFP_KERNEL); > > + if (!state) > > + return; > > + > > + __drm_atomic_helper_crtc_reset(crtc, &state->base); } > > + > > +static struct drm_crtc_state * > > +vs_crtc_atomic_duplicate_state(struct drm_crtc *crtc) { > > + struct vs_crtc_state *old_state; > > + struct vs_crtc_state *state; > > + > > + if (!crtc->state) > > + return NULL; > > + > > + old_state = to_vs_crtc_state(crtc->state); > > + > > + state = kmemdup(old_state, sizeof(*old_state), GFP_KERNEL); > > + if (!state) > > + return NULL; > > + > > + __drm_atomic_helper_crtc_duplicate_state(crtc, &state->base); > > + > > + return &state->base; > > +} > > + > > +static int vs_crtc_enable_vblank(struct drm_crtc *crtc) { > > + struct vs_drm_device *priv = to_vs_drm_private(crtc->dev); > > + struct vs_dc *dc = &priv->dc; > > + > > + dc_hw_enable_interrupt(&dc->hw); > > + > > + return 0; > > +} > > + > > +static void vs_crtc_disable_vblank(struct drm_crtc *crtc) { > > + struct vs_drm_device *priv = to_vs_drm_private(crtc->dev); > > + struct vs_dc *dc = &priv->dc; > > + > > + dc_hw_disable_interrupt(&dc->hw); > > +} > > + > > +static const struct drm_crtc_funcs vs_crtc_funcs = { > > + .set_config = drm_atomic_helper_set_config, > > + .page_flip = drm_atomic_helper_page_flip, > > + .reset = vs_crtc_reset, > > + .atomic_duplicate_state = vs_crtc_atomic_duplicate_state, > > + .atomic_destroy_state = vs_crtc_atomic_destroy_state, > > + .enable_vblank = vs_crtc_enable_vblank, > > + .disable_vblank = vs_crtc_disable_vblank, > > +}; > > + > > +static void vs_crtc_atomic_enable(struct drm_crtc *crtc, > > + struct drm_atomic_state *state) { > > + struct vs_drm_device *priv = to_vs_drm_private(crtc->dev); > > + struct vs_dc *dc = &priv->dc; > > + > > + struct vs_crtc_state *crtc_state = to_vs_crtc_state(crtc->state); > > + struct drm_display_mode *mode = &crtc->state->adjusted_mode; > > + int id; > > + > > + id = to_vs_display_id(dc, crtc); > > + if (crtc_state->encoder_type == DRM_MODE_ENCODER_DSI) { > > + dc_hw_set_out(&dc->hw, OUT_DPI, id); > > + clk_set_rate(priv->clks[7].clk, mode->clock * 1000); > > + clk_set_parent(priv->clks[5].clk, priv->clks[7].clk); > > + } else { > > + dc_hw_set_out(&dc->hw, OUT_DP, id); > > + clk_set_parent(priv->clks[4].clk, priv->clks[6].clk); > > + } > > + > > + dc_hw_enable(&dc->hw, id, mode, crtc_state->encoder_type, > > +crtc_state->output_fmt); > > + > > + enable_irq(priv->irq); > > + > > + drm_crtc_vblank_on(crtc); > > +} > > + > > +static void vs_crtc_atomic_disable(struct drm_crtc *crtc, > > + struct drm_atomic_state *state) { > > + struct vs_drm_device *priv = to_vs_drm_private(crtc->dev); > > + struct vs_dc *dc = &priv->dc; > > + int id; > > + > > + drm_crtc_vblank_off(crtc); > > + > > + disable_irq(priv->irq); > > + > > + id = to_vs_display_id(dc, crtc); > > + dc_hw_disable(&dc->hw, id); > > + > > + if (crtc->state->event && !crtc->state->active) { > > + spin_lock_irq(&crtc->dev->event_lock); > > + drm_crtc_send_vblank_event(crtc, crtc->state->event); > > + crtc->state->event = NULL; > > + spin_unlock_irq(&crtc->dev->event_lock); > > + } > > +} > > + > > +static void vs_dc_set_gamma(struct vs_dc *dc, struct drm_crtc *crtc, > > + struct drm_color_lut *lut, unsigned int size) { > > + u16 i, r, g, b; > > + u8 bits, id; > > + > > + if (size != dc->hw.info->gamma_size) { > > + drm_err(crtc->dev, "gamma size does not match!\n"); > > + return; > > + } > > + > > + id = to_vs_display_id(dc, crtc); > > + > > + bits = dc->hw.info->gamma_bits; > > + for (i = 0; i < size; i++) { > > + r = drm_color_lut_extract(lut[i].red, bits); > > + g = drm_color_lut_extract(lut[i].green, bits); > > + b = drm_color_lut_extract(lut[i].blue, bits); > > + dc_hw_update_gamma(&dc->hw, id, i, r, g, b); > > + > > + if (i >= dc->hw.info->gamma_size) > > + return; > > + > > + dc->hw.gamma[id].gamma[i][0] = r; > > + dc->hw.gamma[id].gamma[i][1] = g; > > + dc->hw.gamma[id].gamma[i][2] = b; > > + } > > +} > > + > > +static void vs_crtc_atomic_begin(struct drm_crtc *crtc, > > + struct drm_atomic_state *state) > > +{ > > + struct drm_crtc_state *new_state = > drm_atomic_get_new_crtc_state(state, > > + crtc); > > + > > + struct drm_property_blob *blob = new_state->gamma_lut; > > + struct drm_color_lut *lut; > > + struct vs_drm_device *priv = to_vs_drm_private(crtc->dev); > > + struct vs_dc *dc = &priv->dc; > > + u8 id; > > + > > + id = to_vs_display_id(dc, crtc); > > + if (new_state->color_mgmt_changed) { > > + if (blob && blob->length) { > > + lut = blob->data; > > + vs_dc_set_gamma(dc, crtc, lut, > > + blob->length / sizeof(*lut)); > > + dc_hw_enable_gamma(&dc->hw, id, true); > > + } else { > > + dc_hw_enable_gamma(&dc->hw, id, false); > > + } > > + } > > +} > > + > > +static void vs_crtc_atomic_flush(struct drm_crtc *crtc, > > + struct drm_atomic_state *state) > > +{ > > + struct drm_pending_vblank_event *event = crtc->state->event; > > + struct vs_drm_device *priv = to_vs_drm_private(crtc->dev); > > + struct vs_dc *dc = &priv->dc; > > + > > + dc_hw_enable_shadow_register(dc, false); > > + > > + if (event) { > > + WARN_ON(drm_crtc_vblank_get(crtc) != 0); > > + > > + spin_lock_irq(&crtc->dev->event_lock); > > + drm_crtc_arm_vblank_event(crtc, event); > > + crtc->state->event = NULL; > > + spin_unlock_irq(&crtc->dev->event_lock); > > + } > > + > > + dc_hw_enable_shadow_register(dc, true); } > > + > > +static const struct drm_crtc_helper_funcs vs_crtc_helper_funcs = { > > + .atomic_check = drm_crtc_helper_atomic_check, > > + .atomic_enable = vs_crtc_atomic_enable, > > + .atomic_disable = vs_crtc_atomic_disable, > > + .atomic_begin = vs_crtc_atomic_begin, > > + .atomic_flush = vs_crtc_atomic_flush, > > +}; > > + > > +struct vs_crtc *vs_crtc_create(struct drm_device *drm_dev, > > + struct vs_dc_info *info) > > +{ > > + struct vs_crtc *crtc; > > + int ret; > > + > > + if (!info) > > + return NULL; > > + > > + crtc = drmm_crtc_alloc_with_planes(drm_dev, struct vs_crtc, base, NULL, > > + NULL, &vs_crtc_funcs, > > + info->name ? info->name : NULL); > > + > > + drm_crtc_helper_add(&crtc->base, &vs_crtc_helper_funcs); > > + > > + if (info->gamma_size) { > > + ret = drm_mode_crtc_set_gamma_size(&crtc->base, > > + info->gamma_size); > > + if (ret) > > + return NULL; > > + > > + drm_crtc_enable_color_mgmt(&crtc->base, 0, false, > > + info->gamma_size); > > + } > > + > > + return crtc; > > +} > > diff --git a/drivers/gpu/drm/verisilicon/vs_crtc.h > > b/drivers/gpu/drm/verisilicon/vs_crtc.h > > new file mode 100644 > > index 000000000000..b1e588bb780d > > --- /dev/null > > +++ b/drivers/gpu/drm/verisilicon/vs_crtc.h > > @@ -0,0 +1,17 @@ > > +/* SPDX-License-Identifier: GPL-2.0 */ > > +/* > > + * Copyright (C) 2023 VeriSilicon Holdings Co., Ltd. > > + */ > > + > > +#ifndef __VS_CRTC_H__ > > +#define __VS_CRTC_H__ > > + > > +#include <drm/drm_crtc.h> > > +#include <drm/drm_crtc_helper.h> > > Do you really need to include them here? > The location of include can be optimized Delete #include <drm/drm_crtc.h> Move drm_crtc_helper.h to vs_crtc.c
> > + > > +#include "vs_drv.h" > > + > > +struct vs_crtc *vs_crtc_create(struct drm_device *drm_dev, > > + struct vs_dc_info *info); > > + > > +#endif /* __VS_CRTC_H__ */ > > -- > > 2.27.0 > > > > -- > With best wishes > Dmitry
