Message ID | 20210416153909.v4.17.I4c0b4a87e4dc19e5023b4d0a21bbfa6d9c09ebd8@changeid |
---|---|
State | Superseded |
Headers | show |
Series | drm: Fix EDID reading on ti-sn65dsi86; solve some chicken-and-egg problems | expand |
On Fri 16 Apr 17:39 CDT 2021, Douglas Anderson wrote: > Let's make the bridge use autosuspend with a 500ms delay. This is in > preparation for promoting DP AUX transfers to their own sub-driver so > that we're not constantly powering up and down the device as we > transfer all the chunks. > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Regards, Bjorn > Signed-off-by: Douglas Anderson <dianders@chromium.org> > --- > > (no changes since v1) > > drivers/gpu/drm/bridge/ti-sn65dsi86.c | 14 ++++++++------ > 1 file changed, 8 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c > index 44edcf6f5744..a98abf496190 100644 > --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c > +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c > @@ -243,7 +243,7 @@ static int status_show(struct seq_file *s, void *data) > seq_printf(s, "[0x%02x] = 0x%08x\n", reg, val); > } > > - pm_runtime_put(pdata->dev); > + pm_runtime_put_autosuspend(pdata->dev); > > return 0; > } > @@ -292,7 +292,7 @@ static int ti_sn_bridge_connector_get_modes(struct drm_connector *connector) > if (!edid) { > pm_runtime_get_sync(pdata->dev); > edid = pdata->edid = drm_get_edid(connector, &pdata->aux.ddc); > - pm_runtime_put(pdata->dev); > + pm_runtime_put_autosuspend(pdata->dev); > } > > if (edid && drm_edid_is_valid(edid)) { > @@ -418,7 +418,7 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, > /* check if continuous dsi clock is required or not */ > pm_runtime_get_sync(pdata->dev); > regmap_read(pdata->regmap, SN_DPPLL_SRC_REG, &val); > - pm_runtime_put(pdata->dev); > + pm_runtime_put_autosuspend(pdata->dev); > if (!(val & DPPLL_CLK_SRC_DSICLK)) > dsi->mode_flags |= MIPI_DSI_CLOCK_NON_CONTINUOUS; > > @@ -1049,7 +1049,7 @@ static int ti_sn_bridge_gpio_get(struct gpio_chip *chip, unsigned int offset) > */ > pm_runtime_get_sync(pdata->dev); > ret = regmap_read(pdata->regmap, SN_GPIO_IO_REG, &val); > - pm_runtime_put(pdata->dev); > + pm_runtime_put_autosuspend(pdata->dev); > > if (ret) > return ret; > @@ -1100,7 +1100,7 @@ static int ti_sn_bridge_gpio_direction_input(struct gpio_chip *chip, > * it off and when it comes back it will have lost all state, but > * that's OK because the default is input and we're now an input. > */ > - pm_runtime_put(pdata->dev); > + pm_runtime_put_autosuspend(pdata->dev); > > return 0; > } > @@ -1126,7 +1126,7 @@ static int ti_sn_bridge_gpio_direction_output(struct gpio_chip *chip, > SN_GPIO_MUX_OUTPUT << shift); > if (ret) { > clear_bit(offset, pdata->gchip_output); > - pm_runtime_put(pdata->dev); > + pm_runtime_put_autosuspend(pdata->dev); > } > > return ret; > @@ -1408,6 +1408,8 @@ static int ti_sn65dsi86_probe(struct i2c_client *client, > ret = devm_add_action_or_reset(dev, ti_sn65dsi86_runtime_disable, dev); > if (ret) > return ret; > + pm_runtime_set_autosuspend_delay(pdata->dev, 500); > + pm_runtime_use_autosuspend(pdata->dev); > > ti_sn65dsi86_debugfs_init(pdata); > > -- > 2.31.1.368.gbe11c130af-goog >
diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c index 44edcf6f5744..a98abf496190 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c @@ -243,7 +243,7 @@ static int status_show(struct seq_file *s, void *data) seq_printf(s, "[0x%02x] = 0x%08x\n", reg, val); } - pm_runtime_put(pdata->dev); + pm_runtime_put_autosuspend(pdata->dev); return 0; } @@ -292,7 +292,7 @@ static int ti_sn_bridge_connector_get_modes(struct drm_connector *connector) if (!edid) { pm_runtime_get_sync(pdata->dev); edid = pdata->edid = drm_get_edid(connector, &pdata->aux.ddc); - pm_runtime_put(pdata->dev); + pm_runtime_put_autosuspend(pdata->dev); } if (edid && drm_edid_is_valid(edid)) { @@ -418,7 +418,7 @@ static int ti_sn_bridge_attach(struct drm_bridge *bridge, /* check if continuous dsi clock is required or not */ pm_runtime_get_sync(pdata->dev); regmap_read(pdata->regmap, SN_DPPLL_SRC_REG, &val); - pm_runtime_put(pdata->dev); + pm_runtime_put_autosuspend(pdata->dev); if (!(val & DPPLL_CLK_SRC_DSICLK)) dsi->mode_flags |= MIPI_DSI_CLOCK_NON_CONTINUOUS; @@ -1049,7 +1049,7 @@ static int ti_sn_bridge_gpio_get(struct gpio_chip *chip, unsigned int offset) */ pm_runtime_get_sync(pdata->dev); ret = regmap_read(pdata->regmap, SN_GPIO_IO_REG, &val); - pm_runtime_put(pdata->dev); + pm_runtime_put_autosuspend(pdata->dev); if (ret) return ret; @@ -1100,7 +1100,7 @@ static int ti_sn_bridge_gpio_direction_input(struct gpio_chip *chip, * it off and when it comes back it will have lost all state, but * that's OK because the default is input and we're now an input. */ - pm_runtime_put(pdata->dev); + pm_runtime_put_autosuspend(pdata->dev); return 0; } @@ -1126,7 +1126,7 @@ static int ti_sn_bridge_gpio_direction_output(struct gpio_chip *chip, SN_GPIO_MUX_OUTPUT << shift); if (ret) { clear_bit(offset, pdata->gchip_output); - pm_runtime_put(pdata->dev); + pm_runtime_put_autosuspend(pdata->dev); } return ret; @@ -1408,6 +1408,8 @@ static int ti_sn65dsi86_probe(struct i2c_client *client, ret = devm_add_action_or_reset(dev, ti_sn65dsi86_runtime_disable, dev); if (ret) return ret; + pm_runtime_set_autosuspend_delay(pdata->dev, 500); + pm_runtime_use_autosuspend(pdata->dev); ti_sn65dsi86_debugfs_init(pdata);
Let's make the bridge use autosuspend with a 500ms delay. This is in preparation for promoting DP AUX transfers to their own sub-driver so that we're not constantly powering up and down the device as we transfer all the chunks. Signed-off-by: Douglas Anderson <dianders@chromium.org> --- (no changes since v1) drivers/gpu/drm/bridge/ti-sn65dsi86.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)