Commit a7358310 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Danilo Krummrich
Browse files

drm/nouveau: vendor in drm_encoder_slave API 



Nouveau driver is the only user of the drm_encoder_slave API. Rework
necessary bits of drm_encoder_slave into the nouveau_i2c_encoder API and
drop drm_encoder_slave.c from the DRM KMS helper.

Suggested-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarDanilo Krummrich <dakr@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20250106-nouveau-encoder-slave-v3-2-1d37d2f2c67f@linaro.org
parent 9a0dfe9b

drivers/gpu/drm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ drm_kms_helper-y := \ 
	drm_atomic_state_helper.o \

	drm_crtc_helper.o \

	drm_damage_helper.o \

	drm_encoder_slave.o \

	drm_flip_work.o \

	drm_format_helper.o \

	drm_gem_atomic_helper.o \

drivers/gpu/drm/nouveau/dispnv04/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ nouveau-y += dispnv04/dac.o 
nouveau-y += dispnv04/dfp.o

nouveau-y += dispnv04/disp.o

nouveau-y += dispnv04/hw.o

nouveau-y += dispnv04/nouveau_i2c_encoder.o

nouveau-y += dispnv04/overlay.o

nouveau-y += dispnv04/tvmodesnv17.o

nouveau-y += dispnv04/tvnv04.o

drivers/gpu/drm/nouveau/dispnv04/dfp.c

+8 −7
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static struct drm_encoder *get_tmds_slave(struct drm_encoder *encoder) 
	list_for_each_entry(slave, &dev->mode_config.encoder_list, head) {

		struct dcb_output *slave_dcb = nouveau_encoder(slave)->dcb;



		if (slave_dcb->type == DCB_OUTPUT_TMDS && get_slave_funcs(slave) &&

		if (slave_dcb->type == DCB_OUTPUT_TMDS && get_encoder_i2c_funcs(slave) &&

		    slave_dcb->tmdsconf.slave_addr == dcb->tmdsconf.slave_addr)

			return slave;

	}
@@ -473,8 +473,9 @@ static void nv04_dfp_commit(struct drm_encoder *encoder) 
	/* Init external transmitters */

	slave_encoder = get_tmds_slave(encoder);

	if (slave_encoder)

		get_slave_funcs(slave_encoder)->mode_set(

			slave_encoder, &nv_encoder->mode, &nv_encoder->mode);

		get_encoder_i2c_funcs(slave_encoder)->mode_set(slave_encoder,

							       &nv_encoder->mode,

							       &nv_encoder->mode);



	helper->dpms(encoder, DRM_MODE_DPMS_ON);
@@ -614,8 +615,8 @@ static void nv04_dfp_destroy(struct drm_encoder *encoder) 
{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);



	if (get_slave_funcs(encoder))

		get_slave_funcs(encoder)->destroy(encoder);

	if (get_encoder_i2c_funcs(encoder))

		get_encoder_i2c_funcs(encoder)->destroy(encoder);



	drm_encoder_cleanup(encoder);

	kfree(nv_encoder);
@@ -649,7 +650,7 @@ static void nv04_tmds_slave_init(struct drm_encoder *encoder) 
	if (type < 0)

		return;



	drm_i2c_encoder_init(dev, to_encoder_slave(encoder),

	nouveau_i2c_encoder_init(dev, to_encoder_i2c(encoder),

				 &bus->i2c, &info[type].dev);

}

drivers/gpu/drm/nouveau/dispnv04/i2c/ch7006_drv.c

+15 −15
Original line number Diff line number Diff line
@@ -47,14 +47,14 @@ static void ch7006_encoder_destroy(struct drm_encoder *encoder) 
	drm_property_destroy(encoder->dev, priv->scale_property);



	kfree(priv);

	to_encoder_slave(encoder)->slave_priv = NULL;

	to_encoder_i2c(encoder)->encoder_i2c_priv = NULL;



	drm_i2c_encoder_destroy(encoder);

	nouveau_i2c_encoder_destroy(encoder);

}



static void  ch7006_encoder_dpms(struct drm_encoder *encoder, int mode)

{

	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);

	struct i2c_client *client = nouveau_i2c_encoder_get_client(encoder);

	struct ch7006_priv *priv = to_ch7006_priv(encoder);

	struct ch7006_state *state = &priv->state;
@@ -71,7 +71,7 @@ static void ch7006_encoder_dpms(struct drm_encoder *encoder, int mode) 


static void ch7006_encoder_save(struct drm_encoder *encoder)

{

	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);

	struct i2c_client *client = nouveau_i2c_encoder_get_client(encoder);

	struct ch7006_priv *priv = to_ch7006_priv(encoder);



	ch7006_dbg(client, "\n");
@@ -81,7 +81,7 @@ static void ch7006_encoder_save(struct drm_encoder *encoder) 


static void ch7006_encoder_restore(struct drm_encoder *encoder)

{

	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);

	struct i2c_client *client = nouveau_i2c_encoder_get_client(encoder);

	struct ch7006_priv *priv = to_ch7006_priv(encoder);



	ch7006_dbg(client, "\n");
@@ -116,7 +116,7 @@ static void ch7006_encoder_mode_set(struct drm_encoder *encoder, 
				     struct drm_display_mode *drm_mode,

				     struct drm_display_mode *adjusted_mode)

{

	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);

	struct i2c_client *client = nouveau_i2c_encoder_get_client(encoder);

	struct ch7006_priv *priv = to_ch7006_priv(encoder);

	struct ch7006_encoder_params *params = &priv->params;

	struct ch7006_state *state = &priv->state;
@@ -179,7 +179,7 @@ static void ch7006_encoder_mode_set(struct drm_encoder *encoder, 
static enum drm_connector_status ch7006_encoder_detect(struct drm_encoder *encoder,

						       struct drm_connector *connector)

{

	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);

	struct i2c_client *client = nouveau_i2c_encoder_get_client(encoder);

	struct ch7006_priv *priv = to_ch7006_priv(encoder);

	struct ch7006_state *state = &priv->state;

	int det;
@@ -285,7 +285,7 @@ static int ch7006_encoder_set_property(struct drm_encoder *encoder, 
				       struct drm_property *property,

				       uint64_t val)

{

	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);

	struct i2c_client *client = nouveau_i2c_encoder_get_client(encoder);

	struct ch7006_priv *priv = to_ch7006_priv(encoder);

	struct ch7006_state *state = &priv->state;

	struct drm_mode_config *conf = &encoder->dev->mode_config;
@@ -370,7 +370,7 @@ static int ch7006_encoder_set_property(struct drm_encoder *encoder, 
	return 0;

}



static const struct drm_encoder_slave_funcs ch7006_encoder_funcs = {

static const struct nouveau_i2c_encoder_funcs ch7006_encoder_funcs = {

	.set_config = ch7006_encoder_set_config,

	.destroy = ch7006_encoder_destroy,

	.dpms = ch7006_encoder_dpms,
@@ -437,7 +437,7 @@ static int ch7006_resume(struct device *dev) 


static int ch7006_encoder_init(struct i2c_client *client,

			       struct drm_device *dev,

			       struct drm_encoder_slave *encoder)

			       struct nouveau_i2c_encoder *encoder)

{

	struct ch7006_priv *priv;

	int i;
@@ -448,8 +448,8 @@ static int ch7006_encoder_init(struct i2c_client *client, 
	if (!priv)

		return -ENOMEM;



	encoder->slave_priv = priv;

	encoder->slave_funcs = &ch7006_encoder_funcs;

	encoder->encoder_i2c_priv = priv;

	encoder->encoder_i2c_funcs = &ch7006_encoder_funcs;



	priv->norm = TV_NORM_PAL;

	priv->select_subconnector = DRM_MODE_SUBCONNECTOR_Automatic;
@@ -495,7 +495,7 @@ static const struct dev_pm_ops ch7006_pm_ops = { 
	.resume = ch7006_resume,

};



static struct drm_i2c_encoder_driver ch7006_driver = {

static struct nouveau_i2c_encoder_driver ch7006_driver = {

	.i2c_driver = {

		.probe = ch7006_probe,

		.remove = ch7006_remove,
@@ -516,12 +516,12 @@ static struct drm_i2c_encoder_driver ch7006_driver = { 


static int __init ch7006_init(void)

{

	return drm_i2c_encoder_register(THIS_MODULE, &ch7006_driver);

	return i2c_add_driver(&ch7006_driver.i2c_driver);

}



static void __exit ch7006_exit(void)

{

	drm_i2c_encoder_unregister(&ch7006_driver);

	i2c_del_driver(&ch7006_driver.i2c_driver);

}



int ch7006_debug;

drivers/gpu/drm/nouveau/dispnv04/i2c/ch7006_mode.c

+4 −4
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ const struct ch7006_mode *ch7006_lookup_mode(struct drm_encoder *encoder, 


void ch7006_setup_levels(struct drm_encoder *encoder)

{

	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);

	struct i2c_client *client = nouveau_i2c_encoder_get_client(encoder);

	struct ch7006_priv *priv = to_ch7006_priv(encoder);

	uint8_t *regs = priv->state.regs;

	const struct ch7006_tv_norm_info *norm = &ch7006_tv_norms[priv->norm];
@@ -229,7 +229,7 @@ void ch7006_setup_levels(struct drm_encoder *encoder) 


void ch7006_setup_subcarrier(struct drm_encoder *encoder)

{

	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);

	struct i2c_client *client = nouveau_i2c_encoder_get_client(encoder);

	struct ch7006_priv *priv = to_ch7006_priv(encoder);

	struct ch7006_state *state = &priv->state;

	const struct ch7006_tv_norm_info *norm = &ch7006_tv_norms[priv->norm];
@@ -253,7 +253,7 @@ void ch7006_setup_subcarrier(struct drm_encoder *encoder) 


void ch7006_setup_pll(struct drm_encoder *encoder)

{

	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);

	struct i2c_client *client = nouveau_i2c_encoder_get_client(encoder);

	struct ch7006_priv *priv = to_ch7006_priv(encoder);

	uint8_t *regs = priv->state.regs;

	const struct ch7006_mode *mode = priv->mode;
@@ -324,7 +324,7 @@ void ch7006_setup_power_state(struct drm_encoder *encoder) 


void ch7006_setup_properties(struct drm_encoder *encoder)

{

	struct i2c_client *client = drm_i2c_encoder_get_client(encoder);

	struct i2c_client *client = nouveau_i2c_encoder_get_client(encoder);

	struct ch7006_priv *priv = to_ch7006_priv(encoder);

	struct ch7006_state *state = &priv->state;

	const struct ch7006_tv_norm_info *norm = &ch7006_tv_norms[priv->norm];