drm/vc4: hdmi: rework connectors and encoders
the vc4_hdmi driver has some custom structures to hold the data it needs to associate with the drm_encoder and drm_connector structures. However, it allocates them separately from the vc4_hdmi structure which makes it more complicated than it needs to be. Move those structures to be contained by vc4_hdmi and update the code accordingly. 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: Dave Stevenson <dave.stevenson@raspberrypi.com> Link: https://patchwork.freedesktop.org/patch/msgid/93b418d63c876355af2b3d3afebe31a256268623.1599120059.git-series.maxime@cerno.tech
This commit is contained in:
@@ -8,51 +8,6 @@
|
||||
|
||||
#include "vc4_drv.h"
|
||||
|
||||
/* HDMI audio information */
|
||||
struct vc4_hdmi_audio {
|
||||
struct snd_soc_card card;
|
||||
struct snd_soc_dai_link link;
|
||||
struct snd_soc_dai_link_component cpu;
|
||||
struct snd_soc_dai_link_component codec;
|
||||
struct snd_soc_dai_link_component platform;
|
||||
int samplerate;
|
||||
int channels;
|
||||
struct snd_dmaengine_dai_dma_data dma_data;
|
||||
struct snd_pcm_substream *substream;
|
||||
};
|
||||
|
||||
/* General HDMI hardware state. */
|
||||
struct vc4_hdmi {
|
||||
struct platform_device *pdev;
|
||||
|
||||
struct drm_encoder *encoder;
|
||||
struct drm_connector *connector;
|
||||
|
||||
struct vc4_hdmi_audio audio;
|
||||
|
||||
struct i2c_adapter *ddc;
|
||||
void __iomem *hdmicore_regs;
|
||||
void __iomem *hd_regs;
|
||||
int hpd_gpio;
|
||||
bool hpd_active_low;
|
||||
|
||||
struct cec_adapter *cec_adap;
|
||||
struct cec_msg cec_rx_msg;
|
||||
bool cec_tx_ok;
|
||||
bool cec_irq_was_rx;
|
||||
|
||||
struct clk *pixel_clock;
|
||||
struct clk *hsm_clock;
|
||||
|
||||
struct debugfs_regset32 hdmi_regset;
|
||||
struct debugfs_regset32 hd_regset;
|
||||
};
|
||||
|
||||
#define HDMI_READ(offset) readl(vc4->hdmi->hdmicore_regs + offset)
|
||||
#define HDMI_WRITE(offset, val) writel(val, vc4->hdmi->hdmicore_regs + offset)
|
||||
#define HD_READ(offset) readl(vc4->hdmi->hd_regs + offset)
|
||||
#define HD_WRITE(offset, val) writel(val, vc4->hdmi->hd_regs + offset)
|
||||
|
||||
/* VC4 HDMI encoder KMS struct */
|
||||
struct vc4_hdmi_encoder {
|
||||
struct vc4_encoder base;
|
||||
@@ -83,4 +38,49 @@ 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;
|
||||
struct snd_soc_dai_link link;
|
||||
struct snd_soc_dai_link_component cpu;
|
||||
struct snd_soc_dai_link_component codec;
|
||||
struct snd_soc_dai_link_component platform;
|
||||
int samplerate;
|
||||
int channels;
|
||||
struct snd_dmaengine_dai_dma_data dma_data;
|
||||
struct snd_pcm_substream *substream;
|
||||
};
|
||||
|
||||
/* General HDMI hardware state. */
|
||||
struct vc4_hdmi {
|
||||
struct platform_device *pdev;
|
||||
|
||||
struct vc4_hdmi_encoder encoder;
|
||||
struct vc4_hdmi_connector connector;
|
||||
|
||||
struct vc4_hdmi_audio audio;
|
||||
|
||||
struct i2c_adapter *ddc;
|
||||
void __iomem *hdmicore_regs;
|
||||
void __iomem *hd_regs;
|
||||
int hpd_gpio;
|
||||
bool hpd_active_low;
|
||||
|
||||
struct cec_adapter *cec_adap;
|
||||
struct cec_msg cec_rx_msg;
|
||||
bool cec_tx_ok;
|
||||
bool cec_irq_was_rx;
|
||||
|
||||
struct clk *pixel_clock;
|
||||
struct clk *hsm_clock;
|
||||
|
||||
struct debugfs_regset32 hdmi_regset;
|
||||
struct debugfs_regset32 hd_regset;
|
||||
};
|
||||
|
||||
#define HDMI_READ(offset) readl(vc4->hdmi->hdmicore_regs + offset)
|
||||
#define HDMI_WRITE(offset, val) writel(val, vc4->hdmi->hdmicore_regs + offset)
|
||||
#define HD_READ(offset) readl(vc4->hdmi->hd_regs + offset)
|
||||
#define HD_WRITE(offset, val) writel(val, vc4->hdmi->hd_regs + offset)
|
||||
|
||||
#endif /* _VC4_HDMI_H_ */
|
||||
|
Reference in New Issue
Block a user