Skip to content

Commit

Permalink
drm/vc4: hdmi: Remove vc4_hdmi_connector
Browse files Browse the repository at this point in the history 
The vc4_hdmi_connector was only used to switch between drm_connector to
drm_encoder. However, we can now use vc4_hdmi to do the switch, so that
structure is redundant.

Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Tested-by: Chanwoo Choi <cw00.choi@samsung.com>
Tested-by: Hoegeun Kwon <hoegeun.kwon@samsung.com>
Tested-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Link: https://patchwork.freedesktop.org/patch/msgid/aee5120728db350b19c074de4290eafaf01e6671.1599120059.git-series.maxime@cerno.tech
  • Loading branch information
Maxime Ripard committed Sep 7, 2020
1 parent 283d347 commit 0532e5e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 32 deletions.
19 changes: 8 additions & 11 deletions drivers/gpu/drm/vc4/vc4_hdmi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,13 +189,10 @@ static const struct drm_connector_helper_funcs vc4_hdmi_connector_helper_funcs =
static int vc4_hdmi_connector_init(struct drm_device *dev,
struct vc4_hdmi *vc4_hdmi)
{
struct vc4_hdmi_connector *hdmi_connector = &vc4_hdmi->connector;
struct drm_connector *connector = &hdmi_connector->base;
struct drm_connector *connector = &vc4_hdmi->connector;
struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
int ret;

hdmi_connector->encoder = encoder;

drm_connector_init_with_ddc(dev, connector,
&vc4_hdmi_connector_funcs,
DRM_MODE_CONNECTOR_HDMIA,
Expand Down Expand Up @@ -284,7 +281,7 @@ static void vc4_hdmi_set_avi_infoframe(struct drm_encoder *encoder)
{
struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
struct vc4_hdmi_encoder *vc4_encoder = to_vc4_hdmi_encoder(encoder);
struct drm_connector *connector = &vc4_hdmi->connector.base;
struct drm_connector *connector = &vc4_hdmi->connector;
struct drm_connector_state *cstate = connector->state;
struct drm_crtc *crtc = encoder->crtc;
const struct drm_display_mode *mode = &crtc->state->adjusted_mode;
Expand Down Expand Up @@ -663,7 +660,7 @@ static int vc4_hdmi_audio_startup(struct snd_pcm_substream *substream,
{
struct vc4_hdmi *vc4_hdmi = dai_to_hdmi(dai);
struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;
struct drm_connector *connector = &vc4_hdmi->connector.base;
struct drm_connector *connector = &vc4_hdmi->connector;
int ret;

if (vc4_hdmi->audio.substream && vc4_hdmi->audio.substream != substream)
Expand Down Expand Up @@ -837,7 +834,7 @@ static int vc4_hdmi_audio_eld_ctl_info(struct snd_kcontrol *kcontrol,
{
struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
struct vc4_hdmi *vc4_hdmi = snd_component_to_hdmi(component);
struct drm_connector *connector = &vc4_hdmi->connector.base;
struct drm_connector *connector = &vc4_hdmi->connector;

uinfo->type = SNDRV_CTL_ELEM_TYPE_BYTES;
uinfo->count = sizeof(connector->eld);
Expand All @@ -850,7 +847,7 @@ static int vc4_hdmi_audio_eld_ctl_get(struct snd_kcontrol *kcontrol,
{
struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
struct vc4_hdmi *vc4_hdmi = snd_component_to_hdmi(component);
struct drm_connector *connector = &vc4_hdmi->connector.base;
struct drm_connector *connector = &vc4_hdmi->connector;

memcpy(ucontrol->value.bytes.data, connector->eld,
sizeof(connector->eld));
Expand Down Expand Up @@ -1304,7 +1301,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
if (ret < 0)
goto err_destroy_conn;

cec_fill_conn_info_from_drm(&conn_info, &vc4_hdmi->connector.base);
cec_fill_conn_info_from_drm(&conn_info, &vc4_hdmi->connector);
cec_s_conn_info(vc4_hdmi->cec_adap, &conn_info);

HDMI_WRITE(VC4_HDMI_CPU_MASK_SET, 0xffffffff);
Expand Down Expand Up @@ -1341,7 +1338,7 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data)
err_delete_cec_adap:
cec_delete_adapter(vc4_hdmi->cec_adap);
err_destroy_conn:
vc4_hdmi_connector_destroy(&vc4_hdmi->connector.base);
vc4_hdmi_connector_destroy(&vc4_hdmi->connector);
#endif
err_destroy_encoder:
drm_encoder_cleanup(encoder);
Expand Down Expand Up @@ -1381,7 +1378,7 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master,
vc4_hdmi = dev_get_drvdata(dev);

cec_unregister_adapter(vc4_hdmi->cec_adap);
vc4_hdmi_connector_destroy(&vc4_hdmi->connector.base);
vc4_hdmi_connector_destroy(&vc4_hdmi->connector);
drm_encoder_cleanup(&vc4_hdmi->encoder.base.base);

clk_disable_unprepare(vc4_hdmi->hsm_clock);
Expand Down
23 changes: 2 additions & 21 deletions drivers/gpu/drm/vc4/vc4_hdmi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,6 @@ to_vc4_hdmi_encoder(struct drm_encoder *encoder)
return container_of(encoder, struct vc4_hdmi_encoder, base.base);
}

/* VC4 HDMI connector KMS struct */
struct vc4_hdmi_connector {
struct drm_connector base;

/* Since the connector is attached to just the one encoder,
* this is the reference to it so we can do the best_encoder()
* hook.
*/
struct drm_encoder *encoder;
};

static inline struct vc4_hdmi_connector *
to_vc4_hdmi_connector(struct drm_connector *connector)
{
return container_of(connector, struct vc4_hdmi_connector, base);
}

/* HDMI audio information */
struct vc4_hdmi_audio {
struct snd_soc_card card;
Expand All @@ -58,7 +41,7 @@ struct vc4_hdmi {
struct platform_device *pdev;

struct vc4_hdmi_encoder encoder;
struct vc4_hdmi_connector connector;
struct drm_connector connector;

struct i2c_adapter *ddc;
void __iomem *hdmicore_regs;
Expand All @@ -81,9 +64,7 @@ struct vc4_hdmi {
static inline struct vc4_hdmi *
connector_to_vc4_hdmi(struct drm_connector *connector)
{
struct vc4_hdmi_connector *_connector = to_vc4_hdmi_connector(connector);

return container_of(_connector, struct vc4_hdmi, connector);
return container_of(connector, struct vc4_hdmi, connector);
}

static inline struct vc4_hdmi *
Expand Down

0 comments on commit 0532e5e

Please sign in to comment.