Hi,
On Thu, Mar 17, 2022 at 6:19 PM Stephen Boyd <swboyd@xxxxxxxxxxxx> wrote:
>
> Quoting Sankeerth Billakanti (2022-03-16 10:35:51)
> > The source device should ensure the sink is ready before
> > proceeding to read the sink capability or performing any aux transactions.
> > The sink will indicate its readiness by asserting the HPD line.
> >
> > The eDP sink requires power from the source and its HPD line will
> > be asserted only after the panel is powered on. The panel power will be
> > enabled from the panel-edp driver.
> >
> > The controller driver needs to wait for the hpd line to be asserted
> > by the sink.
> >
> > Signed-off-by: Sankeerth Billakanti <quic_sbillaka@xxxxxxxxxxx>
> > ---
> > drivers/gpu/drm/msm/dp/dp_aux.c | 6 ++++++
> > drivers/gpu/drm/msm/dp/dp_catalog.c | 23 +++++++++++++++++++++++
> > drivers/gpu/drm/msm/dp/dp_catalog.h | 1 +
> > drivers/gpu/drm/msm/dp/dp_reg.h | 7 ++++++-
> > 4 files changed, 36 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/msm/dp/dp_aux.c b/drivers/gpu/drm/msm/dp/dp_aux.c
> > index 6d36f63..2ddc303 100644
> > --- a/drivers/gpu/drm/msm/dp/dp_aux.c
> > +++ b/drivers/gpu/drm/msm/dp/dp_aux.c
> > @@ -337,6 +337,12 @@ static ssize_t dp_aux_transfer(struct drm_dp_aux *dp_aux,
> > goto exit;
> > }
> >
> > + ret = dp_catalog_aux_wait_for_hpd_connect_state(aux->catalog);
>
> Why are we making aux transactions when hpd isn't asserted? Can we only
> register the aux device once we know that state is "connected"? I'm
> concerned that we're going to be possibly polling the connected bit up
> to some amount of time (0x0003FFFF usecs?) for each aux transfer when
> that doesn't make any sense to keep checking. We should be able to check
> it once, register aux, and then when disconnect happens we can
> unregister aux.
This is for eDP and, unless someone wants to redesign it again, is
just how it works.
Specifically:
1. On eDP you _always_ report "connected". This is because when an eDP
panel is turned off (but still there) you actually have no way to
detect it--you just have to assume it's there. And thus you _always_
register the AUX bus.
2. When we are asked to read the EDID that happens _before_ the normal
prepare/enable steps. The way that this should work is that the
request travels down to the panel. The panel turns itself on (waiting
for any hardcoded delays it knows about) and then initiates an AUX
transaction. The AUX transaction is in charge of waiting for HPD.
For the DP case this should not cause any significant overhead, right?
HPD should always be asserted so this is basically just one extra IO
read confirming that HPD is asserted which should be almost nothing...
You're just about to do a whole bunch of IO reads/writes in order to
program the AUX transaction anyway.
> > + if (ret) {
> > + DRM_DEBUG_DP("DP sink not ready for aux transactions\n");
> > + goto exit;
> > + }
> > +
> > dp_aux_update_offset_and_segment(aux, msg);
> > dp_aux_transfer_helper(aux, msg, true);
> >
> > diff --git a/drivers/gpu/drm/msm/dp/dp_catalog.c b/drivers/gpu/drm/msm/dp/dp_catalog.c
> > index fac815f..2c3b0f7 100644
> > --- a/drivers/gpu/drm/msm/dp/dp_catalog.c
> > +++ b/drivers/gpu/drm/msm/dp/dp_catalog.c
> > @@ -242,6 +242,29 @@ void dp_catalog_aux_update_cfg(struct dp_catalog *dp_catalog)
> > phy_calibrate(phy);
> > }
> >
> > +int dp_catalog_aux_wait_for_hpd_connect_state(struct dp_catalog *dp_catalog)
> > +{
> > + u32 state, hpd_en, timeout;
> > + struct dp_catalog_private *catalog = container_of(dp_catalog,
> > + struct dp_catalog_private, dp_catalog);
> > +
> > + hpd_en = dp_read_aux(catalog, REG_DP_DP_HPD_CTRL) &
> > + DP_DP_HPD_CTRL_HPD_EN;
>
> Use two lines
>
> hpd_en = dp_read_aux();
> hpd_en &= DP_DP_HPD_CTRL_HPD_EN;
>
> > +
> > + /* no-hpd case */
> > + if (!hpd_en)
> > + return 0;
I guess reading from hardware is fine, but I would have expected the
driver to simply know whether HPD is used or not. Don't need to read
it from hardware, do we? It's not like it's changing from minute to
minute--this is something known at probe time.
> > + /* Poll for HPD connected status */
> > + timeout = dp_read_aux(catalog, REG_DP_DP_HPD_EVENT_TIME_0) &
> > + DP_HPD_CONNECT_TIME_MASK;
> > +
> > + return readl_poll_timeout(catalog->io->dp_controller.aux.base +
> > + REG_DP_DP_HPD_INT_STATUS,
> > + state, state & DP_DP_HPD_STATE_STATUS_CONNECTED,
> > + 2000, timeout);
The timeout that comes from hardware is really stored in microseconds?
That's the units of the value passed to readl_poll_timeout(), right?
Looking at your #defines, that means that your max value here is
0x3fff which is 16383 microseconds or ~16 ms. That doesn't seem like
nearly a long enough timeout to wait for a panel to power itself up.
Also: I'm not sure why exactly you're using the timeout in the
register here. Isn't the time you need to wait more about how long an
eDP panel might conceivably need to power itself on? Most eDP panels
I've seen have max delays of ~200 ms. I'd probably just wait 500 ms to
be on the safe side.
-Doug
