Commit 5b8f0910 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm/sun4i: tcon: Don't rely on encoders to set the TCON mode 



Just like we did for the TCON enable and disable, for historical reasons we
used to rely on the encoders calling the TCON mode_set function, while the
CRTC has a callback for that.

Let's implement it in order to reduce the boilerplate code.

Reviewed-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Link: https://patchwork.freedesktop.org/patch/msgid/faa3a4d511039af1d116270dfef3a8b60ca3591e.1508231063.git-series.maxime.ripard@free-electrons.com
parent 45e88f99

drivers/gpu/drm/sun4i/sun4i_crtc.c

+10 −0
Original line number Diff line number Diff line
@@ -115,11 +115,21 @@ static void sun4i_crtc_atomic_enable(struct drm_crtc *crtc, 
	sun4i_tcon_set_status(scrtc->tcon, encoder, true);

}



static void sun4i_crtc_mode_set_nofb(struct drm_crtc *crtc)

{

	struct drm_display_mode *mode = &crtc->state->adjusted_mode;

	struct drm_encoder *encoder = sun4i_crtc_get_encoder(crtc);

	struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc);



	sun4i_tcon_mode_set(scrtc->tcon, encoder, mode);

}



static const struct drm_crtc_helper_funcs sun4i_crtc_helper_funcs = {

	.atomic_begin	= sun4i_crtc_atomic_begin,

	.atomic_flush	= sun4i_crtc_atomic_flush,

	.atomic_enable	= sun4i_crtc_atomic_enable,

	.atomic_disable	= sun4i_crtc_atomic_disable,

	.mode_set_nofb	= sun4i_crtc_mode_set_nofb,

};



static int sun4i_crtc_enable_vblank(struct drm_crtc *crtc)

drivers/gpu/drm/sun4i/sun4i_hdmi_ddc_clk.c

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <linux/clk-provider.h>

#include <linux/regmap.h>



#include "sun4i_tcon.h"

#include "sun4i_hdmi.h"



struct sun4i_ddc {

drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c

+0 −7
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include "sun4i_crtc.h"

#include "sun4i_drv.h"

#include "sun4i_hdmi.h"

#include "sun4i_tcon.h"



static inline struct sun4i_hdmi *

drm_encoder_to_sun4i_hdmi(struct drm_encoder *encoder)
@@ -120,15 +119,9 @@ static void sun4i_hdmi_mode_set(struct drm_encoder *encoder, 
				struct drm_display_mode *adjusted_mode)

{

	struct sun4i_hdmi *hdmi = drm_encoder_to_sun4i_hdmi(encoder);

	struct sun4i_crtc *crtc = drm_crtc_to_sun4i_crtc(encoder->crtc);

	struct sun4i_tcon *tcon = crtc->tcon;

	unsigned int x, y;

	u32 val;



	sun4i_tcon1_mode_set(tcon, mode);

	sun4i_tcon_set_mux(tcon, 1, encoder);



	clk_set_rate(tcon->sclk1, mode->crtc_clock * 1000);

	clk_set_rate(hdmi->mod_clk, mode->crtc_clock * 1000);

	clk_set_rate(hdmi->tmds_clk, mode->crtc_clock * 1000);

drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ 


#include <linux/clk-provider.h>



#include "sun4i_tcon.h"

#include "sun4i_hdmi.h"



struct sun4i_tmds {

drivers/gpu/drm/sun4i/sun4i_rgb.c

+0 −15
Original line number Diff line number Diff line
@@ -153,22 +153,7 @@ static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder) 
	}

}



static void sun4i_rgb_encoder_mode_set(struct drm_encoder *encoder,

				       struct drm_display_mode *mode,

				       struct drm_display_mode *adjusted_mode)

{

	struct sun4i_rgb *rgb = drm_encoder_to_sun4i_rgb(encoder);

	struct sun4i_tcon *tcon = rgb->tcon;



	sun4i_tcon0_mode_set(tcon, mode);

	sun4i_tcon_set_mux(tcon, 0, encoder);



	/* FIXME: This seems to be board specific */

	clk_set_phase(tcon->dclk, 120);

}



static struct drm_encoder_helper_funcs sun4i_rgb_enc_helper_funcs = {

	.mode_set	= sun4i_rgb_encoder_mode_set,

	.disable	= sun4i_rgb_encoder_disable,

	.enable		= sun4i_rgb_encoder_enable,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE