Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b295257 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

drm: omapdrm: dss: Pass DSS private structure to runtime PM functions 



To prepare for the removal of the global variable storing DSS private
data, pass its pointer to the dss_runtime_{get,put}() functions.

As this requires getting hold of the dss_device structure in the
callers, we add a new dss_get_device() function to retrieve it. The
function currently returns a pointer to the global data structure, and
will later be updated to get the pointer from device driver data when
the DSS private structure will be allocated dynamically.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
parent 0e546dfd

drivers/gpu/drm/omapdrm/dss/dsi.c

+5 −2
Original line number Diff line number Diff line
@@ -5322,7 +5322,8 @@ static const struct dss_pll_hw dss_omap5_dsi_pll_hw = { 
	.has_refsel = true,

};



static int dsi_init_pll_data(struct platform_device *dsidev)

static int dsi_init_pll_data(struct dss_device *dss,

			     struct platform_device *dsidev)

{

	struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);

	struct dss_pll *pll = &dsi->pll;
@@ -5341,6 +5342,7 @@ static int dsi_init_pll_data(struct platform_device *dsidev) 
	pll->base = dsi->pll_base;

	pll->hw = dsi->data->pll_hw;

	pll->ops = &dsi_pll_ops;

	pll->dss = dss;



	r = dss_pll_register(pll);

	if (r)
@@ -5417,6 +5419,7 @@ static const struct soc_device_attribute dsi_soc_devices[] = { 
static int dsi_bind(struct device *dev, struct device *master, void *data)

{

	struct platform_device *dsidev = to_platform_device(dev);

	struct dss_device *dss = dss_get_device(master);

	const struct soc_device_attribute *soc;

	const struct dsi_module_id_data *d;

	u32 rev;
@@ -5525,7 +5528,7 @@ static int dsi_bind(struct device *dev, struct device *master, void *data) 
	if (r)

		return r;



	dsi_init_pll_data(dsidev);

	dsi_init_pll_data(dss, dsidev);



	pm_runtime_enable(&dsidev->dev);

drivers/gpu/drm/omapdrm/dss/dss.c

+27 −20
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ static void dss_dump_clocks(struct seq_file *s) 
	const char *fclk_name;

	unsigned long fclk_rate;



	if (dss_runtime_get())

	if (dss_runtime_get(&dss))

		return;



	seq_printf(s, "- DSS -\n");
@@ -357,7 +357,7 @@ static void dss_dump_clocks(struct seq_file *s) 
			fclk_name,

			fclk_rate);



	dss_runtime_put();

	dss_runtime_put(&dss);

}

#endif
@@ -365,7 +365,7 @@ static void dss_dump_regs(struct seq_file *s) 
{

#define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, dss_read_reg(r))



	if (dss_runtime_get())

	if (dss_runtime_get(&dss))

		return;



	DUMPREG(DSS_REVISION);
@@ -379,7 +379,7 @@ static void dss_dump_regs(struct seq_file *s) 
		DUMPREG(DSS_SDI_STATUS);

	}



	dss_runtime_put();

	dss_runtime_put(&dss);

#undef DUMPREG

}
@@ -837,27 +837,32 @@ static void dss_put_clocks(void) 
		clk_put(dss.parent_clk);

}



int dss_runtime_get(void)

int dss_runtime_get(struct dss_device *dss)

{

	int r;



	DSSDBG("dss_runtime_get\n");



	r = pm_runtime_get_sync(&dss.pdev->dev);

	r = pm_runtime_get_sync(&dss->pdev->dev);

	WARN_ON(r < 0);

	return r < 0 ? r : 0;

}



void dss_runtime_put(void)

void dss_runtime_put(struct dss_device *dss)

{

	int r;



	DSSDBG("dss_runtime_put\n");



	r = pm_runtime_put_sync(&dss.pdev->dev);

	r = pm_runtime_put_sync(&dss->pdev->dev);

	WARN_ON(r < 0 && r != -ENOSYS && r != -EBUSY);

}



struct dss_device *dss_get_device(struct device *dev)

{

	return &dss;

}



/* DEBUGFS */

#if defined(CONFIG_OMAP2_DSS_DEBUGFS)

static void dss_debug_dump_clocks(struct seq_file *s)
@@ -1223,13 +1228,15 @@ static int dss_video_pll_probe(struct platform_device *pdev) 
	}



	if (of_property_match_string(np, "reg-names", "pll1") >= 0) {

		dss.video1_pll = dss_video_pll_init(pdev, 0, pll_regulator);

		dss.video1_pll = dss_video_pll_init(&dss, pdev, 0,

						    pll_regulator);

		if (IS_ERR(dss.video1_pll))

			return PTR_ERR(dss.video1_pll);

	}



	if (of_property_match_string(np, "reg-names", "pll2") >= 0) {

		dss.video2_pll = dss_video_pll_init(pdev, 1, pll_regulator);

		dss.video2_pll = dss_video_pll_init(&dss, pdev, 1,

						    pll_regulator);

		if (IS_ERR(dss.video2_pll)) {

			dss_video_pll_uninit(dss.video1_pll);

			return PTR_ERR(dss.video2_pll);
@@ -1311,16 +1318,16 @@ static int dss_add_child_component(struct device *dev, void *data) 
	return 0;

}



static int dss_probe_hardware(void)

static int dss_probe_hardware(struct dss_device *dss)

{

	u32 rev;

	int r;



	r = dss_runtime_get();

	r = dss_runtime_get(dss);

	if (r)

		return r;



	dss.dss_clk_rate = clk_get_rate(dss.dss_clk);

	dss->dss_clk_rate = clk_get_rate(dss->dss_clk);



	/* Select DPLL */

	REG_FLD_MOD(DSS_CONTROL, 0, 0, 0);
@@ -1332,16 +1339,16 @@ static int dss_probe_hardware(void) 
	REG_FLD_MOD(DSS_CONTROL, 1, 3, 3);	/* venc clock 4x enable */

	REG_FLD_MOD(DSS_CONTROL, 0, 2, 2);	/* venc clock mode = normal */

#endif

	dss.dsi_clk_source[0] = DSS_CLK_SRC_FCK;

	dss.dsi_clk_source[1] = DSS_CLK_SRC_FCK;

	dss.dispc_clk_source = DSS_CLK_SRC_FCK;

	dss.lcd_clk_source[0] = DSS_CLK_SRC_FCK;

	dss.lcd_clk_source[1] = DSS_CLK_SRC_FCK;

	dss->dsi_clk_source[0] = DSS_CLK_SRC_FCK;

	dss->dsi_clk_source[1] = DSS_CLK_SRC_FCK;

	dss->dispc_clk_source = DSS_CLK_SRC_FCK;

	dss->lcd_clk_source[0] = DSS_CLK_SRC_FCK;

	dss->lcd_clk_source[1] = DSS_CLK_SRC_FCK;



	rev = dss_read_reg(DSS_REVISION);

	pr_info("OMAP DSS rev %d.%d\n", FLD_GET(rev, 7, 4), FLD_GET(rev, 3, 0));



	dss_runtime_put();

	dss_runtime_put(dss);



	return 0;

}
@@ -1397,7 +1404,7 @@ static int dss_probe(struct platform_device *pdev) 
	/* Enable runtime PM and probe the hardware. */

	pm_runtime_enable(&pdev->dev);



	r = dss_probe_hardware();

	r = dss_probe_hardware(&dss);

	if (r)

		goto err_pm_runtime_disable;

drivers/gpu/drm/omapdrm/dss/dss.h

+8 −4
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ struct dss_pll_hw { 
struct dss_pll {

	const char *name;

	enum dss_pll_id id;

	struct dss_device *dss;



	struct clk *clkin;

	struct regulator *regulator;
@@ -291,8 +292,10 @@ static inline int dss_debugfs_create_file(const char *name, 
}

#endif /* CONFIG_OMAP2_DSS_DEBUGFS */



int dss_runtime_get(void);

void dss_runtime_put(void);

struct dss_device *dss_get_device(struct device *dev);



int dss_runtime_get(struct dss_device *dss);

void dss_runtime_put(struct dss_device *dss);



unsigned long dss_get_dispc_clk_rate(void);

unsigned long dss_get_max_fck_rate(void);
@@ -302,7 +305,8 @@ void dss_select_hdmi_venc_clk_source(enum dss_hdmi_venc_clk_source_select); 
const char *dss_get_clk_source_name(enum dss_clk_source clk_src);



/* DSS VIDEO PLL */

struct dss_pll *dss_video_pll_init(struct platform_device *pdev, int id,

struct dss_pll *dss_video_pll_init(struct dss_device *dss,

				   struct platform_device *pdev, int id,

				   struct regulator *regulator);

void dss_video_pll_uninit(struct dss_pll *pll);

drivers/gpu/drm/omapdrm/dss/hdmi.h

+4 −2
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
#include "omapdss.h"

#include "dss.h"



struct dss_device;



/* HDMI Wrapper */



#define HDMI_WP_REVISION			0x0
@@ -324,8 +326,8 @@ phys_addr_t hdmi_wp_get_audio_dma_addr(struct hdmi_wp_data *wp); 


/* HDMI PLL funcs */

void hdmi_pll_dump(struct hdmi_pll_data *pll, struct seq_file *s);

int hdmi_pll_init(struct platform_device *pdev, struct hdmi_pll_data *pll,

	struct hdmi_wp_data *wp);

int hdmi_pll_init(struct dss_device *dss, struct platform_device *pdev,

		  struct hdmi_pll_data *pll, struct hdmi_wp_data *wp);

void hdmi_pll_uninit(struct hdmi_pll_data *hpll);



/* HDMI PHY funcs */

drivers/gpu/drm/omapdrm/dss/hdmi4.c

+2 −1
Original line number Diff line number Diff line
@@ -717,6 +717,7 @@ static int hdmi_audio_register(struct device *dev) 
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);

	int r;

	int irq;
@@ -734,7 +735,7 @@ static int hdmi4_bind(struct device *dev, struct device *master, void *data) 
	if (r)

		return r;



	r = hdmi_pll_init(pdev, &hdmi.pll, &hdmi.wp);

	r = hdmi_pll_init(dss, pdev, &hdmi.pll, &hdmi.wp);

	if (r)

		return r;