niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

drm: omapdrm: sdi: Allocate the sdi private data structure dynamically

Browse source 
The sdi private data structure is currently stored as a global
variable. While no platform with multiple SDI 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>
This commit is contained in:
Laurent Pinchart 2018-02-13 14:00:47 +02:00 • committed by Tomi Valkeinen
parent c44991ce21
commit 24aac6011f
1 changed files with 86 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

151
drivers/gpu/drm/omapdrm/dss/sdi.c
View file

@ -29,7 +29,7 @@
#include "omapdss.h" #include "omapdss.h"
#include "dss.h" #include "dss.h"
static struct { struct sdi_device {
struct platform_device *pdev; struct platform_device *pdev;
struct dss_device *dss; struct dss_device *dss;
@ -41,11 +41,12 @@ static struct {
int datapairs; int datapairs;
struct omap_dss_device output; struct omap_dss_device output;
};
bool port_initialized; #define dssdev_to_sdi(dssdev) container_of(dssdev, struct sdi_device, output)
} sdi;
struct sdi_clk_calc_ctx { struct sdi_clk_calc_ctx {
struct sdi_device *sdi;
unsigned long pck_min, pck_max; unsigned long pck_min, pck_max;
unsigned long fck; unsigned long fck;
@ -71,17 +72,17 @@ static bool dpi_calc_dss_cb(unsigned long fck, void *data)
ctx->fck = fck; ctx->fck = fck;
return dispc_div_calc(sdi.dss->dispc, fck, return dispc_div_calc(ctx->sdi->dss->dispc, fck,
ctx->pck_min, ctx->pck_max, ctx->pck_min, ctx->pck_max,
dpi_calc_dispc_cb, ctx); dpi_calc_dispc_cb, ctx);
} }
static int sdi_calc_clock_div(unsigned long pclk, static int sdi_calc_clock_div(struct sdi_device *sdi, unsigned long pclk,
unsigned long *fck, unsigned long *fck,
struct dispc_clock_info *dispc_cinfo) struct dispc_clock_info *dispc_cinfo)
{ {
int i; int i;
struct sdi_clk_calc_ctx ctx; struct sdi_clk_calc_ctx ctx = { .sdi = sdi };
/* /*
* DSS fclk gives us very few possibilities, so finding a good pixel * DSS fclk gives us very few possibilities, so finding a good pixel
@ -100,7 +101,7 @@ static int sdi_calc_clock_div(unsigned long pclk,
ctx.pck_min = 0; ctx.pck_min = 0;
ctx.pck_max = pclk + 1000 * i * i * i; ctx.pck_max = pclk + 1000 * i * i * i;
ok = dss_div_calc(sdi.dss, pclk, ctx.pck_min, ok = dss_div_calc(sdi->dss, pclk, ctx.pck_min,
dpi_calc_dss_cb, &ctx); dpi_calc_dss_cb, &ctx);
if (ok) { if (ok) {
*fck = ctx.fck; *fck = ctx.fck;
@ -112,48 +113,49 @@ static int sdi_calc_clock_div(unsigned long pclk,
return -EINVAL; return -EINVAL;
} }
static void sdi_config_lcd_manager(struct omap_dss_device *dssdev) static void sdi_config_lcd_manager(struct sdi_device *sdi)
{ {
sdi.mgr_config.io_pad_mode = DSS_IO_PAD_MODE_BYPASS; sdi->mgr_config.io_pad_mode = DSS_IO_PAD_MODE_BYPASS;
sdi.mgr_config.stallmode = false; sdi->mgr_config.stallmode = false;
sdi.mgr_config.fifohandcheck = false; sdi->mgr_config.fifohandcheck = false;
sdi.mgr_config.video_port_width = 24; sdi->mgr_config.video_port_width = 24;
sdi.mgr_config.lcden_sig_polarity = 1; sdi->mgr_config.lcden_sig_polarity = 1;
dss_mgr_set_lcd_config(&sdi.output, &sdi.mgr_config); dss_mgr_set_lcd_config(&sdi->output, &sdi->mgr_config);
} }
static int sdi_display_enable(struct omap_dss_device *dssdev) static int sdi_display_enable(struct omap_dss_device *dssdev)
{ {
struct videomode *vm = &sdi.vm; struct sdi_device *sdi = dssdev_to_sdi(dssdev);
struct videomode *vm = &sdi->vm;
unsigned long fck; unsigned long fck;
struct dispc_clock_info dispc_cinfo; struct dispc_clock_info dispc_cinfo;
unsigned long pck; unsigned long pck;
int r; int r;
if (!sdi.output.dispc_channel_connected) { if (!sdi->output.dispc_channel_connected) {
DSSERR("failed to enable display: no output/manager\n"); DSSERR("failed to enable display: no output/manager\n");
return -ENODEV; return -ENODEV;
} }
r = regulator_enable(sdi.vdds_sdi_reg); r = regulator_enable(sdi->vdds_sdi_reg);
if (r) if (r)
goto err_reg_enable; goto err_reg_enable;
r = dispc_runtime_get(sdi.dss->dispc); r = dispc_runtime_get(sdi->dss->dispc);
if (r) if (r)
goto err_get_dispc; goto err_get_dispc;
/* 15.5.9.1.2 */ /* 15.5.9.1.2 */
vm->flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE | DISPLAY_FLAGS_SYNC_POSEDGE; vm->flags |= DISPLAY_FLAGS_PIXDATA_POSEDGE | DISPLAY_FLAGS_SYNC_POSEDGE;
r = sdi_calc_clock_div(vm->pixelclock, &fck, &dispc_cinfo); r = sdi_calc_clock_div(sdi, vm->pixelclock, &fck, &dispc_cinfo);
if (r) if (r)
goto err_calc_clock_div; goto err_calc_clock_div;
sdi.mgr_config.clock_info = dispc_cinfo; sdi->mgr_config.clock_info = dispc_cinfo;
pck = fck / dispc_cinfo.lck_div / dispc_cinfo.pck_div; pck = fck / dispc_cinfo.lck_div / dispc_cinfo.pck_div;
@ -165,13 +167,13 @@ static int sdi_display_enable(struct omap_dss_device *dssdev)
} }
dss_mgr_set_timings(&sdi.output, vm); dss_mgr_set_timings(&sdi->output, vm);
r = dss_set_fck_rate(sdi.dss, fck); r = dss_set_fck_rate(sdi->dss, fck);
if (r) if (r)
goto err_set_dss_clock_div; goto err_set_dss_clock_div;
sdi_config_lcd_manager(dssdev); sdi_config_lcd_manager(sdi);
/* /*
* LCLK and PCLK divisors are located in shadow registers, and we * LCLK and PCLK divisors are located in shadow registers, and we
@ -184,62 +186,69 @@ static int sdi_display_enable(struct omap_dss_device *dssdev)
* need to care about the shadow register mechanism for pck-free. The * need to care about the shadow register mechanism for pck-free. The
* exact reason for this is unknown. * exact reason for this is unknown.
*/ */
dispc_mgr_set_clock_div(sdi.dss->dispc, sdi.output.dispc_channel, dispc_mgr_set_clock_div(sdi->dss->dispc, sdi->output.dispc_channel,
&sdi.mgr_config.clock_info); &sdi->mgr_config.clock_info);
dss_sdi_init(sdi.dss, sdi.datapairs); dss_sdi_init(sdi->dss, sdi->datapairs);
r = dss_sdi_enable(sdi.dss); r = dss_sdi_enable(sdi->dss);
if (r) if (r)
goto err_sdi_enable; goto err_sdi_enable;
mdelay(2); mdelay(2);
r = dss_mgr_enable(&sdi.output); r = dss_mgr_enable(&sdi->output);
if (r) if (r)
goto err_mgr_enable; goto err_mgr_enable;
return 0; return 0;
err_mgr_enable: err_mgr_enable:
dss_sdi_disable(sdi.dss); dss_sdi_disable(sdi->dss);
err_sdi_enable: err_sdi_enable:
err_set_dss_clock_div: err_set_dss_clock_div:
err_calc_clock_div: err_calc_clock_div:
dispc_runtime_put(sdi.dss->dispc); dispc_runtime_put(sdi->dss->dispc);
err_get_dispc: err_get_dispc:
regulator_disable(sdi.vdds_sdi_reg); regulator_disable(sdi->vdds_sdi_reg);
err_reg_enable: err_reg_enable:
return r; return r;
} }
static void sdi_display_disable(struct omap_dss_device *dssdev) static void sdi_display_disable(struct omap_dss_device *dssdev)
{ {
dss_mgr_disable(&sdi.output); struct sdi_device *sdi = dssdev_to_sdi(dssdev);
dss_sdi_disable(sdi.dss); dss_mgr_disable(&sdi->output);
dispc_runtime_put(sdi.dss->dispc); dss_sdi_disable(sdi->dss);
regulator_disable(sdi.vdds_sdi_reg); dispc_runtime_put(sdi->dss->dispc);
regulator_disable(sdi->vdds_sdi_reg);
} }
static void sdi_set_timings(struct omap_dss_device *dssdev, static void sdi_set_timings(struct omap_dss_device *dssdev,
struct videomode *vm) struct videomode *vm)
{ {
sdi.vm = *vm; struct sdi_device *sdi = dssdev_to_sdi(dssdev);
sdi->vm = *vm;
} }
static void sdi_get_timings(struct omap_dss_device *dssdev, static void sdi_get_timings(struct omap_dss_device *dssdev,
struct videomode *vm) struct videomode *vm)
{ {
*vm = sdi.vm; struct sdi_device *sdi = dssdev_to_sdi(dssdev);
*vm = sdi->vm;
} }
static int sdi_check_timings(struct omap_dss_device *dssdev, static int sdi_check_timings(struct omap_dss_device *dssdev,
struct videomode *vm) struct videomode *vm)
{ {
struct sdi_device *sdi = dssdev_to_sdi(dssdev);
enum omap_channel channel = dssdev->dispc_channel; enum omap_channel channel = dssdev->dispc_channel;
if (!dispc_mgr_timings_ok(sdi.dss->dispc, channel, vm)) if (!dispc_mgr_timings_ok(sdi->dss->dispc, channel, vm))
return -EINVAL; return -EINVAL;
if (vm->pixelclock == 0) if (vm->pixelclock == 0)
@ -248,21 +257,21 @@ static int sdi_check_timings(struct omap_dss_device *dssdev,
return 0; return 0;
} }
static int sdi_init_regulator(void) static int sdi_init_regulator(struct sdi_device *sdi)
{ {
struct regulator *vdds_sdi; struct regulator *vdds_sdi;
if (sdi.vdds_sdi_reg) if (sdi->vdds_sdi_reg)
return 0; return 0;
vdds_sdi = devm_regulator_get(&sdi.pdev->dev, "vdds_sdi"); vdds_sdi = devm_regulator_get(&sdi->pdev->dev, "vdds_sdi");
if (IS_ERR(vdds_sdi)) { if (IS_ERR(vdds_sdi)) {
if (PTR_ERR(vdds_sdi) != -EPROBE_DEFER) if (PTR_ERR(vdds_sdi) != -EPROBE_DEFER)
DSSERR("can't get VDDS_SDI regulator\n"); DSSERR("can't get VDDS_SDI regulator\n");
return PTR_ERR(vdds_sdi); return PTR_ERR(vdds_sdi);
} }
sdi.vdds_sdi_reg = vdds_sdi; sdi->vdds_sdi_reg = vdds_sdi;
return 0; return 0;
} }
@ -270,13 +279,14 @@ static int sdi_init_regulator(void)
static int sdi_connect(struct omap_dss_device *dssdev, static int sdi_connect(struct omap_dss_device *dssdev,
struct omap_dss_device *dst) struct omap_dss_device *dst)
{ {
struct sdi_device *sdi = dssdev_to_sdi(dssdev);
int r; int r;
r = sdi_init_regulator(); r = sdi_init_regulator(sdi);
if (r) if (r)
return r; return r;
r = dss_mgr_connect(&sdi.output, dssdev); r = dss_mgr_connect(&sdi->output, dssdev);
if (r) if (r)
return r; return r;
@ -284,7 +294,7 @@ static int sdi_connect(struct omap_dss_device *dssdev,
if (r) { if (r) {
DSSERR("failed to connect output to new device: %s\n", DSSERR("failed to connect output to new device: %s\n",
dst->name); dst->name);
dss_mgr_disconnect(&sdi.output, dssdev); dss_mgr_disconnect(&sdi->output, dssdev);
return r; return r;
} }
@ -294,6 +304,8 @@ static int sdi_connect(struct omap_dss_device *dssdev,
static void sdi_disconnect(struct omap_dss_device *dssdev, static void sdi_disconnect(struct omap_dss_device *dssdev,
struct omap_dss_device *dst) struct omap_dss_device *dst)
{ {
struct sdi_device *sdi = dssdev_to_sdi(dssdev);
WARN_ON(dst != dssdev->dst); WARN_ON(dst != dssdev->dst);
if (dst != dssdev->dst) if (dst != dssdev->dst)
@ -301,7 +313,7 @@ static void sdi_disconnect(struct omap_dss_device *dssdev,
omapdss_output_unset_device(dssdev); omapdss_output_unset_device(dssdev);
dss_mgr_disconnect(&sdi.output, dssdev); dss_mgr_disconnect(&sdi->output, dssdev);
} }
static const struct omapdss_sdi_ops sdi_ops = { static const struct omapdss_sdi_ops sdi_ops = {
@ -316,11 +328,11 @@ static const struct omapdss_sdi_ops sdi_ops = {
.get_timings = sdi_get_timings, .get_timings = sdi_get_timings,
}; };
static void sdi_init_output(struct platform_device *pdev) static void sdi_init_output(struct sdi_device *sdi)
{ {
struct omap_dss_device *out = &sdi.output; struct omap_dss_device *out = &sdi->output;
out->dev = &pdev->dev; out->dev = &sdi->pdev->dev;
out->id = OMAP_DSS_OUTPUT_SDI; out->id = OMAP_DSS_OUTPUT_SDI;
out->output_type = OMAP_DISPLAY_TYPE_SDI; out->output_type = OMAP_DISPLAY_TYPE_SDI;
out->name = "sdi.0"; out->name = "sdi.0";
@ -333,23 +345,28 @@ static void sdi_init_output(struct platform_device *pdev)
omapdss_register_output(out); omapdss_register_output(out);
} }
static void sdi_uninit_output(struct platform_device *pdev) static void sdi_uninit_output(struct sdi_device *sdi)
{ {
struct omap_dss_device *out = &sdi.output; omapdss_unregister_output(&sdi->output);
omapdss_unregister_output(out);
} }
int sdi_init_port(struct dss_device *dss, struct platform_device *pdev, int sdi_init_port(struct dss_device *dss, struct platform_device *pdev,
struct device_node *port) struct device_node *port)
{ {
struct sdi_device *sdi;
struct device_node *ep; struct device_node *ep;
u32 datapairs; u32 datapairs;
int r; int r;
sdi = kzalloc(sizeof(*sdi), GFP_KERNEL);
if (!sdi)
return -ENOMEM;
ep = of_get_next_child(port, NULL); ep = of_get_next_child(port, NULL);
if (!ep) if (!ep) {
return 0; r = 0;
goto err_free;
}
r = of_property_read_u32(ep, "datapairs", &datapairs); r = of_property_read_u32(ep, "datapairs", &datapairs);
if (r) { if (r) {
@ -357,29 +374,33 @@ int sdi_init_port(struct dss_device *dss, struct platform_device *pdev,
goto err_datapairs; goto err_datapairs;
} }
sdi.datapairs = datapairs; sdi->datapairs = datapairs;
sdi.dss = dss; sdi->dss = dss;
of_node_put(ep); of_node_put(ep);
sdi.pdev = pdev; sdi->pdev = pdev;
port->data = sdi;
sdi_init_output(pdev); sdi_init_output(sdi);
sdi.port_initialized = true;
return 0; return 0;
err_datapairs: err_datapairs:
of_node_put(ep); of_node_put(ep);
err_free:
kfree(sdi);
return r; return r;
} }
void sdi_uninit_port(struct device_node *port) void sdi_uninit_port(struct device_node *port)
{ {
if (!sdi.port_initialized) struct sdi_device *sdi = port->data;
if (!sdi)
return; return;
sdi_uninit_output(sdi.pdev); sdi_uninit_output(sdi);
kfree(sdi);
} }