qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

video/drm: panel/phy code style clean up and fixes 

Silence debug messages if the panel/phy does not exist.

Change-Id: Ifa027017e9aa9af54992e26f2bbde7048b22bb04
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
This commit is contained in:
Wyon Bi 2018-12-18 20:17:40 +08:00
parent fa36e9fb10
commit 7cacd0a851
5 changed files with 142 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
drivers/video/drm/rockchip_display.c
View File

@ -119,9 +119,6 @@ static int get_public_phy(struct display_state *state,
return 0; return 0;
} }
conn_state->phy_dev = dev;
conn_state->phy_node = dev->node;
ret = rockchip_phy_init(phy); ret = rockchip_phy_init(phy);
if (ret) { if (ret) {
printf("failed to init phy driver\n"); printf("failed to init phy driver\n");
@ -130,7 +127,6 @@ static int get_public_phy(struct display_state *state,
conn_state->phy = phy; conn_state->phy = phy;
printf("inno hdmi phy init success, save it\n"); printf("inno hdmi phy init success, save it\n");
data->phy_node = ofnode_to_offset(conn_state->phy_node);
data->phy_drv = conn_state->phy; data->phy_drv = conn_state->phy;
data->phy_init = true; data->phy_init = true;
return 0; return 0;
@ -175,9 +171,7 @@ static int connector_phy_init(struct display_state *state,
struct public_phy_data *data) struct public_phy_data *data)
{ {
struct connector_state *conn_state = &state->conn_state; struct connector_state *conn_state = &state->conn_state;
struct rockchip_phy *phy; int type;
struct udevice *dev;
int ret, type;
/* does this connector use public phy with others */ /* does this connector use public phy with others */
type = check_public_use_phy(state); type = check_public_use_phy(state);
@ -195,39 +189,10 @@ static int connector_phy_init(struct display_state *state,
} }
/* if this phy has been initialized, get it directly */ /* if this phy has been initialized, get it directly */
conn_state->phy_node = offset_to_ofnode(data->phy_node);
conn_state->phy = (struct rockchip_phy *)data->phy_drv; conn_state->phy = (struct rockchip_phy *)data->phy_drv;
return 0; return 0;
} }
/*
* if this connector don't use the same phy with others,
* just get phy as original method.
*/
ret = uclass_get_device_by_phandle(UCLASS_PHY, conn_state->dev, "phys",
&dev);
if (ret) {
printf("Warn: can't find phy driver\n");
return 0;
}
phy = (struct rockchip_phy *)dev_get_driver_data(dev);
if (!phy) {
printf("failed to find phy driver\n");
return 0;
}
conn_state->phy_dev = dev;
conn_state->phy_node = dev->node;
ret = rockchip_phy_init(phy);
if (ret) {
printf("failed to init phy driver\n");
return ret;
}
conn_state->phy = phy;
return 0; return 0;
} }
@ -242,14 +207,6 @@ static int connector_panel_init(struct display_state *state)
if (!panel) if (!panel)
return 0; return 0;
if (panel->funcs && panel->funcs->init) {
ret = panel->funcs->init(state);
if (ret) {
printf("failed to init panel driver\n");
return ret;
}
}
dsp_lut_node = dev_read_subnode(panel->dev, "dsp-lut"); dsp_lut_node = dev_read_subnode(panel->dev, "dsp-lut");
if (!ofnode_valid(dsp_lut_node)) { if (!ofnode_valid(dsp_lut_node)) {
debug("%s can not find dsp-lut node\n", __func__); debug("%s can not find dsp-lut node\n", __func__);
@ -514,7 +471,6 @@ static int display_get_timing(struct display_state *state)
const struct drm_display_mode *m; const struct drm_display_mode *m;
struct panel_state *panel_state = &state->panel_state; struct panel_state *panel_state = &state->panel_state;
const struct rockchip_panel *panel = panel_state->panel; const struct rockchip_panel *panel = panel_state->panel;
int ret;
if (dev_of_valid(panel->dev) && if (dev_of_valid(panel->dev) &&
!display_get_timing_from_dts(panel_state, mode)) { !display_get_timing_from_dts(panel_state, mode)) {
@ -532,24 +488,12 @@ static int display_get_timing(struct display_state *state)
if (conn_funcs->get_edid && !conn_funcs->get_edid(state)) { if (conn_funcs->get_edid && !conn_funcs->get_edid(state)) {
int panel_bits_per_colourp; int panel_bits_per_colourp;
/* In order to read EDID, the panel needs to be powered on */
if (panel->funcs->prepare) {
ret = panel->funcs->prepare(state);
if (ret) {
printf("failed to prepare panel\n");
return ret;
}
}
if (!edid_get_drm_mode((void *)&conn_state->edid, if (!edid_get_drm_mode((void *)&conn_state->edid,
sizeof(conn_state->edid), mode, sizeof(conn_state->edid), mode,
&panel_bits_per_colourp)) { &panel_bits_per_colourp)) {
printf("Using display timing from edid\n"); printf("Using display timing from edid\n");
edid_print_info((void *)&conn_state->edid); edid_print_info((void *)&conn_state->edid);
goto done; goto done;
} else {
if (panel->funcs->unprepare)
panel->funcs->unprepare(state);
} }
} }
@ -596,11 +540,18 @@ static int display_init(struct display_state *state)
return -ENXIO; return -ENXIO;
} }
if (panel_state->panel)
rockchip_panel_init(panel_state->panel);
if (conn_funcs->init) { if (conn_funcs->init) {
ret = conn_funcs->init(state); ret = conn_funcs->init(state);
if (ret) if (ret)
goto deinit; goto deinit;
} }
if (conn_state->phy)
rockchip_phy_init(conn_state->phy);
/* /*
* support hotplug, but not connect; * support hotplug, but not connect;
*/ */
@ -700,58 +651,6 @@ static int display_set_plane(struct display_state *state)
return 0; return 0;
} }
static int display_panel_prepare(struct display_state *state)
{
struct panel_state *panel_state = &state->panel_state;
const struct rockchip_panel *panel = panel_state->panel;
if (!panel || !panel->funcs || !panel->funcs->prepare) {
printf("%s: failed to find panel prepare funcs\n", __func__);
return -ENODEV;
}
return panel->funcs->prepare(state);
}
static int display_panel_enable(struct display_state *state)
{
struct panel_state *panel_state = &state->panel_state;
const struct rockchip_panel *panel = panel_state->panel;
if (!panel || !panel->funcs || !panel->funcs->enable) {
printf("%s: failed to find panel enable funcs\n", __func__);
return -ENODEV;
}
return panel->funcs->enable(state);
}
static void display_panel_unprepare(struct display_state *state)
{
struct panel_state *panel_state = &state->panel_state;
const struct rockchip_panel *panel = panel_state->panel;
if (!panel || !panel->funcs || !panel->funcs->unprepare) {
printf("%s: failed to find panel unprepare funcs\n", __func__);
return;
}
panel->funcs->unprepare(state);
}
static void display_panel_disable(struct display_state *state)
{
struct panel_state *panel_state = &state->panel_state;
const struct rockchip_panel *panel = panel_state->panel;
if (!panel || !panel->funcs || !panel->funcs->disable) {
printf("%s: failed to find panel disable funcs\n", __func__);
return;
}
panel->funcs->disable(state);
}
static int display_enable(struct display_state *state) static int display_enable(struct display_state *state)
{ {
struct connector_state *conn_state = &state->conn_state; struct connector_state *conn_state = &state->conn_state;
@ -760,6 +659,7 @@ static int display_enable(struct display_state *state)
struct crtc_state *crtc_state = &state->crtc_state; struct crtc_state *crtc_state = &state->crtc_state;
const struct rockchip_crtc *crtc = crtc_state->crtc; const struct rockchip_crtc *crtc = crtc_state->crtc;
const struct rockchip_crtc_funcs *crtc_funcs = crtc->funcs; const struct rockchip_crtc_funcs *crtc_funcs = crtc->funcs;
struct panel_state *panel_state = &state->panel_state;
int ret = 0; int ret = 0;
display_init(state); display_init(state);
@ -785,7 +685,8 @@ static int display_enable(struct display_state *state)
if (conn_state->bridge) if (conn_state->bridge)
rockchip_bridge_pre_enable(conn_state->bridge); rockchip_bridge_pre_enable(conn_state->bridge);
display_panel_prepare(state); if (panel_state->panel)
rockchip_panel_prepare(panel_state->panel);
if (crtc_funcs->enable) { if (crtc_funcs->enable) {
ret = crtc_funcs->enable(state); ret = crtc_funcs->enable(state);
@ -802,7 +703,8 @@ static int display_enable(struct display_state *state)
if (conn_state->bridge) if (conn_state->bridge)
rockchip_bridge_enable(conn_state->bridge); rockchip_bridge_enable(conn_state->bridge);
display_panel_enable(state); if (panel_state->panel)
rockchip_panel_enable(panel_state->panel);
state->is_enable = true; state->is_enable = true;
return 0; return 0;
@ -827,6 +729,7 @@ static int display_disable(struct display_state *state)
struct crtc_state *crtc_state = &state->crtc_state; struct crtc_state *crtc_state = &state->crtc_state;
const struct rockchip_crtc *crtc = crtc_state->crtc; const struct rockchip_crtc *crtc = crtc_state->crtc;
const struct rockchip_crtc_funcs *crtc_funcs = crtc->funcs; const struct rockchip_crtc_funcs *crtc_funcs = crtc->funcs;
struct panel_state *panel_state = &state->panel_state;
if (!state->is_init) if (!state->is_init)
return 0; return 0;
@ -834,7 +737,8 @@ static int display_disable(struct display_state *state)
if (!state->is_enable) if (!state->is_enable)
return 0; return 0;
display_panel_disable(state); if (panel_state->panel)
rockchip_panel_disable(panel_state->panel);
if (conn_state->bridge) if (conn_state->bridge)
rockchip_bridge_disable(conn_state->bridge); rockchip_bridge_disable(conn_state->bridge);
@ -845,7 +749,8 @@ static int display_disable(struct display_state *state)
if (crtc_funcs->disable) if (crtc_funcs->disable)
crtc_funcs->disable(state); crtc_funcs->disable(state);
display_panel_unprepare(state); if (panel_state->panel)
rockchip_panel_unprepare(panel_state->panel);
if (conn_state->bridge) if (conn_state->bridge)
rockchip_bridge_post_disable(conn_state->bridge); rockchip_bridge_post_disable(conn_state->bridge);
@ -1337,6 +1242,18 @@ static struct udevice *rockchip_of_find_connector(ofnode endpoint)
return dev; return dev;
} }
static struct rockchip_phy *rockchip_of_find_phy(struct udevice *dev)
{
struct udevice *phy_dev;
int ret;
ret = uclass_get_device_by_phandle(UCLASS_PHY, dev, "phys", &phy_dev);
if (ret)
return NULL;
return (struct rockchip_phy *)dev_get_driver_data(phy_dev);
}
static int rockchip_display_probe(struct udevice *dev) static int rockchip_display_probe(struct udevice *dev)
{ {
struct video_priv *uc_priv = dev_get_uclass_priv(dev); struct video_priv *uc_priv = dev_get_uclass_priv(dev);
@ -1348,6 +1265,7 @@ static int rockchip_display_probe(struct udevice *dev)
const struct rockchip_connector *conn; const struct rockchip_connector *conn;
struct rockchip_panel *panel = NULL; struct rockchip_panel *panel = NULL;
struct rockchip_bridge *bridge = NULL; struct rockchip_bridge *bridge = NULL;
struct rockchip_phy *phy = NULL;
struct display_state *s; struct display_state *s;
const char *name; const char *name;
int ret; int ret;
@ -1412,6 +1330,8 @@ static int rockchip_display_probe(struct udevice *dev)
conn = (const struct rockchip_connector *)dev_get_driver_data(conn_dev); conn = (const struct rockchip_connector *)dev_get_driver_data(conn_dev);
phy = rockchip_of_find_phy(conn_dev);
bridge = rockchip_of_find_bridge(conn_dev); bridge = rockchip_of_find_bridge(conn_dev);
if (bridge) if (bridge)
panel = rockchip_of_find_panel(bridge->dev); panel = rockchip_of_find_panel(bridge->dev);
@ -1447,6 +1367,7 @@ static int rockchip_display_probe(struct udevice *dev)
s->conn_state.node = conn_dev->node; s->conn_state.node = conn_dev->node;
s->conn_state.dev = conn_dev; s->conn_state.dev = conn_dev;
s->conn_state.connector = conn; s->conn_state.connector = conn;
s->conn_state.phy = phy;
s->conn_state.bridge = bridge; s->conn_state.bridge = bridge;
s->conn_state.overscan.left_margin = 100; s->conn_state.overscan.left_margin = 100;
s->conn_state.overscan.right_margin = 100; s->conn_state.overscan.right_margin = 100;
@ -1461,6 +1382,9 @@ static int rockchip_display_probe(struct udevice *dev)
if (bridge) if (bridge)
bridge->state = s; bridge->state = s;
if (panel)
panel->state = s;
get_crtc_mcu_mode(&s->crtc_state); get_crtc_mcu_mode(&s->crtc_state);
if (connector_panel_init(s)) { if (connector_panel_init(s)) {

2
drivers/video/drm/rockchip_display.h
View File

@ -103,10 +103,8 @@ struct connector_state {
struct udevice *dev; struct udevice *dev;
const struct rockchip_connector *connector; const struct rockchip_connector *connector;
struct rockchip_bridge *bridge; struct rockchip_bridge *bridge;
struct udevice *phy_dev;
struct rockchip_phy *phy; struct rockchip_phy *phy;
ofnode node; ofnode node;
ofnode phy_node;
void *private; void *private;

82
drivers/video/drm/rockchip_panel.c
View File

@ -251,55 +251,55 @@ static int rockchip_panel_send_dsi_cmds(struct display_state *state,
return 0; return 0;
} }
static int rockchip_panel_prepare(struct display_state *state) static void panel_simple_prepare(struct rockchip_panel *panel)
{ {
struct rockchip_panel *panel = state_get_panel(state);
struct rockchip_panel_plat *plat = dev_get_platdata(panel->dev); struct rockchip_panel_plat *plat = dev_get_platdata(panel->dev);
struct rockchip_panel_priv *priv = dev_get_priv(panel->dev); struct rockchip_panel_priv *priv = dev_get_priv(panel->dev);
int ret; int ret;
if (priv->prepared) if (priv->prepared)
return 0; return;
if (priv->power_supply) { if (priv->power_supply)
ret = regulator_set_enable(priv->power_supply, regulator_set_enable(priv->power_supply, !plat->power_invert);
!plat->power_invert);
if (ret) {
printf("%s: failed to enable power supply", __func__);
return ret;
}
}
if (dm_gpio_is_valid(&priv->enable_gpio))
dm_gpio_set_value(&priv->enable_gpio, 1); dm_gpio_set_value(&priv->enable_gpio, 1);
if (plat->delay.prepare)
mdelay(plat->delay.prepare); mdelay(plat->delay.prepare);
if (dm_gpio_is_valid(&priv->reset_gpio))
dm_gpio_set_value(&priv->reset_gpio, 1); dm_gpio_set_value(&priv->reset_gpio, 1);
if (plat->delay.reset)
mdelay(plat->delay.reset); mdelay(plat->delay.reset);
if (dm_gpio_is_valid(&priv->reset_gpio))
dm_gpio_set_value(&priv->reset_gpio, 0); dm_gpio_set_value(&priv->reset_gpio, 0);
if (plat->delay.init)
mdelay(plat->delay.init); mdelay(plat->delay.init);
if (plat->on_cmds) { if (plat->on_cmds) {
if (priv->cmd_type == CMD_TYPE_SPI) if (priv->cmd_type == CMD_TYPE_SPI)
ret = rockchip_panel_send_spi_cmds(state, ret = rockchip_panel_send_spi_cmds(panel->state,
plat->on_cmds); plat->on_cmds);
else if (priv->cmd_type == CMD_TYPE_MCU) else if (priv->cmd_type == CMD_TYPE_MCU)
ret = rockchip_panel_send_mcu_cmds(state, plat->on_cmds); ret = rockchip_panel_send_mcu_cmds(panel->state,
plat->on_cmds);
else else
ret = rockchip_panel_send_dsi_cmds(state, ret = rockchip_panel_send_dsi_cmds(panel->state,
plat->on_cmds); plat->on_cmds);
if (ret) if (ret)
printf("failed to send on cmds: %d\n", ret); printf("failed to send on cmds: %d\n", ret);
} }
priv->prepared = true; priv->prepared = true;
return 0;
} }
static void rockchip_panel_unprepare(struct display_state *state) static void panel_simple_unprepare(struct rockchip_panel *panel)
{ {
struct rockchip_panel *panel = state_get_panel(state);
struct rockchip_panel_plat *plat = dev_get_platdata(panel->dev); struct rockchip_panel_plat *plat = dev_get_platdata(panel->dev);
struct rockchip_panel_priv *priv = dev_get_priv(panel->dev); struct rockchip_panel_priv *priv = dev_get_priv(panel->dev);
int ret; int ret;
@ -309,55 +309,52 @@ static void rockchip_panel_unprepare(struct display_state *state)
if (plat->off_cmds) { if (plat->off_cmds) {
if (priv->cmd_type == CMD_TYPE_SPI) if (priv->cmd_type == CMD_TYPE_SPI)
ret = rockchip_panel_send_spi_cmds(state, ret = rockchip_panel_send_spi_cmds(panel->state,
plat->off_cmds); plat->off_cmds);
else if (priv->cmd_type == CMD_TYPE_MCU) else if (priv->cmd_type == CMD_TYPE_MCU)
ret = rockchip_panel_send_mcu_cmds(state, ret = rockchip_panel_send_mcu_cmds(panel->state,
plat->off_cmds); plat->off_cmds);
else else
ret = rockchip_panel_send_dsi_cmds(state, ret = rockchip_panel_send_dsi_cmds(panel->state,
plat->off_cmds); plat->off_cmds);
if (ret) if (ret)
printf("failed to send off cmds: %d\n", ret); printf("failed to send off cmds: %d\n", ret);
} }
if (dm_gpio_is_valid(&priv->reset_gpio))
dm_gpio_set_value(&priv->reset_gpio, 1); dm_gpio_set_value(&priv->reset_gpio, 1);
if (dm_gpio_is_valid(&priv->enable_gpio))
dm_gpio_set_value(&priv->enable_gpio, 0); dm_gpio_set_value(&priv->enable_gpio, 0);
if (priv->power_supply) { if (priv->power_supply)
ret = regulator_set_enable(priv->power_supply, regulator_set_enable(priv->power_supply, plat->power_invert);
plat->power_invert);
if (ret)
printf("%s: failed to disable power supply", __func__);
}
if (plat->delay.unprepare)
mdelay(plat->delay.unprepare); mdelay(plat->delay.unprepare);
priv->prepared = false; priv->prepared = false;
} }
static int rockchip_panel_enable(struct display_state *state) static void panel_simple_enable(struct rockchip_panel *panel)
{ {
struct rockchip_panel *panel = state_get_panel(state);
struct rockchip_panel_plat *plat = dev_get_platdata(panel->dev); struct rockchip_panel_plat *plat = dev_get_platdata(panel->dev);
struct rockchip_panel_priv *priv = dev_get_priv(panel->dev); struct rockchip_panel_priv *priv = dev_get_priv(panel->dev);
if (priv->enabled) if (priv->enabled)
return 0; return;
if (plat->delay.enable)
mdelay(plat->delay.enable); mdelay(plat->delay.enable);
if (priv->backlight) if (priv->backlight)
backlight_enable(priv->backlight); backlight_enable(priv->backlight);
priv->enabled = true; priv->enabled = true;
return 0;
} }
static void rockchip_panel_disable(struct display_state *state) static void panel_simple_disable(struct rockchip_panel *panel)
{ {
struct rockchip_panel *panel = state_get_panel(state);
struct rockchip_panel_plat *plat = dev_get_platdata(panel->dev); struct rockchip_panel_plat *plat = dev_get_platdata(panel->dev);
struct rockchip_panel_priv *priv = dev_get_priv(panel->dev); struct rockchip_panel_priv *priv = dev_get_priv(panel->dev);
@ -367,27 +364,26 @@ static void rockchip_panel_disable(struct display_state *state)
if (priv->backlight) if (priv->backlight)
backlight_disable(priv->backlight); backlight_disable(priv->backlight);
if (plat->delay.disable)
mdelay(plat->delay.disable); mdelay(plat->delay.disable);
priv->enabled = false; priv->enabled = false;
} }
static int rockchip_panel_init(struct display_state *state) static void panel_simple_init(struct rockchip_panel *panel)
{ {
struct display_state *state = panel->state;
struct connector_state *conn_state = &state->conn_state; struct connector_state *conn_state = &state->conn_state;
struct rockchip_panel *panel = state_get_panel(state);
conn_state->bus_format = panel->bus_format; conn_state->bus_format = panel->bus_format;
return 0;
} }
static const struct rockchip_panel_funcs rockchip_panel_funcs = { static const struct rockchip_panel_funcs rockchip_panel_funcs = {
.init = rockchip_panel_init, .init = panel_simple_init,
.prepare = rockchip_panel_prepare, .prepare = panel_simple_prepare,
.unprepare = rockchip_panel_unprepare, .unprepare = panel_simple_unprepare,
.enable = rockchip_panel_enable, .enable = panel_simple_enable,
.disable = rockchip_panel_disable, .disable = panel_simple_disable,
}; };
static int rockchip_panel_ofdata_to_platdata(struct udevice *dev) static int rockchip_panel_ofdata_to_platdata(struct udevice *dev)

59
drivers/video/drm/rockchip_panel.h
View File

@ -8,14 +8,14 @@
#define _ROCKCHIP_PANEL_H_ #define _ROCKCHIP_PANEL_H_
struct display_state; struct display_state;
struct rockchip_panel;
struct rockchip_panel_funcs { struct rockchip_panel_funcs {
int (*init)(struct display_state *state); void (*init)(struct rockchip_panel *panel);
void (*deinit)(struct display_state *state); void (*prepare)(struct rockchip_panel *panel);
int (*prepare)(struct display_state *state); void (*unprepare)(struct rockchip_panel *panel);
void (*unprepare)(struct display_state *state); void (*enable)(struct rockchip_panel *panel);
int (*enable)(struct display_state *state); void (*disable)(struct rockchip_panel *panel);
void (*disable)(struct display_state *state);
}; };
struct rockchip_panel { struct rockchip_panel {
@ -23,6 +23,53 @@ struct rockchip_panel {
u32 bus_format; u32 bus_format;
const struct rockchip_panel_funcs *funcs; const struct rockchip_panel_funcs *funcs;
const void *data; const void *data;
struct display_state *state;
}; };
static inline void rockchip_panel_init(struct rockchip_panel *panel)
{
if (!panel)
return;
if (panel->funcs && panel->funcs->init)
panel->funcs->init(panel);
}
static inline void rockchip_panel_prepare(struct rockchip_panel *panel)
{
if (!panel)
return;
if (panel->funcs && panel->funcs->prepare)
panel->funcs->prepare(panel);
}
static inline void rockchip_panel_enable(struct rockchip_panel *panel)
{
if (!panel)
return;
if (panel->funcs && panel->funcs->enable)
panel->funcs->enable(panel);
}
static inline void rockchip_panel_unprepare(struct rockchip_panel *panel)
{
if (!panel)
return;
if (panel->funcs && panel->funcs->unprepare)
panel->funcs->unprepare(panel);
}
static inline void rockchip_panel_disable(struct rockchip_panel *panel)
{
if (!panel)
return;
if (panel->funcs && panel->funcs->disable)
panel->funcs->disable(panel);
}
#endif /* _ROCKCHIP_PANEL_H_ */ #endif /* _ROCKCHIP_PANEL_H_ */

4
drivers/video/drm/rockchip_phy.c
View File

@ -12,7 +12,7 @@ int rockchip_phy_init(struct rockchip_phy *phy)
if (!phy) if (!phy)
return -ENODEV; return -ENODEV;
if (phy->funcs || phy->funcs->init) if (phy->funcs && phy->funcs->init)
return phy->funcs->init(phy); return phy->funcs->init(phy);
return 0; return 0;
@ -23,7 +23,7 @@ int rockchip_phy_power_on(struct rockchip_phy *phy)
if (!phy) if (!phy)
return -ENODEV; return -ENODEV;
if (phy->funcs || phy->funcs->power_on) if (phy->funcs && phy->funcs->power_on)
return phy->funcs->power_on(phy); return phy->funcs->power_on(phy);
return 0; return 0;