Our mode_set implementation can be merged into our atomic_enable
implementation to simplify things, so let's do this.
Signed-off-by: Maxime Ripard <[email protected]>
diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c b/drivers/gpu/drm/sun4i/sun4i_tv.c
index f7aad995ab5b..3944da9a3c34 100644
--- a/drivers/gpu/drm/sun4i/sun4i_tv.c
+++ b/drivers/gpu/drm/sun4i/sun4i_tv.c
@@ -359,23 +359,13 @@ static void sun4i_tv_enable(struct drm_encoder *encoder,
{
struct sun4i_tv *tv = drm_encoder_to_sun4i_tv(encoder);
struct sun4i_crtc *crtc = drm_crtc_to_sun4i_crtc(encoder->crtc);
-
- DRM_DEBUG_DRIVER("Enabling the TV Output\n");
-
- sunxi_engine_apply_color_correction(crtc->engine);
-
- regmap_update_bits(tv->regs, SUN4I_TVE_EN_REG,
- SUN4I_TVE_EN_ENABLE,
- SUN4I_TVE_EN_ENABLE);
-}
-
-static void sun4i_tv_mode_set(struct drm_encoder *encoder,
- struct drm_display_mode *mode,
- struct drm_display_mode *adjusted_mode)
-{
- struct sun4i_tv *tv = drm_encoder_to_sun4i_tv(encoder);
+ struct drm_crtc_state *crtc_state =
+ drm_atomic_get_new_crtc_state(state, encoder->crtc);
+ struct drm_display_mode *mode = &crtc_state->mode;
const struct tv_mode *tv_mode = sun4i_tv_find_tv_by_mode(mode);
+ DRM_DEBUG_DRIVER("Enabling the TV Output\n");
+
/* Enable and map the DAC to the output */
regmap_update_bits(tv->regs, SUN4I_TVE_EN_REG,
SUN4I_TVE_EN_DAC_MAP_MASK,
@@ -468,12 +458,17 @@ static void sun4i_tv_mode_set(struct drm_encoder *encoder,
SUN4I_TVE_RESYNC_FIELD : 0));
regmap_write(tv->regs, SUN4I_TVE_SLAVE_REG, 0);
+
+ sunxi_engine_apply_color_correction(crtc->engine);
+
+ regmap_update_bits(tv->regs, SUN4I_TVE_EN_REG,
+ SUN4I_TVE_EN_ENABLE,
+ SUN4I_TVE_EN_ENABLE);
}
static const struct drm_encoder_helper_funcs sun4i_tv_helper_funcs = {
.atomic_disable = sun4i_tv_disable,
.atomic_enable = sun4i_tv_enable,
- .mode_set = sun4i_tv_mode_set,
};
static int sun4i_tv_comp_get_modes(struct drm_connector *connector)
--
b4 0.10.0-dev-65ba7
Dne ponedeljek, 29. avgust 2022 ob 15:11:50 CEST je Maxime Ripard napisal(a):
> Our mode_set implementation can be merged into our atomic_enable
> implementation to simplify things, so let's do this.
Are you sure this is a good thing in long term? What if user wants to change
mode? Unlikely, but why not.
Best regards,
Jernej
>
> Signed-off-by: Maxime Ripard <[email protected]>
>
> diff --git a/drivers/gpu/drm/sun4i/sun4i_tv.c
> b/drivers/gpu/drm/sun4i/sun4i_tv.c
> index f7aad995ab5b..3944da9a3c34 100644
> --- a/drivers/gpu/drm/sun4i/sun4i_tv.c
> +++ b/drivers/gpu/drm/sun4i/sun4i_tv.c
> @@ -359,23 +359,13 @@ static void sun4i_tv_enable(struct drm_encoder
> *encoder,
{
> struct sun4i_tv *tv = drm_encoder_to_sun4i_tv(encoder);
> struct sun4i_crtc *crtc = drm_crtc_to_sun4i_crtc(encoder->crtc);
> -
> - DRM_DEBUG_DRIVER("Enabling the TV Output\n");
> -
> - sunxi_engine_apply_color_correction(crtc->engine);
> -
> - regmap_update_bits(tv->regs, SUN4I_TVE_EN_REG,
> - SUN4I_TVE_EN_ENABLE,
> - SUN4I_TVE_EN_ENABLE);
> -}
> -
> -static void sun4i_tv_mode_set(struct drm_encoder *encoder,
> - struct drm_display_mode *mode,
> - struct drm_display_mode
*adjusted_mode)
> -{
> - struct sun4i_tv *tv = drm_encoder_to_sun4i_tv(encoder);
> + struct drm_crtc_state *crtc_state =
> + drm_atomic_get_new_crtc_state(state, encoder->crtc);
> + struct drm_display_mode *mode = &crtc_state->mode;
> const struct tv_mode *tv_mode = sun4i_tv_find_tv_by_mode(mode);
>
> + DRM_DEBUG_DRIVER("Enabling the TV Output\n");
> +
> /* Enable and map the DAC to the output */
> regmap_update_bits(tv->regs, SUN4I_TVE_EN_REG,
> SUN4I_TVE_EN_DAC_MAP_MASK,
> @@ -468,12 +458,17 @@ static void sun4i_tv_mode_set(struct drm_encoder
> *encoder,
> SUN4I_TVE_RESYNC_FIELD : 0));
>
> regmap_write(tv->regs, SUN4I_TVE_SLAVE_REG, 0);
> +
> + sunxi_engine_apply_color_correction(crtc->engine);
> +
> + regmap_update_bits(tv->regs, SUN4I_TVE_EN_REG,
> + SUN4I_TVE_EN_ENABLE,
> + SUN4I_TVE_EN_ENABLE);
> }
>
> static const struct drm_encoder_helper_funcs sun4i_tv_helper_funcs = {
> .atomic_disable = sun4i_tv_disable,
> .atomic_enable = sun4i_tv_enable,
> - .mode_set = sun4i_tv_mode_set,
> };
>
> static int sun4i_tv_comp_get_modes(struct drm_connector *connector)
>
> --
> b4 0.10.0-dev-65ba7
On Tue, Sep 06, 2022 at 10:04:32PM +0200, Jernej Škrabec wrote:
> Dne ponedeljek, 29. avgust 2022 ob 15:11:50 CEST je Maxime Ripard napisal(a):
> > Our mode_set implementation can be merged into our atomic_enable
> > implementation to simplify things, so let's do this.
>
> Are you sure this is a good thing in long term? What if user wants to change
> mode? Unlikely, but why not.
It doesn't change anything feature-wise: whenever the mode is changed on
the CRTC, the encoder is going to be disabled and enabled.
It's disabled here:
https://elixir.bootlin.com/linux/latest/source/drivers/gpu/drm/drm_atomic_helper.c#L1064
And enabled here:
https://elixir.bootlin.com/linux/latest/source/drivers/gpu/drm/drm_atomic_helper.c#L1403
With drm_atomic_crtc_needs_modeset() being defined here:
https://elixir.bootlin.com/linux/latest/source/include/drm/drm_atomic.h#L1049
Maxime
Dne sreda, 07. september 2022 ob 09:41:34 CEST je Maxime Ripard napisal(a):
> On Tue, Sep 06, 2022 at 10:04:32PM +0200, Jernej Škrabec wrote:
> > Dne ponedeljek, 29. avgust 2022 ob 15:11:50 CEST je Maxime Ripard
napisal(a):
> > > Our mode_set implementation can be merged into our atomic_enable
> > > implementation to simplify things, so let's do this.
> >
> > Are you sure this is a good thing in long term? What if user wants to
> > change mode? Unlikely, but why not.
>
> It doesn't change anything feature-wise: whenever the mode is changed on
> the CRTC, the encoder is going to be disabled and enabled.
>
> It's disabled here:
> https://elixir.bootlin.com/linux/latest/source/drivers/gpu/drm/drm_atomic_he
> lper.c#L1064
>
> And enabled here:
> https://elixir.bootlin.com/linux/latest/source/drivers/gpu/drm/drm_atomic_he
> lper.c#L1403
>
> With drm_atomic_crtc_needs_modeset() being defined here:
> https://elixir.bootlin.com/linux/latest/source/include/drm/drm_atomic.h#L104
> 9
Right.
Acked-by: Jernej Skrabec <[email protected]>
Best regards,
Jernej
On Mon, 29 Aug 2022 15:11:50 +0200, Maxime Ripard wrote:
> Our mode_set implementation can be merged into our atomic_enable
> implementation to simplify things, so let's do this.
>
>
Applied to drm/drm-misc (drm-misc-next).
Thanks!
Maxime