Re: [PATCH 31/48] drm: omapdrm: hdmi4: Allocate the omap_hdmi data structure dynamically

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Fri, Oct 13, 2017 at 05:59:27PM +0300, Laurent Pinchart wrote:
> The omap_hdmi private data structure is currently stored as a global
> variable. While no platform with multiple HDMI4 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@xxxxxxxxxxxxxxxx>
> ---

Reviewed-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxxxx>

-- Sebastian

>  drivers/gpu/drm/omapdrm/dss/hdmi.h       |   2 +
>  drivers/gpu/drm/omapdrm/dss/hdmi4.c      | 337 +++++++++++++++++--------------
>  drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c  |   4 +-
>  drivers/gpu/drm/omapdrm/dss/hdmi4_core.h |   4 +-
>  4 files changed, 188 insertions(+), 159 deletions(-)
> 
> diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi.h b/drivers/gpu/drm/omapdrm/dss/hdmi.h
> index fa2fbdaa427c..3aeb4cabd59f 100644
> --- a/drivers/gpu/drm/omapdrm/dss/hdmi.h
> +++ b/drivers/gpu/drm/omapdrm/dss/hdmi.h
> @@ -389,4 +389,6 @@ struct omap_hdmi {
>  	bool display_enabled;
>  };
>  
> +#define dssdev_to_hdmi(dssdev) container_of(dssdev, struct omap_hdmi, output)
> +
>  #endif
> diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4.c b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
> index 5806587fd89a..f0a30b248a7d 100644
> --- a/drivers/gpu/drm/omapdrm/dss/hdmi4.c
> +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4.c
> @@ -44,15 +44,13 @@
>  #include "dss.h"
>  #include "hdmi.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;
> @@ -60,13 +58,13 @@ 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);
>  }
>  
> @@ -109,14 +107,14 @@ 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)) {
>  		if (PTR_ERR(reg) != -EPROBE_DEFER)
> @@ -124,64 +122,64 @@ static int hdmi_init_regulator(void)
>  		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;
>  
> -	if (hdmi.core.core_pwr_cnt++)
> +	if (hdmi->core.core_pwr_cnt++)
>  		return 0;
>  
> -	r = regulator_enable(hdmi.vdda_reg);
> +	r = regulator_enable(hdmi->vdda_reg);
>  	if (r)
>  		goto err_reg_enable;
>  
> -	r = hdmi_runtime_get();
> +	r = hdmi_runtime_get(hdmi);
>  	if (r)
>  		goto err_runtime_get;
>  
> -	hdmi4_core_powerdown_disable(&hdmi.core);
> +	hdmi4_core_powerdown_disable(&hdmi->core);
>  
>  	/* 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);
>  err_reg_enable:
> -	hdmi.core.core_pwr_cnt--;
> +	hdmi->core.core_pwr_cnt--;
>  
>  	return r;
>  }
>  
> -static void hdmi_power_off_core(struct omap_dss_device *dssdev)
> +static void hdmi_power_off_core(struct omap_hdmi *hdmi)
>  {
> -	if (--hdmi.core.core_pwr_cnt)
> +	if (--hdmi->core.core_pwr_cnt)
>  		return;
>  
> -	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;
> -	struct hdmi_wp_data *wp = &hdmi.wp;
> +	enum omap_channel channel = hdmi->output.dispc_channel;
> +	struct hdmi_wp_data *wp = &hdmi->wp;
>  	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;
>  
> @@ -189,7 +187,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
>  	hdmi_wp_clear_irqenable(wp, ~HDMI_IRQ_CORE);
>  	hdmi_wp_set_irqstatus(wp, ~HDMI_IRQ_CORE);
>  
> -	vm = &hdmi.cfg.vm;
> +	vm = &hdmi->cfg.vm;
>  
>  	DSSDBG("hdmi_power_on hactive= %d vactive = %d\n", vm->hactive,
>  	       vm->vactive);
> @@ -201,22 +199,22 @@ 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);
>  
> -	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 configure PHY\n");
> @@ -227,7 +225,7 @@ static int hdmi_power_on_full(struct omap_dss_device *dssdev)
>  	if (r)
>  		goto err_phy_pwr;
>  
> -	hdmi4_configure(&hdmi.core, &hdmi.wp, &hdmi.cfg);
> +	hdmi4_configure(&hdmi->core, &hdmi->wp, &hdmi->cfg);
>  
>  	/* tv size */
>  	dss_mgr_set_timings(channel, vm);
> @@ -236,7 +234,7 @@ 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;
>  
> @@ -248,31 +246,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, ~HDMI_IRQ_CORE);
> +	hdmi_wp_clear_irqenable(&hdmi->wp, ~HDMI_IRQ_CORE);
>  
> -	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,
> @@ -287,53 +285,59 @@ 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);
> +
> +	mutex_lock(&hdmi->lock);
>  
> -	hdmi.cfg.vm = *vm;
> +	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);
> -	hdmi4_core_dump(&hdmi.core, s);
> +	hdmi_wp_dump(&hdmi->wp, s);
> +	hdmi_pll_dump(&hdmi->pll, s);
> +	hdmi_phy_dump(&hdmi->phy, s);
> +	hdmi4_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;
>  
> -	mutex_lock(&hdmi.lock);
> +	mutex_lock(&hdmi->lock);
>  
> -	r = hdmi_runtime_get();
> +	r = hdmi_runtime_get(hdmi);
>  	BUG_ON(r);
>  
> -	r = hdmi4_read_edid(&hdmi.core,  buf, len);
> +	r = hdmi4_read_edid(&hdmi->core,  buf, len);
>  
> -	hdmi_runtime_put();
> -	mutex_unlock(&hdmi.lock);
> +	hdmi_runtime_put(hdmi);
> +	mutex_unlock(&hdmi->lock);
>  
>  	return r;
>  }
> @@ -352,108 +356,113 @@ 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 = hdmi4_audio_config(&hdmi.core, &hdmi.wp, &hdmi.audio_config,
> -				       hdmi.cfg.vm.pixelclock);
> +	if (hdmi->audio_configured) {
> +		r = hdmi4_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);
>  }
>  
> -int hdmi4_core_enable(struct omap_dss_device *dssdev)
> +int hdmi4_core_enable(struct hdmi_core_data *core)
>  {
> +	struct omap_hdmi *hdmi = container_of(core, struct omap_hdmi, core);
>  	int r = 0;
>  
>  	DSSDBG("ENTER omapdss_hdmi4_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;
>  }
>  
> -void hdmi4_core_disable(struct omap_dss_device *dssdev)
> +void hdmi4_core_disable(struct hdmi_core_data *core)
>  {
> +	struct omap_hdmi *hdmi = container_of(core, struct omap_hdmi, core);
> +
>  	DSSDBG("Enter omapdss_hdmi4_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;
>  
> @@ -490,45 +499,52 @@ 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 = hdmi4_core_enable(dssdev);
> +		r = hdmi4_core_enable(&hdmi->core);
>  		if (r)
>  			return r;
>  	}
>  
> -	r = read_edid(edid, len);
> +	r = read_edid(hdmi, edid, len);
>  	if (r >= 256)
> -		hdmi4_cec_set_phys_addr(&hdmi.core,
> +		hdmi4_cec_set_phys_addr(&hdmi->core,
>  					cec_get_edid_phys_addr(edid, r, NULL));
>  	else
> -		hdmi4_cec_set_phys_addr(&hdmi.core, CEC_PHYS_ADDR_INVALID);
> +		hdmi4_cec_set_phys_addr(&hdmi->core, CEC_PHYS_ADDR_INVALID);
>  	if (need_enable)
> -		hdmi4_core_disable(dssdev);
> +		hdmi4_core_disable(&hdmi->core);
>  
>  	return r;
>  }
>  
>  static void hdmi_lost_hotplug(struct omap_dss_device *dssdev)
>  {
> -	hdmi4_cec_set_phys_addr(&hdmi.core, CEC_PHYS_ADDR_INVALID);
> +	struct omap_hdmi *hdmi = dssdev_to_hdmi(dssdev);
> +
> +	hdmi4_cec_set_phys_addr(&hdmi->core, CEC_PHYS_ADDR_INVALID);
>  }
>  
>  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;
>  }
>  
> @@ -549,14 +565,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;
> @@ -564,15 +580,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;
> @@ -581,7 +598,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;
>  
> @@ -694,21 +711,21 @@ 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 = 4,
> -		.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);
>  
>  	return 0;
>  }
> @@ -718,91 +735,101 @@ static int hdmi4_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;
> +
> +	hdmi->pdev = pdev;
> +	hdmi->dss = dss;
> +	dev_set_drvdata(&pdev->dev, hdmi);
>  
> -	mutex_init(&hdmi.lock);
> -	spin_lock_init(&hdmi.audio_playing_lock);
> +	mutex_init(&hdmi->lock);
> +	spin_lock_init(&hdmi->audio_playing_lock);
>  
> -	r = hdmi_probe_of(pdev);
> +	r = hdmi_probe_of(hdmi);
>  	if (r)
> -		return r;
> +		goto err_free;
>  
> -	r = hdmi_wp_init(pdev, &hdmi.wp, 4);
> +	r = hdmi_wp_init(pdev, &hdmi->wp, 4);
>  	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, 4);
> +	r = hdmi_phy_init(pdev, &hdmi->phy, 4);
>  	if (r)
> -		goto err;
> +		goto err_pll;
>  
> -	r = hdmi4_core_init(pdev, &hdmi.core);
> +	r = hdmi4_core_init(pdev, &hdmi->core);
>  	if (r)
> -		goto err;
> +		goto err_pll;
>  
> -	r = hdmi4_cec_init(pdev, &hdmi.core, &hdmi.wp);
> +	r = hdmi4_cec_init(pdev, &hdmi->core, &hdmi->wp);
>  	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);
> +			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\n");
> -		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 hdmi4_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);
> +	hdmi4_cec_uninit(&hdmi->core);
>  
> -	hdmi4_cec_uninit(&hdmi.core);
> +	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 hdmi4_component_ops = {
> diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c b/drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c
> index d86873f2abe6..3e2c880dbadb 100644
> --- a/drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c
> +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c
> @@ -199,10 +199,10 @@ static int hdmi_cec_adap_enable(struct cec_adapter *adap, bool enable)
>  		REG_FLD_MOD(core->base, HDMI_CORE_SYS_INTR_UNMASK4, 0, 3, 3);
>  		hdmi_wp_clear_irqenable(core->wp, HDMI_IRQ_CORE);
>  		hdmi_wp_set_irqstatus(core->wp, HDMI_IRQ_CORE);
> -		hdmi4_core_disable(NULL);
> +		hdmi4_core_disable(core);
>  		return 0;
>  	}
> -	err = hdmi4_core_enable(NULL);
> +	err = hdmi4_core_enable(core);
>  	if (err)
>  		return err;
>  
> diff --git a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.h b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.h
> index b6ab579e44d2..337a317c1a27 100644
> --- a/drivers/gpu/drm/omapdrm/dss/hdmi4_core.h
> +++ b/drivers/gpu/drm/omapdrm/dss/hdmi4_core.h
> @@ -266,8 +266,8 @@ void hdmi4_configure(struct hdmi_core_data *core, struct hdmi_wp_data *wp,
>  void hdmi4_core_dump(struct hdmi_core_data *core, struct seq_file *s);
>  int hdmi4_core_init(struct platform_device *pdev, struct hdmi_core_data *core);
>  
> -int hdmi4_core_enable(struct omap_dss_device *dssdev);
> -void hdmi4_core_disable(struct omap_dss_device *dssdev);
> +int hdmi4_core_enable(struct hdmi_core_data *core);
> +void hdmi4_core_disable(struct hdmi_core_data *core);
>  void hdmi4_core_powerdown_disable(struct hdmi_core_data *core);
>  
>  int hdmi4_audio_start(struct hdmi_core_data *core, struct hdmi_wp_data *wp);
> -- 
> Regards,
> 
> Laurent Pinchart
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@xxxxxxxxxxxxxxxxxxxxx
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

Attachment: signature.asc
Description: PGP signature

_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux