Unverified Commit 8687b535 authored by José Expósito's avatar José Expósito Committed by Maxime Ripard
Browse files

drm/vc4: hdmi: Remove vc4_hdmi_encoder 



The vc4_hdmi_encoder struct was used exclusively to cache the value
returned by drm_detect_hdmi_monitor() in order to avoid calling it
multiple times.

Now that drm_detect_hdmi_monitor() has been replaced with
drm_display_info.is_hdmi, there is no need to have an extra struct.

Remove vc4_hdmi_encoder.

Signed-off-by: default avatarJosé Expósito <jose.exposito89@gmail.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20220420114500.187664-3-jose.exposito89@gmail.com
parent c3c2f38c

drivers/gpu/drm/vc4/vc4_hdmi.c

+12 −12
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force) 
			}

		}



		vc4_hdmi_enable_scrambling(&vc4_hdmi->encoder.base.base);

		vc4_hdmi_enable_scrambling(&vc4_hdmi->encoder.base);

		pm_runtime_put(&vc4_hdmi->pdev->dev);

		mutex_unlock(&vc4_hdmi->mutex);

		return connector_status_connected;
@@ -383,7 +383,7 @@ static int vc4_hdmi_connector_init(struct drm_device *dev, 
				   struct vc4_hdmi *vc4_hdmi)

{

	struct drm_connector *connector = &vc4_hdmi->connector;

	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;

	struct drm_encoder *encoder = &vc4_hdmi->encoder.base;

	int ret;



	drm_connector_init_with_ddc(dev, connector,
@@ -1798,7 +1798,7 @@ static int vc4_hdmi_audio_startup(struct device *dev, void *data) 


static void vc4_hdmi_audio_reset(struct vc4_hdmi *vc4_hdmi)

{

	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;

	struct drm_encoder *encoder = &vc4_hdmi->encoder.base;

	struct device *dev = &vc4_hdmi->pdev->dev;

	unsigned long flags;

	int ret;
@@ -1888,7 +1888,7 @@ static int vc4_hdmi_audio_prepare(struct device *dev, void *data, 
				  struct hdmi_codec_params *params)

{

	struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);

	struct drm_encoder *encoder = &vc4_hdmi->encoder.base.base;

	struct drm_encoder *encoder = &vc4_hdmi->encoder.base;

	unsigned int sample_rate = params->sample_rate;

	unsigned int channels = params->channels;

	unsigned long flags;
@@ -2841,13 +2841,13 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) 
	INIT_DELAYED_WORK(&vc4_hdmi->scrambling_work, vc4_hdmi_scrambling_wq);



	dev_set_drvdata(dev, vc4_hdmi);

	encoder = &vc4_hdmi->encoder.base.base;

	vc4_hdmi->encoder.base.type = variant->encoder_type;

	vc4_hdmi->encoder.base.pre_crtc_configure = vc4_hdmi_encoder_pre_crtc_configure;

	vc4_hdmi->encoder.base.pre_crtc_enable = vc4_hdmi_encoder_pre_crtc_enable;

	vc4_hdmi->encoder.base.post_crtc_enable = vc4_hdmi_encoder_post_crtc_enable;

	vc4_hdmi->encoder.base.post_crtc_disable = vc4_hdmi_encoder_post_crtc_disable;

	vc4_hdmi->encoder.base.post_crtc_powerdown = vc4_hdmi_encoder_post_crtc_powerdown;

	encoder = &vc4_hdmi->encoder.base;

	vc4_hdmi->encoder.type = variant->encoder_type;

	vc4_hdmi->encoder.pre_crtc_configure = vc4_hdmi_encoder_pre_crtc_configure;

	vc4_hdmi->encoder.pre_crtc_enable = vc4_hdmi_encoder_pre_crtc_enable;

	vc4_hdmi->encoder.post_crtc_enable = vc4_hdmi_encoder_post_crtc_enable;

	vc4_hdmi->encoder.post_crtc_disable = vc4_hdmi_encoder_post_crtc_disable;

	vc4_hdmi->encoder.post_crtc_powerdown = vc4_hdmi_encoder_post_crtc_powerdown;

	vc4_hdmi->pdev = pdev;

	vc4_hdmi->variant = variant;
@@ -2996,7 +2996,7 @@ static void vc4_hdmi_unbind(struct device *dev, struct device *master, 
	vc4_hdmi_cec_exit(vc4_hdmi);

	vc4_hdmi_hotplug_exit(vc4_hdmi);

	vc4_hdmi_connector_destroy(&vc4_hdmi->connector);

	drm_encoder_cleanup(&vc4_hdmi->encoder.base.base);

	drm_encoder_cleanup(&vc4_hdmi->encoder.base);



	pm_runtime_disable(dev);

drivers/gpu/drm/vc4/vc4_hdmi.h

+2 −14
Original line number Diff line number Diff line
@@ -8,17 +8,6 @@ 


#include "vc4_drv.h"



/* VC4 HDMI encoder KMS struct */

struct vc4_hdmi_encoder {

	struct vc4_encoder base;

};



static inline struct vc4_hdmi_encoder *

to_vc4_hdmi_encoder(struct drm_encoder *encoder)

{

	return container_of(encoder, struct vc4_hdmi_encoder, base.base);

}



struct vc4_hdmi;

struct vc4_hdmi_register;

struct vc4_hdmi_connector_state;
@@ -134,7 +123,7 @@ struct vc4_hdmi { 
	struct platform_device *pdev;

	const struct vc4_hdmi_variant *variant;



	struct vc4_hdmi_encoder encoder;

	struct vc4_encoder encoder;

	struct drm_connector connector;



	struct delayed_work scrambling_work;
@@ -249,8 +238,7 @@ connector_to_vc4_hdmi(struct drm_connector *connector) 
static inline struct vc4_hdmi *

encoder_to_vc4_hdmi(struct drm_encoder *encoder)

{

	struct vc4_hdmi_encoder *_encoder = to_vc4_hdmi_encoder(encoder);



	struct vc4_encoder *_encoder = to_vc4_encoder(encoder);

	return container_of(_encoder, struct vc4_hdmi, encoder);

}