Skip to content

Commit

Permalink
drm/imx: imx-tve: use local encoder and connector variables
Browse files Browse the repository at this point in the history
Introduce local variables for encoder and connector.
This simplifies the following commits.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Philipp Zabel committed Jan 4, 2021
1 parent 8767f47 commit 396852d
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/gpu/drm/imx/imx-tve.c
Original file line number Diff line number Diff line change
Expand Up @@ -430,27 +430,28 @@ static int tve_clk_init(struct imx_tve *tve, void __iomem *base)

static int imx_tve_register(struct drm_device *drm, struct imx_tve *tve)
{
struct drm_encoder *encoder = &tve->encoder;
struct drm_connector *connector = &tve->connector;
int encoder_type;
int ret;

encoder_type = tve->mode == TVE_MODE_VGA ?
DRM_MODE_ENCODER_DAC : DRM_MODE_ENCODER_TVDAC;

ret = imx_drm_encoder_parse_of(drm, &tve->encoder, tve->dev->of_node);
ret = imx_drm_encoder_parse_of(drm, encoder, tve->dev->of_node);
if (ret)
return ret;

drm_encoder_helper_add(&tve->encoder, &imx_tve_encoder_helper_funcs);
drm_simple_encoder_init(drm, &tve->encoder, encoder_type);
drm_encoder_helper_add(encoder, &imx_tve_encoder_helper_funcs);
drm_simple_encoder_init(drm, encoder, encoder_type);

drm_connector_helper_add(&tve->connector,
&imx_tve_connector_helper_funcs);
drm_connector_init_with_ddc(drm, &tve->connector,
drm_connector_helper_add(connector, &imx_tve_connector_helper_funcs);
drm_connector_init_with_ddc(drm, connector,
&imx_tve_connector_funcs,
DRM_MODE_CONNECTOR_VGA,
tve->ddc);

drm_connector_attach_encoder(&tve->connector, &tve->encoder);
drm_connector_attach_encoder(connector, encoder);

return 0;
}
Expand Down

0 comments on commit 396852d

Please sign in to comment.