Patchwork [32/48] drm: omapdrm: hdmi5: Allocate the omap_hdmi data structure dynamically

login
register
mail settings
Submitter Laurent Pinchart
Date Oct. 13, 2017, 2:59 p.m.
Message ID <20171013145944.26557-33-laurent.pinchart@ideasonboard.com>
Download mbox | patch
Permalink /patch/10005025/
State New
Headers show

Comments

Laurent Pinchart - Oct. 13, 2017, 2:59 p.m.
The omap_hdmi private data structure is currently stored as a global
variable. While no platform with multiple HDMI5 encoders currently
exists nor is planned, this doesn't comply with the kernel device model
and should thus be fixed.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 drivers/gpu/drm/omapdrm/dss/hdmi5.c | 345 +++++++++++++++++++-----------------
 1 file changed, 184 insertions(+), 161 deletions(-)
Sebastian Reichel - Oct. 17, 2017, 6:52 p.m.
Hi,

On Fri, Oct 13, 2017 at 05:59:28PM +0300, Laurent Pinchart wrote:
> The omap_hdmi private data structure is currently stored as a global
> variable. While no platform with multiple HDMI5 encoders currently
> exists nor is planned, this doesn't comply with the kernel device model
> and should thus be fixed.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---

Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk>

-- Sebastian

>  drivers/gpu/drm/omapdrm/dss/hdmi5.c | 345 +++++++++++++++++++-----------------
>  1 file changed, 184 insertions(+), 161 deletions(-)
> 
> diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
> index c28fe184a7ad..ed8a2bd2a035 100644
> --- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
> +++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
> @@ -46,15 +46,13 @@
>  #include "hdmi5_core.h"
>  #include "dss.h"
>  
> -static struct omap_hdmi hdmi;
> -
> -static int hdmi_runtime_get(void)
> +static int hdmi_runtime_get(struct omap_hdmi *hdmi)
>  {
>  	int r;
>  
>  	DSSDBG("hdmi_runtime_get\n");
>  
> -	r = pm_runtime_get_sync(&hdmi.pdev->dev);
> +	r = pm_runtime_get_sync(&hdmi->pdev->dev);
>  	WARN_ON(r < 0);
>  	if (r < 0)
>  		return r;
> @@ -62,19 +60,20 @@ static int hdmi_runtime_get(void)
>  	return 0;
>  }
>  
> -static void hdmi_runtime_put(void)
> +static void hdmi_runtime_put(struct omap_hdmi *hdmi)
>  {
>  	int r;
>  
>  	DSSDBG("hdmi_runtime_put\n");
>  
> -	r = pm_runtime_put_sync(&hdmi.pdev->dev);
> +	r = pm_runtime_put_sync(&hdmi->pdev->dev);
>  	WARN_ON(r < 0 && r != -ENOSYS);
>  }
>  
>  static irqreturn_t hdmi_irq_handler(int irq, void *data)
>  {
> -	struct hdmi_wp_data *wp = data;
> +	struct omap_hdmi *hdmi = data;
> +	struct hdmi_wp_data *wp = &hdmi->wp;
>  	u32 irqstatus;
>  
>  	irqstatus = hdmi_wp_get_irqstatus(wp);
> @@ -97,17 +96,17 @@ static irqreturn_t hdmi_irq_handler(int irq, void *data)
>  		 * setting the PHY to LDOON. To ignore those, we force the RXDET
>  		 * line to 0 until the PHY power state has been changed.
>  		 */
> -		v = hdmi_read_reg(hdmi.phy.base, HDMI_TXPHY_PAD_CFG_CTRL);
> +		v = hdmi_read_reg(hdmi->phy.base, HDMI_TXPHY_PAD_CFG_CTRL);
>  		v = FLD_MOD(v, 1, 15, 15); /* FORCE_RXDET_HIGH */
>  		v = FLD_MOD(v, 0, 14, 7); /* RXDET_LINE */
> -		hdmi_write_reg(hdmi.phy.base, HDMI_TXPHY_PAD_CFG_CTRL, v);
> +		hdmi_write_reg(hdmi->phy.base, HDMI_TXPHY_PAD_CFG_CTRL, v);
>  
>  		hdmi_wp_set_irqstatus(wp, HDMI_IRQ_LINK_CONNECT |
>  				HDMI_IRQ_LINK_DISCONNECT);
>  
>  		hdmi_wp_set_phy_pwr(wp, HDMI_PHYPWRCMD_LDOON);
>  
> -		REG_FLD_MOD(hdmi.phy.base, HDMI_TXPHY_PAD_CFG_CTRL, 0, 15, 15);
> +		REG_FLD_MOD(hdmi->phy.base, HDMI_TXPHY_PAD_CFG_CTRL, 0, 15, 15);
>  
>  	} else if (irqstatus & HDMI_IRQ_LINK_CONNECT) {
>  		hdmi_wp_set_phy_pwr(wp, HDMI_PHYPWRCMD_TXON);
> @@ -118,70 +117,70 @@ static irqreturn_t hdmi_irq_handler(int irq, void *data)
>  	return IRQ_HANDLED;
>  }
>  
> -static int hdmi_init_regulator(void)
> +static int hdmi_init_regulator(struct omap_hdmi *hdmi)
>  {
>  	struct regulator *reg;
>  
> -	if (hdmi.vdda_reg != NULL)
> +	if (hdmi->vdda_reg != NULL)
>  		return 0;
>  
> -	reg = devm_regulator_get(&hdmi.pdev->dev, "vdda");
> +	reg = devm_regulator_get(&hdmi->pdev->dev, "vdda");
>  	if (IS_ERR(reg)) {
>  		DSSERR("can't get VDDA regulator\n");
>  		return PTR_ERR(reg);
>  	}
>  
> -	hdmi.vdda_reg = reg;
> +	hdmi->vdda_reg = reg;
>  
>  	return 0;
>  }
>  
> -static int hdmi_power_on_core(struct omap_dss_device *dssdev)
> +static int hdmi_power_on_core(struct omap_hdmi *hdmi)
>  {
>  	int r;
>  
> -	r = regulator_enable(hdmi.vdda_reg);
> +	r = regulator_enable(hdmi->vdda_reg);
>  	if (r)
>  		return r;
>  
> -	r = hdmi_runtime_get();
> +	r = hdmi_runtime_get(hdmi);
>  	if (r)
>  		goto err_runtime_get;
>  
>  	/* Make selection of HDMI in DSS */
> -	dss_select_hdmi_venc_clk_source(hdmi.dss, DSS_HDMI_M_PCLK);
> +	dss_select_hdmi_venc_clk_source(hdmi->dss, DSS_HDMI_M_PCLK);
>  
> -	hdmi.core_enabled = true;
> +	hdmi->core_enabled = true;
>  
>  	return 0;
>  
>  err_runtime_get:
> -	regulator_disable(hdmi.vdda_reg);
> +	regulator_disable(hdmi->vdda_reg);
>  
>  	return r;
>  }
>  
> -static void hdmi_power_off_core(struct omap_dss_device *dssdev)
> +static void hdmi_power_off_core(struct omap_hdmi *hdmi)
>  {
> -	hdmi.core_enabled = false;
> +	hdmi->core_enabled = false;
>  
> -	hdmi_runtime_put();
> -	regulator_disable(hdmi.vdda_reg);
> +	hdmi_runtime_put(hdmi);
> +	regulator_disable(hdmi->vdda_reg);
>  }
>  
> -static int hdmi_power_on_full(struct omap_dss_device *dssdev)
> +static int hdmi_power_on_full(struct omap_hdmi *hdmi)
>  {
>  	int r;
>  	struct videomode *vm;
> -	enum omap_channel channel = dssdev->dispc_channel;
> +	enum omap_channel channel = hdmi->output.dispc_channel;
>  	struct dss_pll_clock_info hdmi_cinfo = { 0 };
>  	unsigned int pc;
>  
> -	r = hdmi_power_on_core(dssdev);
> +	r = hdmi_power_on_core(hdmi);
>  	if (r)
>  		return r;
>  
> -	vm = &hdmi.cfg.vm;
> +	vm = &hdmi->cfg.vm;
>  
>  	DSSDBG("hdmi_power_on hactive= %d vactive = %d\n", vm->hactive,
>  	       vm->vactive);
> @@ -193,38 +192,38 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
>  	/* DSS_HDMI_TCLK is bitclk / 10 */
>  	pc *= 10;
>  
> -	dss_pll_calc_b(&hdmi.pll.pll, clk_get_rate(hdmi.pll.pll.clkin),
> +	dss_pll_calc_b(&hdmi->pll.pll, clk_get_rate(hdmi->pll.pll.clkin),
>  		pc, &hdmi_cinfo);
>  
>  	/* disable and clear irqs */
> -	hdmi_wp_clear_irqenable(&hdmi.wp, 0xffffffff);
> -	hdmi_wp_set_irqstatus(&hdmi.wp,
> -			hdmi_wp_get_irqstatus(&hdmi.wp));
> +	hdmi_wp_clear_irqenable(&hdmi->wp, 0xffffffff);
> +	hdmi_wp_set_irqstatus(&hdmi->wp,
> +			hdmi_wp_get_irqstatus(&hdmi->wp));
>  
> -	r = dss_pll_enable(&hdmi.pll.pll);
> +	r = dss_pll_enable(&hdmi->pll.pll);
>  	if (r) {
>  		DSSERR("Failed to enable PLL\n");
>  		goto err_pll_enable;
>  	}
>  
> -	r = dss_pll_set_config(&hdmi.pll.pll, &hdmi_cinfo);
> +	r = dss_pll_set_config(&hdmi->pll.pll, &hdmi_cinfo);
>  	if (r) {
>  		DSSERR("Failed to configure PLL\n");
>  		goto err_pll_cfg;
>  	}
>  
> -	r = hdmi_phy_configure(&hdmi.phy, hdmi_cinfo.clkdco,
> +	r = hdmi_phy_configure(&hdmi->phy, hdmi_cinfo.clkdco,
>  		hdmi_cinfo.clkout[0]);
>  	if (r) {
>  		DSSDBG("Failed to start PHY\n");
>  		goto err_phy_cfg;
>  	}
>  
> -	r = hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_LDOON);
> +	r = hdmi_wp_set_phy_pwr(&hdmi->wp, HDMI_PHYPWRCMD_LDOON);
>  	if (r)
>  		goto err_phy_pwr;
>  
> -	hdmi5_configure(&hdmi.core, &hdmi.wp, &hdmi.cfg);
> +	hdmi5_configure(&hdmi->core, &hdmi->wp, &hdmi->cfg);
>  
>  	/* tv size */
>  	dss_mgr_set_timings(channel, vm);
> @@ -233,11 +232,11 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
>  	if (r)
>  		goto err_mgr_enable;
>  
> -	r = hdmi_wp_video_start(&hdmi.wp);
> +	r = hdmi_wp_video_start(&hdmi->wp);
>  	if (r)
>  		goto err_vid_enable;
>  
> -	hdmi_wp_set_irqenable(&hdmi.wp,
> +	hdmi_wp_set_irqenable(&hdmi->wp,
>  			HDMI_IRQ_LINK_CONNECT | HDMI_IRQ_LINK_DISCONNECT);
>  
>  	return 0;
> @@ -245,31 +244,31 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
>  err_vid_enable:
>  	dss_mgr_disable(channel);
>  err_mgr_enable:
> -	hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);
> +	hdmi_wp_set_phy_pwr(&hdmi->wp, HDMI_PHYPWRCMD_OFF);
>  err_phy_pwr:
>  err_phy_cfg:
>  err_pll_cfg:
> -	dss_pll_disable(&hdmi.pll.pll);
> +	dss_pll_disable(&hdmi->pll.pll);
>  err_pll_enable:
> -	hdmi_power_off_core(dssdev);
> +	hdmi_power_off_core(hdmi);
>  	return -EIO;
>  }
>  
> -static void hdmi_power_off_full(struct omap_dss_device *dssdev)
> +static void hdmi_power_off_full(struct omap_hdmi *hdmi)
>  {
> -	enum omap_channel channel = dssdev->dispc_channel;
> +	enum omap_channel channel = hdmi->output.dispc_channel;
>  
> -	hdmi_wp_clear_irqenable(&hdmi.wp, 0xffffffff);
> +	hdmi_wp_clear_irqenable(&hdmi->wp, 0xffffffff);
>  
> -	hdmi_wp_video_stop(&hdmi.wp);
> +	hdmi_wp_video_stop(&hdmi->wp);
>  
>  	dss_mgr_disable(channel);
>  
> -	hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);
> +	hdmi_wp_set_phy_pwr(&hdmi->wp, HDMI_PHYPWRCMD_OFF);
>  
> -	dss_pll_disable(&hdmi.pll.pll);
> +	dss_pll_disable(&hdmi->pll.pll);
>  
> -	hdmi_power_off_core(dssdev);
> +	hdmi_power_off_core(hdmi);
>  }
>  
>  static int hdmi_display_check_timing(struct omap_dss_device *dssdev,
> @@ -284,67 +283,73 @@ static int hdmi_display_check_timing(struct omap_dss_device *dssdev,
>  static void hdmi_display_set_timing(struct omap_dss_device *dssdev,
>  				    struct videomode *vm)
>  {
> -	mutex_lock(&hdmi.lock);
> +	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
>  
> -	hdmi.cfg.vm = *vm;
> +	mutex_lock(&hdmi->lock);
> +
> +	hdmi->cfg.vm = *vm;
>  
>  	dispc_set_tv_pclk(vm->pixelclock);
>  
> -	mutex_unlock(&hdmi.lock);
> +	mutex_unlock(&hdmi->lock);
>  }
>  
>  static void hdmi_display_get_timings(struct omap_dss_device *dssdev,
>  				     struct videomode *vm)
>  {
> -	*vm = hdmi.cfg.vm;
> +	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
> +
> +	*vm = hdmi->cfg.vm;
>  }
>  
>  static int hdmi_dump_regs(struct seq_file *s, void *p)
>  {
> -	mutex_lock(&hdmi.lock);
> +	struct omap_hdmi *hdmi = s->private;
>  
> -	if (hdmi_runtime_get()) {
> -		mutex_unlock(&hdmi.lock);
> +	mutex_lock(&hdmi->lock);
> +
> +	if (hdmi_runtime_get(hdmi)) {
> +		mutex_unlock(&hdmi->lock);
>  		return 0;
>  	}
>  
> -	hdmi_wp_dump(&hdmi.wp, s);
> -	hdmi_pll_dump(&hdmi.pll, s);
> -	hdmi_phy_dump(&hdmi.phy, s);
> -	hdmi5_core_dump(&hdmi.core, s);
> +	hdmi_wp_dump(&hdmi->wp, s);
> +	hdmi_pll_dump(&hdmi->pll, s);
> +	hdmi_phy_dump(&hdmi->phy, s);
> +	hdmi5_core_dump(&hdmi->core, s);
>  
> -	hdmi_runtime_put();
> -	mutex_unlock(&hdmi.lock);
> +	hdmi_runtime_put(hdmi);
> +	mutex_unlock(&hdmi->lock);
>  	return 0;
>  }
>  
> -static int read_edid(u8 *buf, int len)
> +static int read_edid(struct omap_hdmi *hdmi, u8 *buf, int len)
>  {
>  	int r;
>  	int idlemode;
>  
> -	mutex_lock(&hdmi.lock);
> +	mutex_lock(&hdmi->lock);
>  
> -	r = hdmi_runtime_get();
> +	r = hdmi_runtime_get(hdmi);
>  	BUG_ON(r);
>  
> -	idlemode = REG_GET(hdmi.wp.base, HDMI_WP_SYSCONFIG, 3, 2);
> +	idlemode = REG_GET(hdmi->wp.base, HDMI_WP_SYSCONFIG, 3, 2);
>  	/* No-idle mode */
> -	REG_FLD_MOD(hdmi.wp.base, HDMI_WP_SYSCONFIG, 1, 3, 2);
> +	REG_FLD_MOD(hdmi->wp.base, HDMI_WP_SYSCONFIG, 1, 3, 2);
>  
> -	r = hdmi5_read_edid(&hdmi.core,  buf, len);
> +	r = hdmi5_read_edid(&hdmi->core,  buf, len);
>  
> -	REG_FLD_MOD(hdmi.wp.base, HDMI_WP_SYSCONFIG, idlemode, 3, 2);
> +	REG_FLD_MOD(hdmi->wp.base, HDMI_WP_SYSCONFIG, idlemode, 3, 2);
>  
> -	hdmi_runtime_put();
> -	mutex_unlock(&hdmi.lock);
> +	hdmi_runtime_put(hdmi);
> +	mutex_unlock(&hdmi->lock);
>  
>  	return r;
>  }
>  
>  static void hdmi_start_audio_stream(struct omap_hdmi *hd)
>  {
> -	REG_FLD_MOD(hdmi.wp.base, HDMI_WP_SYSCONFIG, 1, 3, 2);
> +	REG_FLD_MOD(hd->wp.base, HDMI_WP_SYSCONFIG, 1, 3, 2);
>  	hdmi_wp_audio_enable(&hd->wp, true);
>  	hdmi_wp_audio_core_req_enable(&hd->wp, true);
>  }
> @@ -358,108 +363,110 @@ static void hdmi_stop_audio_stream(struct omap_hdmi *hd)
>  
>  static int hdmi_display_enable(struct omap_dss_device *dssdev)
>  {
> -	struct omap_dss_device *out = &hdmi.output;
> +	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
>  	unsigned long flags;
>  	int r = 0;
>  
>  	DSSDBG("ENTER hdmi_display_enable\n");
>  
> -	mutex_lock(&hdmi.lock);
> +	mutex_lock(&hdmi->lock);
>  
> -	if (!out->dispc_channel_connected) {
> +	if (!dssdev->dispc_channel_connected) {
>  		DSSERR("failed to enable display: no output/manager\n");
>  		r = -ENODEV;
>  		goto err0;
>  	}
>  
> -	r = hdmi_power_on_full(dssdev);
> +	r = hdmi_power_on_full(hdmi);
>  	if (r) {
>  		DSSERR("failed to power on device\n");
>  		goto err0;
>  	}
>  
> -	if (hdmi.audio_configured) {
> -		r = hdmi5_audio_config(&hdmi.core, &hdmi.wp, &hdmi.audio_config,
> -				       hdmi.cfg.vm.pixelclock);
> +	if (hdmi->audio_configured) {
> +		r = hdmi5_audio_config(&hdmi->core, &hdmi->wp, &hdmi->audio_config,
> +				       hdmi->cfg.vm.pixelclock);
>  		if (r) {
>  			DSSERR("Error restoring audio configuration: %d", r);
> -			hdmi.audio_abort_cb(&hdmi.pdev->dev);
> -			hdmi.audio_configured = false;
> +			hdmi->audio_abort_cb(&hdmi->pdev->dev);
> +			hdmi->audio_configured = false;
>  		}
>  	}
>  
> -	spin_lock_irqsave(&hdmi.audio_playing_lock, flags);
> -	if (hdmi.audio_configured && hdmi.audio_playing)
> -		hdmi_start_audio_stream(&hdmi);
> -	hdmi.display_enabled = true;
> -	spin_unlock_irqrestore(&hdmi.audio_playing_lock, flags);
> +	spin_lock_irqsave(&hdmi->audio_playing_lock, flags);
> +	if (hdmi->audio_configured && hdmi->audio_playing)
> +		hdmi_start_audio_stream(hdmi);
> +	hdmi->display_enabled = true;
> +	spin_unlock_irqrestore(&hdmi->audio_playing_lock, flags);
>  
> -	mutex_unlock(&hdmi.lock);
> +	mutex_unlock(&hdmi->lock);
>  	return 0;
>  
>  err0:
> -	mutex_unlock(&hdmi.lock);
> +	mutex_unlock(&hdmi->lock);
>  	return r;
>  }
>  
>  static void hdmi_display_disable(struct omap_dss_device *dssdev)
>  {
> +	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
>  	unsigned long flags;
>  
>  	DSSDBG("Enter hdmi_display_disable\n");
>  
> -	mutex_lock(&hdmi.lock);
> +	mutex_lock(&hdmi->lock);
>  
> -	spin_lock_irqsave(&hdmi.audio_playing_lock, flags);
> -	hdmi_stop_audio_stream(&hdmi);
> -	hdmi.display_enabled = false;
> -	spin_unlock_irqrestore(&hdmi.audio_playing_lock, flags);
> +	spin_lock_irqsave(&hdmi->audio_playing_lock, flags);
> +	hdmi_stop_audio_stream(hdmi);
> +	hdmi->display_enabled = false;
> +	spin_unlock_irqrestore(&hdmi->audio_playing_lock, flags);
>  
> -	hdmi_power_off_full(dssdev);
> +	hdmi_power_off_full(hdmi);
>  
> -	mutex_unlock(&hdmi.lock);
> +	mutex_unlock(&hdmi->lock);
>  }
>  
> -static int hdmi_core_enable(struct omap_dss_device *dssdev)
> +static int hdmi_core_enable(struct omap_hdmi *hdmi)
>  {
>  	int r = 0;
>  
>  	DSSDBG("ENTER omapdss_hdmi_core_enable\n");
>  
> -	mutex_lock(&hdmi.lock);
> +	mutex_lock(&hdmi->lock);
>  
> -	r = hdmi_power_on_core(dssdev);
> +	r = hdmi_power_on_core(hdmi);
>  	if (r) {
>  		DSSERR("failed to power on device\n");
>  		goto err0;
>  	}
>  
> -	mutex_unlock(&hdmi.lock);
> +	mutex_unlock(&hdmi->lock);
>  	return 0;
>  
>  err0:
> -	mutex_unlock(&hdmi.lock);
> +	mutex_unlock(&hdmi->lock);
>  	return r;
>  }
>  
> -static void hdmi_core_disable(struct omap_dss_device *dssdev)
> +static void hdmi_core_disable(struct omap_hdmi *hdmi)
>  {
>  	DSSDBG("Enter omapdss_hdmi_core_disable\n");
>  
> -	mutex_lock(&hdmi.lock);
> +	mutex_lock(&hdmi->lock);
>  
> -	hdmi_power_off_core(dssdev);
> +	hdmi_power_off_core(hdmi);
>  
> -	mutex_unlock(&hdmi.lock);
> +	mutex_unlock(&hdmi->lock);
>  }
>  
>  static int hdmi_connect(struct omap_dss_device *dssdev,
>  		struct omap_dss_device *dst)
>  {
> +	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
>  	enum omap_channel channel = dssdev->dispc_channel;
>  	int r;
>  
> -	r = hdmi_init_regulator();
> +	r = hdmi_init_regulator(hdmi);
>  	if (r)
>  		return r;
>  
> @@ -496,21 +503,22 @@ static void hdmi_disconnect(struct omap_dss_device *dssdev,
>  static int hdmi_read_edid(struct omap_dss_device *dssdev,
>  		u8 *edid, int len)
>  {
> +	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
>  	bool need_enable;
>  	int r;
>  
> -	need_enable = hdmi.core_enabled == false;
> +	need_enable = hdmi->core_enabled == false;
>  
>  	if (need_enable) {
> -		r = hdmi_core_enable(dssdev);
> +		r = hdmi_core_enable(hdmi);
>  		if (r)
>  			return r;
>  	}
>  
> -	r = read_edid(edid, len);
> +	r = read_edid(hdmi, edid, len);
>  
>  	if (need_enable)
> -		hdmi_core_disable(dssdev);
> +		hdmi_core_disable(hdmi);
>  
>  	return r;
>  }
> @@ -518,14 +526,18 @@ static int hdmi_read_edid(struct omap_dss_device *dssdev,
>  static int hdmi_set_infoframe(struct omap_dss_device *dssdev,
>  		const struct hdmi_avi_infoframe *avi)
>  {
> -	hdmi.cfg.infoframe = *avi;
> +	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
> +
> +	hdmi->cfg.infoframe = *avi;
>  	return 0;
>  }
>  
>  static int hdmi_set_hdmi_mode(struct omap_dss_device *dssdev,
>  		bool hdmi_mode)
>  {
> -	hdmi.cfg.hdmi_dvi_mode = hdmi_mode ? HDMI_HDMI : HDMI_DVI;
> +	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
> +
> +	hdmi->cfg.hdmi_dvi_mode = hdmi_mode ? HDMI_HDMI : HDMI_DVI;
>  	return 0;
>  }
>  
> @@ -545,14 +557,14 @@ static const struct omapdss_hdmi_ops hdmi_ops = {
>  	.set_hdmi_mode		= hdmi_set_hdmi_mode,
>  };
>  
> -static void hdmi_init_output(struct platform_device *pdev)
> +static void hdmi_init_output(struct omap_hdmi *hdmi)
>  {
> -	struct omap_dss_device *out = &hdmi.output;
> +	struct omap_dss_device *out = &hdmi->output;
>  
> -	out->dev = &pdev->dev;
> +	out->dev = &hdmi->pdev->dev;
>  	out->id = OMAP_DSS_OUTPUT_HDMI;
>  	out->output_type = OMAP_DISPLAY_TYPE_HDMI;
> -	out->name = "hdmi.0";
> +	out->name = "hdmi->0";
>  	out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;
>  	out->ops.hdmi = &hdmi_ops;
>  	out->owner = THIS_MODULE;
> @@ -560,15 +572,16 @@ static void hdmi_init_output(struct platform_device *pdev)
>  	omapdss_register_output(out);
>  }
>  
> -static void hdmi_uninit_output(struct platform_device *pdev)
> +static void hdmi_uninit_output(struct omap_hdmi *hdmi)
>  {
> -	struct omap_dss_device *out = &hdmi.output;
> +	struct omap_dss_device *out = &hdmi->output;
>  
>  	omapdss_unregister_output(out);
>  }
>  
> -static int hdmi_probe_of(struct platform_device *pdev)
> +static int hdmi_probe_of(struct omap_hdmi *hdmi)
>  {
> +	struct platform_device *pdev = hdmi->pdev;
>  	struct device_node *node = pdev->dev.of_node;
>  	struct device_node *ep;
>  	int r;
> @@ -577,7 +590,7 @@ static int hdmi_probe_of(struct platform_device *pdev)
>  	if (!ep)
>  		return 0;
>  
> -	r = hdmi_parse_lanes_of(pdev, ep, &hdmi.phy);
> +	r = hdmi_parse_lanes_of(pdev, ep, &hdmi->phy);
>  	if (r)
>  		goto err;
>  
> @@ -691,26 +704,26 @@ static const struct omap_hdmi_audio_ops hdmi_audio_ops = {
>  	.audio_config = hdmi_audio_config,
>  };
>  
> -static int hdmi_audio_register(struct device *dev)
> +static int hdmi_audio_register(struct omap_hdmi *hdmi)
>  {
>  	struct omap_hdmi_audio_pdata pdata = {
> -		.dev = dev,
> +		.dev = &hdmi->pdev->dev,
>  		.version = 5,
> -		.audio_dma_addr = hdmi_wp_get_audio_dma_addr(&hdmi.wp),
> +		.audio_dma_addr = hdmi_wp_get_audio_dma_addr(&hdmi->wp),
>  		.ops = &hdmi_audio_ops,
>  	};
>  
> -	hdmi.audio_pdev = platform_device_register_data(
> -		dev, "omap-hdmi-audio", PLATFORM_DEVID_AUTO,
> +	hdmi->audio_pdev = platform_device_register_data(
> +		&hdmi->pdev->dev, "omap-hdmi-audio", PLATFORM_DEVID_AUTO,
>  		&pdata, sizeof(pdata));
>  
> -	if (IS_ERR(hdmi.audio_pdev))
> -		return PTR_ERR(hdmi.audio_pdev);
> +	if (IS_ERR(hdmi->audio_pdev))
> +		return PTR_ERR(hdmi->audio_pdev);
>  
> -	hdmi_runtime_get();
> -	hdmi.wp_idlemode =
> -		REG_GET(hdmi.wp.base, HDMI_WP_SYSCONFIG, 3, 2);
> -	hdmi_runtime_put();
> +	hdmi_runtime_get(hdmi);
> +	hdmi->wp_idlemode =
> +		REG_GET(hdmi->wp.base, HDMI_WP_SYSCONFIG, 3, 2);
> +	hdmi_runtime_put(hdmi);
>  
>  	return 0;
>  }
> @@ -720,85 +733,95 @@ static int hdmi5_bind(struct device *dev, struct device *master, void *data)
>  {
>  	struct platform_device *pdev = to_platform_device(dev);
>  	struct dss_device *dss = dss_get_device(master);
> +	struct omap_hdmi *hdmi;
>  	int r;
>  	int irq;
>  
> -	hdmi.pdev = pdev;
> -	hdmi.dss = dss;
> -	dev_set_drvdata(&pdev->dev, &hdmi);
> +	hdmi = kzalloc(sizeof(*hdmi), GFP_KERNEL);
> +	if (!hdmi)
> +		return -ENOMEM;
>  
> -	mutex_init(&hdmi.lock);
> -	spin_lock_init(&hdmi.audio_playing_lock);
> +	hdmi->pdev = pdev;
> +	hdmi->dss = dss;
> +	dev_set_drvdata(&pdev->dev, hdmi);
>  
> -	r = hdmi_probe_of(pdev);
> +	mutex_init(&hdmi->lock);
> +	spin_lock_init(&hdmi->audio_playing_lock);
> +
> +	r = hdmi_probe_of(hdmi);
>  	if (r)
> -		return r;
> +		goto err_free;
>  
> -	r = hdmi_wp_init(pdev, &hdmi.wp, 5);
> +	r = hdmi_wp_init(pdev, &hdmi->wp, 5);
>  	if (r)
> -		return r;
> +		goto err_free;
>  
> -	r = hdmi_pll_init(dss, pdev, &hdmi.pll, &hdmi.wp);
> +	r = hdmi_pll_init(dss, pdev, &hdmi->pll, &hdmi->wp);
>  	if (r)
> -		return r;
> +		goto err_free;
>  
> -	r = hdmi_phy_init(pdev, &hdmi.phy, 5);
> +	r = hdmi_phy_init(pdev, &hdmi->phy, 5);
>  	if (r)
> -		goto err;
> +		goto err_pll;
>  
> -	r = hdmi5_core_init(pdev, &hdmi.core);
> +	r = hdmi5_core_init(pdev, &hdmi->core);
>  	if (r)
> -		goto err;
> +		goto err_pll;
>  
>  	irq = platform_get_irq(pdev, 0);
>  	if (irq < 0) {
>  		DSSERR("platform_get_irq failed\n");
>  		r = -ENODEV;
> -		goto err;
> +		goto err_pll;
>  	}
>  
>  	r = devm_request_threaded_irq(&pdev->dev, irq,
>  			NULL, hdmi_irq_handler,
> -			IRQF_ONESHOT, "OMAP HDMI", &hdmi.wp);
> +			IRQF_ONESHOT, "OMAP HDMI", hdmi);
>  	if (r) {
>  		DSSERR("HDMI IRQ request failed\n");
> -		goto err;
> +		goto err_pll;
>  	}
>  
>  	pm_runtime_enable(&pdev->dev);
>  
> -	hdmi_init_output(pdev);
> +	hdmi_init_output(hdmi);
>  
> -	r = hdmi_audio_register(&pdev->dev);
> +	r = hdmi_audio_register(hdmi);
>  	if (r) {
>  		DSSERR("Registering HDMI audio failed %d\n", r);
> -		hdmi_uninit_output(pdev);
> +		hdmi_uninit_output(hdmi);
>  		pm_runtime_disable(&pdev->dev);
>  		return r;
>  	}
>  
> -	hdmi.debugfs = dss_debugfs_create_file("hdmi", hdmi_dump_regs, &hdmi);
> +	hdmi->debugfs = dss_debugfs_create_file("hdmi", hdmi_dump_regs, hdmi);
>  
>  	return 0;
> -err:
> -	hdmi_pll_uninit(&hdmi.pll);
> +
> +err_pll:
> +	hdmi_pll_uninit(&hdmi->pll);
> +err_free:
> +	kfree(hdmi);
>  	return r;
>  }
>  
>  static void hdmi5_unbind(struct device *dev, struct device *master, void *data)
>  {
> -	struct platform_device *pdev = to_platform_device(dev);
> +	struct omap_hdmi *hdmi = dev_get_drvdata(dev);
> +
> +	dss_debugfs_remove_file(hdmi->debugfs);
>  
> -	dss_debugfs_remove_file(hdmi.debugfs);
> +	if (hdmi->audio_pdev)
> +		platform_device_unregister(hdmi->audio_pdev);
>  
> -	if (hdmi.audio_pdev)
> -		platform_device_unregister(hdmi.audio_pdev);
> +	hdmi_uninit_output(hdmi);
>  
> -	hdmi_uninit_output(pdev);
> +	hdmi_pll_uninit(&hdmi->pll);
>  
> -	hdmi_pll_uninit(&hdmi.pll);
> +	pm_runtime_disable(dev);
>  
> -	pm_runtime_disable(&pdev->dev);
> +	kfree(hdmi);
>  }
>  
>  static const struct component_ops hdmi5_component_ops = {
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

Patch

diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi5.c b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
index c28fe184a7ad..ed8a2bd2a035 100644
--- a/drivers/gpu/drm/omapdrm/dss/hdmi5.c
+++ b/drivers/gpu/drm/omapdrm/dss/hdmi5.c
@@ -46,15 +46,13 @@ 
 #include "hdmi5_core.h"
 #include "dss.h"
 
-static struct omap_hdmi hdmi;
-
-static int hdmi_runtime_get(void)
+static int hdmi_runtime_get(struct omap_hdmi *hdmi)
 {
 	int r;
 
 	DSSDBG("hdmi_runtime_get\n");
 
-	r = pm_runtime_get_sync(&hdmi.pdev->dev);
+	r = pm_runtime_get_sync(&hdmi->pdev->dev);
 	WARN_ON(r < 0);
 	if (r < 0)
 		return r;
@@ -62,19 +60,20 @@  static int hdmi_runtime_get(void)
 	return 0;
 }
 
-static void hdmi_runtime_put(void)
+static void hdmi_runtime_put(struct omap_hdmi *hdmi)
 {
 	int r;
 
 	DSSDBG("hdmi_runtime_put\n");
 
-	r = pm_runtime_put_sync(&hdmi.pdev->dev);
+	r = pm_runtime_put_sync(&hdmi->pdev->dev);
 	WARN_ON(r < 0 && r != -ENOSYS);
 }
 
 static irqreturn_t hdmi_irq_handler(int irq, void *data)
 {
-	struct hdmi_wp_data *wp = data;
+	struct omap_hdmi *hdmi = data;
+	struct hdmi_wp_data *wp = &hdmi->wp;
 	u32 irqstatus;
 
 	irqstatus = hdmi_wp_get_irqstatus(wp);
@@ -97,17 +96,17 @@  static irqreturn_t hdmi_irq_handler(int irq, void *data)
 		 * setting the PHY to LDOON. To ignore those, we force the RXDET
 		 * line to 0 until the PHY power state has been changed.
 		 */
-		v = hdmi_read_reg(hdmi.phy.base, HDMI_TXPHY_PAD_CFG_CTRL);
+		v = hdmi_read_reg(hdmi->phy.base, HDMI_TXPHY_PAD_CFG_CTRL);
 		v = FLD_MOD(v, 1, 15, 15); /* FORCE_RXDET_HIGH */
 		v = FLD_MOD(v, 0, 14, 7); /* RXDET_LINE */
-		hdmi_write_reg(hdmi.phy.base, HDMI_TXPHY_PAD_CFG_CTRL, v);
+		hdmi_write_reg(hdmi->phy.base, HDMI_TXPHY_PAD_CFG_CTRL, v);
 
 		hdmi_wp_set_irqstatus(wp, HDMI_IRQ_LINK_CONNECT |
 				HDMI_IRQ_LINK_DISCONNECT);
 
 		hdmi_wp_set_phy_pwr(wp, HDMI_PHYPWRCMD_LDOON);
 
-		REG_FLD_MOD(hdmi.phy.base, HDMI_TXPHY_PAD_CFG_CTRL, 0, 15, 15);
+		REG_FLD_MOD(hdmi->phy.base, HDMI_TXPHY_PAD_CFG_CTRL, 0, 15, 15);
 
 	} else if (irqstatus & HDMI_IRQ_LINK_CONNECT) {
 		hdmi_wp_set_phy_pwr(wp, HDMI_PHYPWRCMD_TXON);
@@ -118,70 +117,70 @@  static irqreturn_t hdmi_irq_handler(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
-static int hdmi_init_regulator(void)
+static int hdmi_init_regulator(struct omap_hdmi *hdmi)
 {
 	struct regulator *reg;
 
-	if (hdmi.vdda_reg != NULL)
+	if (hdmi->vdda_reg != NULL)
 		return 0;
 
-	reg = devm_regulator_get(&hdmi.pdev->dev, "vdda");
+	reg = devm_regulator_get(&hdmi->pdev->dev, "vdda");
 	if (IS_ERR(reg)) {
 		DSSERR("can't get VDDA regulator\n");
 		return PTR_ERR(reg);
 	}
 
-	hdmi.vdda_reg = reg;
+	hdmi->vdda_reg = reg;
 
 	return 0;
 }
 
-static int hdmi_power_on_core(struct omap_dss_device *dssdev)
+static int hdmi_power_on_core(struct omap_hdmi *hdmi)
 {
 	int r;
 
-	r = regulator_enable(hdmi.vdda_reg);
+	r = regulator_enable(hdmi->vdda_reg);
 	if (r)
 		return r;
 
-	r = hdmi_runtime_get();
+	r = hdmi_runtime_get(hdmi);
 	if (r)
 		goto err_runtime_get;
 
 	/* Make selection of HDMI in DSS */
-	dss_select_hdmi_venc_clk_source(hdmi.dss, DSS_HDMI_M_PCLK);
+	dss_select_hdmi_venc_clk_source(hdmi->dss, DSS_HDMI_M_PCLK);
 
-	hdmi.core_enabled = true;
+	hdmi->core_enabled = true;
 
 	return 0;
 
 err_runtime_get:
-	regulator_disable(hdmi.vdda_reg);
+	regulator_disable(hdmi->vdda_reg);
 
 	return r;
 }
 
-static void hdmi_power_off_core(struct omap_dss_device *dssdev)
+static void hdmi_power_off_core(struct omap_hdmi *hdmi)
 {
-	hdmi.core_enabled = false;
+	hdmi->core_enabled = false;
 
-	hdmi_runtime_put();
-	regulator_disable(hdmi.vdda_reg);
+	hdmi_runtime_put(hdmi);
+	regulator_disable(hdmi->vdda_reg);
 }
 
-static int hdmi_power_on_full(struct omap_dss_device *dssdev)
+static int hdmi_power_on_full(struct omap_hdmi *hdmi)
 {
 	int r;
 	struct videomode *vm;
-	enum omap_channel channel = dssdev->dispc_channel;
+	enum omap_channel channel = hdmi->output.dispc_channel;
 	struct dss_pll_clock_info hdmi_cinfo = { 0 };
 	unsigned int pc;
 
-	r = hdmi_power_on_core(dssdev);
+	r = hdmi_power_on_core(hdmi);
 	if (r)
 		return r;
 
-	vm = &hdmi.cfg.vm;
+	vm = &hdmi->cfg.vm;
 
 	DSSDBG("hdmi_power_on hactive= %d vactive = %d\n", vm->hactive,
 	       vm->vactive);
@@ -193,38 +192,38 @@  static int hdmi_power_on_full(struct omap_dss_device *dssdev)
 	/* DSS_HDMI_TCLK is bitclk / 10 */
 	pc *= 10;
 
-	dss_pll_calc_b(&hdmi.pll.pll, clk_get_rate(hdmi.pll.pll.clkin),
+	dss_pll_calc_b(&hdmi->pll.pll, clk_get_rate(hdmi->pll.pll.clkin),
 		pc, &hdmi_cinfo);
 
 	/* disable and clear irqs */
-	hdmi_wp_clear_irqenable(&hdmi.wp, 0xffffffff);
-	hdmi_wp_set_irqstatus(&hdmi.wp,
-			hdmi_wp_get_irqstatus(&hdmi.wp));
+	hdmi_wp_clear_irqenable(&hdmi->wp, 0xffffffff);
+	hdmi_wp_set_irqstatus(&hdmi->wp,
+			hdmi_wp_get_irqstatus(&hdmi->wp));
 
-	r = dss_pll_enable(&hdmi.pll.pll);
+	r = dss_pll_enable(&hdmi->pll.pll);
 	if (r) {
 		DSSERR("Failed to enable PLL\n");
 		goto err_pll_enable;
 	}
 
-	r = dss_pll_set_config(&hdmi.pll.pll, &hdmi_cinfo);
+	r = dss_pll_set_config(&hdmi->pll.pll, &hdmi_cinfo);
 	if (r) {
 		DSSERR("Failed to configure PLL\n");
 		goto err_pll_cfg;
 	}
 
-	r = hdmi_phy_configure(&hdmi.phy, hdmi_cinfo.clkdco,
+	r = hdmi_phy_configure(&hdmi->phy, hdmi_cinfo.clkdco,
 		hdmi_cinfo.clkout[0]);
 	if (r) {
 		DSSDBG("Failed to start PHY\n");
 		goto err_phy_cfg;
 	}
 
-	r = hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_LDOON);
+	r = hdmi_wp_set_phy_pwr(&hdmi->wp, HDMI_PHYPWRCMD_LDOON);
 	if (r)
 		goto err_phy_pwr;
 
-	hdmi5_configure(&hdmi.core, &hdmi.wp, &hdmi.cfg);
+	hdmi5_configure(&hdmi->core, &hdmi->wp, &hdmi->cfg);
 
 	/* tv size */
 	dss_mgr_set_timings(channel, vm);
@@ -233,11 +232,11 @@  static int hdmi_power_on_full(struct omap_dss_device *dssdev)
 	if (r)
 		goto err_mgr_enable;
 
-	r = hdmi_wp_video_start(&hdmi.wp);
+	r = hdmi_wp_video_start(&hdmi->wp);
 	if (r)
 		goto err_vid_enable;
 
-	hdmi_wp_set_irqenable(&hdmi.wp,
+	hdmi_wp_set_irqenable(&hdmi->wp,
 			HDMI_IRQ_LINK_CONNECT | HDMI_IRQ_LINK_DISCONNECT);
 
 	return 0;
@@ -245,31 +244,31 @@  static int hdmi_power_on_full(struct omap_dss_device *dssdev)
 err_vid_enable:
 	dss_mgr_disable(channel);
 err_mgr_enable:
-	hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);
+	hdmi_wp_set_phy_pwr(&hdmi->wp, HDMI_PHYPWRCMD_OFF);
 err_phy_pwr:
 err_phy_cfg:
 err_pll_cfg:
-	dss_pll_disable(&hdmi.pll.pll);
+	dss_pll_disable(&hdmi->pll.pll);
 err_pll_enable:
-	hdmi_power_off_core(dssdev);
+	hdmi_power_off_core(hdmi);
 	return -EIO;
 }
 
-static void hdmi_power_off_full(struct omap_dss_device *dssdev)
+static void hdmi_power_off_full(struct omap_hdmi *hdmi)
 {
-	enum omap_channel channel = dssdev->dispc_channel;
+	enum omap_channel channel = hdmi->output.dispc_channel;
 
-	hdmi_wp_clear_irqenable(&hdmi.wp, 0xffffffff);
+	hdmi_wp_clear_irqenable(&hdmi->wp, 0xffffffff);
 
-	hdmi_wp_video_stop(&hdmi.wp);
+	hdmi_wp_video_stop(&hdmi->wp);
 
 	dss_mgr_disable(channel);
 
-	hdmi_wp_set_phy_pwr(&hdmi.wp, HDMI_PHYPWRCMD_OFF);
+	hdmi_wp_set_phy_pwr(&hdmi->wp, HDMI_PHYPWRCMD_OFF);
 
-	dss_pll_disable(&hdmi.pll.pll);
+	dss_pll_disable(&hdmi->pll.pll);
 
-	hdmi_power_off_core(dssdev);
+	hdmi_power_off_core(hdmi);
 }
 
 static int hdmi_display_check_timing(struct omap_dss_device *dssdev,
@@ -284,67 +283,73 @@  static int hdmi_display_check_timing(struct omap_dss_device *dssdev,
 static void hdmi_display_set_timing(struct omap_dss_device *dssdev,
 				    struct videomode *vm)
 {
-	mutex_lock(&hdmi.lock);
+	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
 
-	hdmi.cfg.vm = *vm;
+	mutex_lock(&hdmi->lock);
+
+	hdmi->cfg.vm = *vm;
 
 	dispc_set_tv_pclk(vm->pixelclock);
 
-	mutex_unlock(&hdmi.lock);
+	mutex_unlock(&hdmi->lock);
 }
 
 static void hdmi_display_get_timings(struct omap_dss_device *dssdev,
 				     struct videomode *vm)
 {
-	*vm = hdmi.cfg.vm;
+	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
+
+	*vm = hdmi->cfg.vm;
 }
 
 static int hdmi_dump_regs(struct seq_file *s, void *p)
 {
-	mutex_lock(&hdmi.lock);
+	struct omap_hdmi *hdmi = s->private;
 
-	if (hdmi_runtime_get()) {
-		mutex_unlock(&hdmi.lock);
+	mutex_lock(&hdmi->lock);
+
+	if (hdmi_runtime_get(hdmi)) {
+		mutex_unlock(&hdmi->lock);
 		return 0;
 	}
 
-	hdmi_wp_dump(&hdmi.wp, s);
-	hdmi_pll_dump(&hdmi.pll, s);
-	hdmi_phy_dump(&hdmi.phy, s);
-	hdmi5_core_dump(&hdmi.core, s);
+	hdmi_wp_dump(&hdmi->wp, s);
+	hdmi_pll_dump(&hdmi->pll, s);
+	hdmi_phy_dump(&hdmi->phy, s);
+	hdmi5_core_dump(&hdmi->core, s);
 
-	hdmi_runtime_put();
-	mutex_unlock(&hdmi.lock);
+	hdmi_runtime_put(hdmi);
+	mutex_unlock(&hdmi->lock);
 	return 0;
 }
 
-static int read_edid(u8 *buf, int len)
+static int read_edid(struct omap_hdmi *hdmi, u8 *buf, int len)
 {
 	int r;
 	int idlemode;
 
-	mutex_lock(&hdmi.lock);
+	mutex_lock(&hdmi->lock);
 
-	r = hdmi_runtime_get();
+	r = hdmi_runtime_get(hdmi);
 	BUG_ON(r);
 
-	idlemode = REG_GET(hdmi.wp.base, HDMI_WP_SYSCONFIG, 3, 2);
+	idlemode = REG_GET(hdmi->wp.base, HDMI_WP_SYSCONFIG, 3, 2);
 	/* No-idle mode */
-	REG_FLD_MOD(hdmi.wp.base, HDMI_WP_SYSCONFIG, 1, 3, 2);
+	REG_FLD_MOD(hdmi->wp.base, HDMI_WP_SYSCONFIG, 1, 3, 2);
 
-	r = hdmi5_read_edid(&hdmi.core,  buf, len);
+	r = hdmi5_read_edid(&hdmi->core,  buf, len);
 
-	REG_FLD_MOD(hdmi.wp.base, HDMI_WP_SYSCONFIG, idlemode, 3, 2);
+	REG_FLD_MOD(hdmi->wp.base, HDMI_WP_SYSCONFIG, idlemode, 3, 2);
 
-	hdmi_runtime_put();
-	mutex_unlock(&hdmi.lock);
+	hdmi_runtime_put(hdmi);
+	mutex_unlock(&hdmi->lock);
 
 	return r;
 }
 
 static void hdmi_start_audio_stream(struct omap_hdmi *hd)
 {
-	REG_FLD_MOD(hdmi.wp.base, HDMI_WP_SYSCONFIG, 1, 3, 2);
+	REG_FLD_MOD(hd->wp.base, HDMI_WP_SYSCONFIG, 1, 3, 2);
 	hdmi_wp_audio_enable(&hd->wp, true);
 	hdmi_wp_audio_core_req_enable(&hd->wp, true);
 }
@@ -358,108 +363,110 @@  static void hdmi_stop_audio_stream(struct omap_hdmi *hd)
 
 static int hdmi_display_enable(struct omap_dss_device *dssdev)
 {
-	struct omap_dss_device *out = &hdmi.output;
+	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
 	unsigned long flags;
 	int r = 0;
 
 	DSSDBG("ENTER hdmi_display_enable\n");
 
-	mutex_lock(&hdmi.lock);
+	mutex_lock(&hdmi->lock);
 
-	if (!out->dispc_channel_connected) {
+	if (!dssdev->dispc_channel_connected) {
 		DSSERR("failed to enable display: no output/manager\n");
 		r = -ENODEV;
 		goto err0;
 	}
 
-	r = hdmi_power_on_full(dssdev);
+	r = hdmi_power_on_full(hdmi);
 	if (r) {
 		DSSERR("failed to power on device\n");
 		goto err0;
 	}
 
-	if (hdmi.audio_configured) {
-		r = hdmi5_audio_config(&hdmi.core, &hdmi.wp, &hdmi.audio_config,
-				       hdmi.cfg.vm.pixelclock);
+	if (hdmi->audio_configured) {
+		r = hdmi5_audio_config(&hdmi->core, &hdmi->wp, &hdmi->audio_config,
+				       hdmi->cfg.vm.pixelclock);
 		if (r) {
 			DSSERR("Error restoring audio configuration: %d", r);
-			hdmi.audio_abort_cb(&hdmi.pdev->dev);
-			hdmi.audio_configured = false;
+			hdmi->audio_abort_cb(&hdmi->pdev->dev);
+			hdmi->audio_configured = false;
 		}
 	}
 
-	spin_lock_irqsave(&hdmi.audio_playing_lock, flags);
-	if (hdmi.audio_configured && hdmi.audio_playing)
-		hdmi_start_audio_stream(&hdmi);
-	hdmi.display_enabled = true;
-	spin_unlock_irqrestore(&hdmi.audio_playing_lock, flags);
+	spin_lock_irqsave(&hdmi->audio_playing_lock, flags);
+	if (hdmi->audio_configured && hdmi->audio_playing)
+		hdmi_start_audio_stream(hdmi);
+	hdmi->display_enabled = true;
+	spin_unlock_irqrestore(&hdmi->audio_playing_lock, flags);
 
-	mutex_unlock(&hdmi.lock);
+	mutex_unlock(&hdmi->lock);
 	return 0;
 
 err0:
-	mutex_unlock(&hdmi.lock);
+	mutex_unlock(&hdmi->lock);
 	return r;
 }
 
 static void hdmi_display_disable(struct omap_dss_device *dssdev)
 {
+	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
 	unsigned long flags;
 
 	DSSDBG("Enter hdmi_display_disable\n");
 
-	mutex_lock(&hdmi.lock);
+	mutex_lock(&hdmi->lock);
 
-	spin_lock_irqsave(&hdmi.audio_playing_lock, flags);
-	hdmi_stop_audio_stream(&hdmi);
-	hdmi.display_enabled = false;
-	spin_unlock_irqrestore(&hdmi.audio_playing_lock, flags);
+	spin_lock_irqsave(&hdmi->audio_playing_lock, flags);
+	hdmi_stop_audio_stream(hdmi);
+	hdmi->display_enabled = false;
+	spin_unlock_irqrestore(&hdmi->audio_playing_lock, flags);
 
-	hdmi_power_off_full(dssdev);
+	hdmi_power_off_full(hdmi);
 
-	mutex_unlock(&hdmi.lock);
+	mutex_unlock(&hdmi->lock);
 }
 
-static int hdmi_core_enable(struct omap_dss_device *dssdev)
+static int hdmi_core_enable(struct omap_hdmi *hdmi)
 {
 	int r = 0;
 
 	DSSDBG("ENTER omapdss_hdmi_core_enable\n");
 
-	mutex_lock(&hdmi.lock);
+	mutex_lock(&hdmi->lock);
 
-	r = hdmi_power_on_core(dssdev);
+	r = hdmi_power_on_core(hdmi);
 	if (r) {
 		DSSERR("failed to power on device\n");
 		goto err0;
 	}
 
-	mutex_unlock(&hdmi.lock);
+	mutex_unlock(&hdmi->lock);
 	return 0;
 
 err0:
-	mutex_unlock(&hdmi.lock);
+	mutex_unlock(&hdmi->lock);
 	return r;
 }
 
-static void hdmi_core_disable(struct omap_dss_device *dssdev)
+static void hdmi_core_disable(struct omap_hdmi *hdmi)
 {
 	DSSDBG("Enter omapdss_hdmi_core_disable\n");
 
-	mutex_lock(&hdmi.lock);
+	mutex_lock(&hdmi->lock);
 
-	hdmi_power_off_core(dssdev);
+	hdmi_power_off_core(hdmi);
 
-	mutex_unlock(&hdmi.lock);
+	mutex_unlock(&hdmi->lock);
 }
 
 static int hdmi_connect(struct omap_dss_device *dssdev,
 		struct omap_dss_device *dst)
 {
+	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
 	enum omap_channel channel = dssdev->dispc_channel;
 	int r;
 
-	r = hdmi_init_regulator();
+	r = hdmi_init_regulator(hdmi);
 	if (r)
 		return r;
 
@@ -496,21 +503,22 @@  static void hdmi_disconnect(struct omap_dss_device *dssdev,
 static int hdmi_read_edid(struct omap_dss_device *dssdev,
 		u8 *edid, int len)
 {
+	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
 	bool need_enable;
 	int r;
 
-	need_enable = hdmi.core_enabled == false;
+	need_enable = hdmi->core_enabled == false;
 
 	if (need_enable) {
-		r = hdmi_core_enable(dssdev);
+		r = hdmi_core_enable(hdmi);
 		if (r)
 			return r;
 	}
 
-	r = read_edid(edid, len);
+	r = read_edid(hdmi, edid, len);
 
 	if (need_enable)
-		hdmi_core_disable(dssdev);
+		hdmi_core_disable(hdmi);
 
 	return r;
 }
@@ -518,14 +526,18 @@  static int hdmi_read_edid(struct omap_dss_device *dssdev,
 static int hdmi_set_infoframe(struct omap_dss_device *dssdev,
 		const struct hdmi_avi_infoframe *avi)
 {
-	hdmi.cfg.infoframe = *avi;
+	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
+
+	hdmi->cfg.infoframe = *avi;
 	return 0;
 }
 
 static int hdmi_set_hdmi_mode(struct omap_dss_device *dssdev,
 		bool hdmi_mode)
 {
-	hdmi.cfg.hdmi_dvi_mode = hdmi_mode ? HDMI_HDMI : HDMI_DVI;
+	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
+
+	hdmi->cfg.hdmi_dvi_mode = hdmi_mode ? HDMI_HDMI : HDMI_DVI;
 	return 0;
 }
 
@@ -545,14 +557,14 @@  static const struct omapdss_hdmi_ops hdmi_ops = {
 	.set_hdmi_mode		= hdmi_set_hdmi_mode,
 };
 
-static void hdmi_init_output(struct platform_device *pdev)
+static void hdmi_init_output(struct omap_hdmi *hdmi)
 {
-	struct omap_dss_device *out = &hdmi.output;
+	struct omap_dss_device *out = &hdmi->output;
 
-	out->dev = &pdev->dev;
+	out->dev = &hdmi->pdev->dev;
 	out->id = OMAP_DSS_OUTPUT_HDMI;
 	out->output_type = OMAP_DISPLAY_TYPE_HDMI;
-	out->name = "hdmi.0";
+	out->name = "hdmi->0";
 	out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;
 	out->ops.hdmi = &hdmi_ops;
 	out->owner = THIS_MODULE;
@@ -560,15 +572,16 @@  static void hdmi_init_output(struct platform_device *pdev)
 	omapdss_register_output(out);
 }
 
-static void hdmi_uninit_output(struct platform_device *pdev)
+static void hdmi_uninit_output(struct omap_hdmi *hdmi)
 {
-	struct omap_dss_device *out = &hdmi.output;
+	struct omap_dss_device *out = &hdmi->output;
 
 	omapdss_unregister_output(out);
 }
 
-static int hdmi_probe_of(struct platform_device *pdev)
+static int hdmi_probe_of(struct omap_hdmi *hdmi)
 {
+	struct platform_device *pdev = hdmi->pdev;
 	struct device_node *node = pdev->dev.of_node;
 	struct device_node *ep;
 	int r;
@@ -577,7 +590,7 @@  static int hdmi_probe_of(struct platform_device *pdev)
 	if (!ep)
 		return 0;
 
-	r = hdmi_parse_lanes_of(pdev, ep, &hdmi.phy);
+	r = hdmi_parse_lanes_of(pdev, ep, &hdmi->phy);
 	if (r)
 		goto err;
 
@@ -691,26 +704,26 @@  static const struct omap_hdmi_audio_ops hdmi_audio_ops = {
 	.audio_config = hdmi_audio_config,
 };
 
-static int hdmi_audio_register(struct device *dev)
+static int hdmi_audio_register(struct omap_hdmi *hdmi)
 {
 	struct omap_hdmi_audio_pdata pdata = {
-		.dev = dev,
+		.dev = &hdmi->pdev->dev,
 		.version = 5,
-		.audio_dma_addr = hdmi_wp_get_audio_dma_addr(&hdmi.wp),
+		.audio_dma_addr = hdmi_wp_get_audio_dma_addr(&hdmi->wp),
 		.ops = &hdmi_audio_ops,
 	};
 
-	hdmi.audio_pdev = platform_device_register_data(
-		dev, "omap-hdmi-audio", PLATFORM_DEVID_AUTO,
+	hdmi->audio_pdev = platform_device_register_data(
+		&hdmi->pdev->dev, "omap-hdmi-audio", PLATFORM_DEVID_AUTO,
 		&pdata, sizeof(pdata));
 
-	if (IS_ERR(hdmi.audio_pdev))
-		return PTR_ERR(hdmi.audio_pdev);
+	if (IS_ERR(hdmi->audio_pdev))
+		return PTR_ERR(hdmi->audio_pdev);
 
-	hdmi_runtime_get();
-	hdmi.wp_idlemode =
-		REG_GET(hdmi.wp.base, HDMI_WP_SYSCONFIG, 3, 2);
-	hdmi_runtime_put();
+	hdmi_runtime_get(hdmi);
+	hdmi->wp_idlemode =
+		REG_GET(hdmi->wp.base, HDMI_WP_SYSCONFIG, 3, 2);
+	hdmi_runtime_put(hdmi);
 
 	return 0;
 }
@@ -720,85 +733,95 @@  static int hdmi5_bind(struct device *dev, struct device *master, void *data)
 {
 	struct platform_device *pdev = to_platform_device(dev);
 	struct dss_device *dss = dss_get_device(master);
+	struct omap_hdmi *hdmi;
 	int r;
 	int irq;
 
-	hdmi.pdev = pdev;
-	hdmi.dss = dss;
-	dev_set_drvdata(&pdev->dev, &hdmi);
+	hdmi = kzalloc(sizeof(*hdmi), GFP_KERNEL);
+	if (!hdmi)
+		return -ENOMEM;
 
-	mutex_init(&hdmi.lock);
-	spin_lock_init(&hdmi.audio_playing_lock);
+	hdmi->pdev = pdev;
+	hdmi->dss = dss;
+	dev_set_drvdata(&pdev->dev, hdmi);
 
-	r = hdmi_probe_of(pdev);
+	mutex_init(&hdmi->lock);
+	spin_lock_init(&hdmi->audio_playing_lock);
+
+	r = hdmi_probe_of(hdmi);
 	if (r)
-		return r;
+		goto err_free;
 
-	r = hdmi_wp_init(pdev, &hdmi.wp, 5);
+	r = hdmi_wp_init(pdev, &hdmi->wp, 5);
 	if (r)
-		return r;
+		goto err_free;
 
-	r = hdmi_pll_init(dss, pdev, &hdmi.pll, &hdmi.wp);
+	r = hdmi_pll_init(dss, pdev, &hdmi->pll, &hdmi->wp);
 	if (r)
-		return r;
+		goto err_free;
 
-	r = hdmi_phy_init(pdev, &hdmi.phy, 5);
+	r = hdmi_phy_init(pdev, &hdmi->phy, 5);
 	if (r)
-		goto err;
+		goto err_pll;
 
-	r = hdmi5_core_init(pdev, &hdmi.core);
+	r = hdmi5_core_init(pdev, &hdmi->core);
 	if (r)
-		goto err;
+		goto err_pll;
 
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0) {
 		DSSERR("platform_get_irq failed\n");
 		r = -ENODEV;
-		goto err;
+		goto err_pll;
 	}
 
 	r = devm_request_threaded_irq(&pdev->dev, irq,
 			NULL, hdmi_irq_handler,
-			IRQF_ONESHOT, "OMAP HDMI", &hdmi.wp);
+			IRQF_ONESHOT, "OMAP HDMI", hdmi);
 	if (r) {
 		DSSERR("HDMI IRQ request failed\n");
-		goto err;
+		goto err_pll;
 	}
 
 	pm_runtime_enable(&pdev->dev);
 
-	hdmi_init_output(pdev);
+	hdmi_init_output(hdmi);
 
-	r = hdmi_audio_register(&pdev->dev);
+	r = hdmi_audio_register(hdmi);
 	if (r) {
 		DSSERR("Registering HDMI audio failed %d\n", r);
-		hdmi_uninit_output(pdev);
+		hdmi_uninit_output(hdmi);
 		pm_runtime_disable(&pdev->dev);
 		return r;
 	}
 
-	hdmi.debugfs = dss_debugfs_create_file("hdmi", hdmi_dump_regs, &hdmi);
+	hdmi->debugfs = dss_debugfs_create_file("hdmi", hdmi_dump_regs, hdmi);
 
 	return 0;
-err:
-	hdmi_pll_uninit(&hdmi.pll);
+
+err_pll:
+	hdmi_pll_uninit(&hdmi->pll);
+err_free:
+	kfree(hdmi);
 	return r;
 }
 
 static void hdmi5_unbind(struct device *dev, struct device *master, void *data)
 {
-	struct platform_device *pdev = to_platform_device(dev);
+	struct omap_hdmi *hdmi = dev_get_drvdata(dev);
+
+	dss_debugfs_remove_file(hdmi->debugfs);
 
-	dss_debugfs_remove_file(hdmi.debugfs);
+	if (hdmi->audio_pdev)
+		platform_device_unregister(hdmi->audio_pdev);
 
-	if (hdmi.audio_pdev)
-		platform_device_unregister(hdmi.audio_pdev);
+	hdmi_uninit_output(hdmi);
 
-	hdmi_uninit_output(pdev);
+	hdmi_pll_uninit(&hdmi->pll);
 
-	hdmi_pll_uninit(&hdmi.pll);
+	pm_runtime_disable(dev);
 
-	pm_runtime_disable(&pdev->dev);
+	kfree(hdmi);
 }
 
 static const struct component_ops hdmi5_component_ops = {