| Message ID | 20240607-bridge-hdmi-connector-v5-5-ab384e6021af@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/msm: make use of the HDMI connector infrastructure | expand |
On 6/7/2024 6:23 AM, Dmitry Baryshkov wrote: > The mode_set callback is deprecated, it doesn't get the > drm_bridge_state, just mode-related argumetns. Turn it into the > atomic_enable callback as suggested by the documentation. > mode_set is deprecated but atomic_mode_set is not. I would rather use atomic_mode_set because moving to atomic_enable() would be incorrect. That would be called after encoder's enable and hence changes the sequence. That was not the intention of this patch. NAK. > Acked-by: Maxime Ripard <mripard@kernel.org> > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 33 ++++++++++++++++++++++++++------- > 1 file changed, 26 insertions(+), 7 deletions(-) > > diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c > index d839c71091dc..f259d6268c0f 100644 > --- a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c > +++ b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c > @@ -129,12 +129,25 @@ static void msm_hdmi_config_avi_infoframe(struct hdmi *hdmi) > static void msm_hdmi_bridge_atomic_pre_enable(struct drm_bridge *bridge, > struct drm_bridge_state *old_bridge_state) > { > + struct drm_atomic_state *state = old_bridge_state->base.state; > struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge); > struct hdmi *hdmi = hdmi_bridge->hdmi; > struct hdmi_phy *phy = hdmi->phy; > + struct drm_encoder *encoder = bridge->encoder; > + struct drm_connector *connector; > + struct drm_connector_state *conn_state; > + struct drm_crtc_state *crtc_state; > + const struct drm_display_mode *mode; > > DBG("power up"); > > + connector = drm_atomic_get_new_connector_for_encoder(state, encoder); > + conn_state = drm_atomic_get_new_connector_state(state, connector); > + crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc); > + mode = &crtc_state->adjusted_mode; > + > + hdmi->pixclock = mode->clock * 1000; > + > if (!hdmi->power_on) { > msm_hdmi_phy_resource_enable(phy); > msm_hdmi_power_on(bridge); > @@ -177,18 +190,24 @@ static void msm_hdmi_bridge_atomic_post_disable(struct drm_bridge *bridge, > } > } > > -static void msm_hdmi_bridge_mode_set(struct drm_bridge *bridge, > - const struct drm_display_mode *mode, > - const struct drm_display_mode *adjusted_mode) > +static void msm_hdmi_bridge_atomic_enable(struct drm_bridge *bridge, > + struct drm_bridge_state *old_bridge_state) > { > + struct drm_atomic_state *state = old_bridge_state->base.state; > struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge); > struct hdmi *hdmi = hdmi_bridge->hdmi; > + struct drm_encoder *encoder = bridge->encoder; > + struct drm_connector *connector; > + struct drm_connector_state *conn_state; > + struct drm_crtc_state *crtc_state; > + const struct drm_display_mode *mode; > int hstart, hend, vstart, vend; > uint32_t frame_ctrl; > > - mode = adjusted_mode; > - > - hdmi->pixclock = mode->clock * 1000; > + connector = drm_atomic_get_new_connector_for_encoder(state, encoder); > + conn_state = drm_atomic_get_new_connector_state(state, connector); > + crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc); > + mode = &crtc_state->adjusted_mode; > > hstart = mode->htotal - mode->hsync_start; > hend = mode->htotal - mode->hsync_start + mode->hdisplay; > @@ -305,8 +324,8 @@ static const struct drm_bridge_funcs msm_hdmi_bridge_funcs = { > .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, > .atomic_reset = drm_atomic_helper_bridge_reset, > .atomic_pre_enable = msm_hdmi_bridge_atomic_pre_enable, > + .atomic_enable = msm_hdmi_bridge_atomic_enable, > .atomic_post_disable = msm_hdmi_bridge_atomic_post_disable, > - .mode_set = msm_hdmi_bridge_mode_set, > .mode_valid = msm_hdmi_bridge_mode_valid, > .edid_read = msm_hdmi_bridge_edid_read, > .detect = msm_hdmi_bridge_detect, >
On Thu, Jun 20, 2024 at 01:27:15PM GMT, Abhinav Kumar wrote: > > > On 6/7/2024 6:23 AM, Dmitry Baryshkov wrote: > > The mode_set callback is deprecated, it doesn't get the > > drm_bridge_state, just mode-related argumetns. Turn it into the > > atomic_enable callback as suggested by the documentation. > > > > mode_set is deprecated but atomic_mode_set is not. There is no atomic_mode_set() in drm_bridge_funcs. Also: * This is deprecated, do not use! * New drivers shall set their mode in the * &drm_bridge_funcs.atomic_enable operation. > > I would rather use atomic_mode_set because moving to atomic_enable() would > be incorrect. > > That would be called after encoder's enable and hence changes the sequence. > That was not the intention of this patch. > > NAK. > > > Acked-by: Maxime Ripard <mripard@kernel.org> > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > --- > > drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 33 ++++++++++++++++++++++++++------- > > 1 file changed, 26 insertions(+), 7 deletions(-)
On 6/20/2024 1:32 PM, Dmitry Baryshkov wrote: > On Thu, Jun 20, 2024 at 01:27:15PM GMT, Abhinav Kumar wrote: >> >> >> On 6/7/2024 6:23 AM, Dmitry Baryshkov wrote: >>> The mode_set callback is deprecated, it doesn't get the >>> drm_bridge_state, just mode-related argumetns. Turn it into the >>> atomic_enable callback as suggested by the documentation. >>> >> >> mode_set is deprecated but atomic_mode_set is not. > > There is no atomic_mode_set() in drm_bridge_funcs. Also: > Please excuse me. I thought since encoder has atomic_mode_set(), bridge has one too. > * This is deprecated, do not use! > * New drivers shall set their mode in the > * &drm_bridge_funcs.atomic_enable operation. > Yes I saw this note but it also says "new drivers" and not really enforcing migrating existing ones which are using modeset to atomic_enable. My concern is that today the timing engine setup happens in encoder's enable() and the hdmi's timing is programmed in mode_set(). Ideally, we should program hdmi's timing registers first before the encoder's timing. Although timing engine is not enabled yet, till post_kickoff, this is changing the sequence. If this really required for rest of this series? >> >> I would rather use atomic_mode_set because moving to atomic_enable() would >> be incorrect. >> >> That would be called after encoder's enable and hence changes the sequence. >> That was not the intention of this patch. >> >> NAK. >> >>> Acked-by: Maxime Ripard <mripard@kernel.org> >>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> >>> --- >>> drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 33 ++++++++++++++++++++++++++------- >>> 1 file changed, 26 insertions(+), 7 deletions(-) > >
On Thu, Jun 20, 2024 at 01:49:33PM GMT, Abhinav Kumar wrote: > > > On 6/20/2024 1:32 PM, Dmitry Baryshkov wrote: > > On Thu, Jun 20, 2024 at 01:27:15PM GMT, Abhinav Kumar wrote: > > > > > > > > > On 6/7/2024 6:23 AM, Dmitry Baryshkov wrote: > > > > The mode_set callback is deprecated, it doesn't get the > > > > drm_bridge_state, just mode-related argumetns. Turn it into the > > > > atomic_enable callback as suggested by the documentation. > > > > > > > > > > mode_set is deprecated but atomic_mode_set is not. > > > > There is no atomic_mode_set() in drm_bridge_funcs. Also: > > > > Please excuse me. I thought since encoder has atomic_mode_set(), bridge has > one too. > > > * This is deprecated, do not use! > > * New drivers shall set their mode in the > > * &drm_bridge_funcs.atomic_enable operation. > > > > Yes I saw this note but it also says "new drivers" and not really enforcing > migrating existing ones which are using modeset to atomic_enable. Well, deprecated functions are supposed to be migrated. > My concern is that today the timing engine setup happens in encoder's > enable() and the hdmi's timing is programmed in mode_set(). > > Ideally, we should program hdmi's timing registers first before the > encoder's timing. > > Although timing engine is not enabled yet, till post_kickoff, this is > changing the sequence. > > If this really required for rest of this series? No, it was just worth doing it as I was doing conversion to atomic_* anyway. I can delay this patch for now. Two questions: 1) Are you sure regarding the HDMI timing registers vs INTF order? I observe the underrun issues while changing modes on db820c. 2) What should be the order between programming of the HDMI timing engine and HDMI PHY? What would be your opinion on moving HDMI timing programming to atomic_pre_enable? (the exact place depends on the answer on the second question). > > > > > > > I would rather use atomic_mode_set because moving to atomic_enable() would > > > be incorrect. > > > > > > That would be called after encoder's enable and hence changes the sequence. > > > That was not the intention of this patch. > > > > > > NAK. > > > > > > > Acked-by: Maxime Ripard <mripard@kernel.org> > > > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > > > --- > > > > drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 33 ++++++++++++++++++++++++++------- > > > > 1 file changed, 26 insertions(+), 7 deletions(-) > > > >
On 6/20/2024 2:24 PM, Dmitry Baryshkov wrote: > On Thu, Jun 20, 2024 at 01:49:33PM GMT, Abhinav Kumar wrote: >> >> >> On 6/20/2024 1:32 PM, Dmitry Baryshkov wrote: >>> On Thu, Jun 20, 2024 at 01:27:15PM GMT, Abhinav Kumar wrote: >>>> >>>> >>>> On 6/7/2024 6:23 AM, Dmitry Baryshkov wrote: >>>>> The mode_set callback is deprecated, it doesn't get the >>>>> drm_bridge_state, just mode-related argumetns. Turn it into the >>>>> atomic_enable callback as suggested by the documentation. >>>>> >>>> >>>> mode_set is deprecated but atomic_mode_set is not. >>> >>> There is no atomic_mode_set() in drm_bridge_funcs. Also: >>> >> >> Please excuse me. I thought since encoder has atomic_mode_set(), bridge has >> one too. >> >>> * This is deprecated, do not use! >>> * New drivers shall set their mode in the >>> * &drm_bridge_funcs.atomic_enable operation. >>> >> >> Yes I saw this note but it also says "new drivers" and not really enforcing >> migrating existing ones which are using modeset to atomic_enable. > > Well, deprecated functions are supposed to be migrated. > Along with rest of the pieces of the driver :) >> My concern is that today the timing engine setup happens in encoder's >> enable() and the hdmi's timing is programmed in mode_set(). >> >> Ideally, we should program hdmi's timing registers first before the >> encoder's timing. >> >> Although timing engine is not enabled yet, till post_kickoff, this is >> changing the sequence. >> >> If this really required for rest of this series? > > No, it was just worth doing it as I was doing conversion to atomic_* > anyway. I can delay this patch for now. > > Two questions: > > 1) Are you sure regarding the HDMI timing registers vs INTF order? I > observe the underrun issues while changing modes on db820c. > Yes this is the order I see in the docs: 1) setup HDMI PHY and PLL 2) setup HDMI video path correctly (HDMI timing registers) 3) setup timing generator to match the HDMI video in (2) 4) Enable timing engine This change is mixing up the order of (2) and (3). > 2) What should be the order between programming of the HDMI timing > engine and HDMI PHY? > Mentioned above. > What would be your opinion on moving HDMI timing programming to > atomic_pre_enable? (the exact place depends on the answer on the second > question). > So -> bridge->pre_enable() : Do HDMI timing programming -> encoder->atomic_enable() : Do timing engine programming -> post_kickoff() does timing engine enable This matches the steps I wrote above. Hence this is fine from my PoV. >> >>>> >>>> I would rather use atomic_mode_set because moving to atomic_enable() would >>>> be incorrect. >>>> >>>> That would be called after encoder's enable and hence changes the sequence. >>>> That was not the intention of this patch. >>>> >>>> NAK. >>>> >>>>> Acked-by: Maxime Ripard <mripard@kernel.org> >>>>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> >>>>> --- >>>>> drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 33 ++++++++++++++++++++++++++------- >>>>> 1 file changed, 26 insertions(+), 7 deletions(-) >>> >>> >
On Thu, Jun 20, 2024 at 03:05:16PM GMT, Abhinav Kumar wrote: > > > On 6/20/2024 2:24 PM, Dmitry Baryshkov wrote: > > On Thu, Jun 20, 2024 at 01:49:33PM GMT, Abhinav Kumar wrote: > > > > > > > > > On 6/20/2024 1:32 PM, Dmitry Baryshkov wrote: > > > > On Thu, Jun 20, 2024 at 01:27:15PM GMT, Abhinav Kumar wrote: > > > > > > > > > > > > > > > On 6/7/2024 6:23 AM, Dmitry Baryshkov wrote: > > > > > > The mode_set callback is deprecated, it doesn't get the > > > > > > drm_bridge_state, just mode-related argumetns. Turn it into the > > > > > > atomic_enable callback as suggested by the documentation. > > > > > > > > > > > > > > > > mode_set is deprecated but atomic_mode_set is not. > > > > > > > > There is no atomic_mode_set() in drm_bridge_funcs. Also: > > > > > > > > > > Please excuse me. I thought since encoder has atomic_mode_set(), bridge has > > > one too. > > > > > > > * This is deprecated, do not use! > > > > * New drivers shall set their mode in the > > > > * &drm_bridge_funcs.atomic_enable operation. > > > > > > > > > > Yes I saw this note but it also says "new drivers" and not really enforcing > > > migrating existing ones which are using modeset to atomic_enable. > > > > Well, deprecated functions are supposed to be migrated. > > > > Along with rest of the pieces of the driver :) Step by step :-) > > > > My concern is that today the timing engine setup happens in encoder's > > > enable() and the hdmi's timing is programmed in mode_set(). > > > > > > Ideally, we should program hdmi's timing registers first before the > > > encoder's timing. > > > > > > Although timing engine is not enabled yet, till post_kickoff, this is > > > changing the sequence. > > > > > > If this really required for rest of this series? > > > > No, it was just worth doing it as I was doing conversion to atomic_* > > anyway. I can delay this patch for now. > > > > Two questions: > > > > 1) Are you sure regarding the HDMI timing registers vs INTF order? I > > observe the underrun issues while changing modes on db820c. > > > > Yes this is the order I see in the docs: > > 1) setup HDMI PHY and PLL > 2) setup HDMI video path correctly (HDMI timing registers) > 3) setup timing generator to match the HDMI video in (2) > 4) Enable timing engine Thanks! > > This change is mixing up the order of (2) and (3). > > > 2) What should be the order between programming of the HDMI timing > > engine and HDMI PHY? > > > > Mentioned above. > > > What would be your opinion on moving HDMI timing programming to > > atomic_pre_enable? (the exact place depends on the answer on the second > > question). > > > > So > > -> bridge->pre_enable() : Do HDMI timing programming > -> encoder->atomic_enable() : Do timing engine programming > -> post_kickoff() does timing engine enable > > This matches the steps I wrote above. > > Hence this is fine from my PoV. Ack, I'll skip this patch for now and repost it separately (moving the code to pre_enable function). > > > > > > > > > > > > > > I would rather use atomic_mode_set because moving to atomic_enable() would > > > > > be incorrect. > > > > > > > > > > That would be called after encoder's enable and hence changes the sequence. > > > > > That was not the intention of this patch. > > > > > > > > > > NAK. > > > > > > > > > > > Acked-by: Maxime Ripard <mripard@kernel.org> > > > > > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > > > > > --- > > > > > > drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 33 ++++++++++++++++++++++++++------- > > > > > > 1 file changed, 26 insertions(+), 7 deletions(-) > > > > > > > > > >
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c index d839c71091dc..f259d6268c0f 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi_bridge.c @@ -129,12 +129,25 @@ static void msm_hdmi_config_avi_infoframe(struct hdmi *hdmi) static void msm_hdmi_bridge_atomic_pre_enable(struct drm_bridge *bridge, struct drm_bridge_state *old_bridge_state) { + struct drm_atomic_state *state = old_bridge_state->base.state; struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge); struct hdmi *hdmi = hdmi_bridge->hdmi; struct hdmi_phy *phy = hdmi->phy; + struct drm_encoder *encoder = bridge->encoder; + struct drm_connector *connector; + struct drm_connector_state *conn_state; + struct drm_crtc_state *crtc_state; + const struct drm_display_mode *mode; DBG("power up"); + connector = drm_atomic_get_new_connector_for_encoder(state, encoder); + conn_state = drm_atomic_get_new_connector_state(state, connector); + crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc); + mode = &crtc_state->adjusted_mode; + + hdmi->pixclock = mode->clock * 1000; + if (!hdmi->power_on) { msm_hdmi_phy_resource_enable(phy); msm_hdmi_power_on(bridge); @@ -177,18 +190,24 @@ static void msm_hdmi_bridge_atomic_post_disable(struct drm_bridge *bridge, } } -static void msm_hdmi_bridge_mode_set(struct drm_bridge *bridge, - const struct drm_display_mode *mode, - const struct drm_display_mode *adjusted_mode) +static void msm_hdmi_bridge_atomic_enable(struct drm_bridge *bridge, + struct drm_bridge_state *old_bridge_state) { + struct drm_atomic_state *state = old_bridge_state->base.state; struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge); struct hdmi *hdmi = hdmi_bridge->hdmi; + struct drm_encoder *encoder = bridge->encoder; + struct drm_connector *connector; + struct drm_connector_state *conn_state; + struct drm_crtc_state *crtc_state; + const struct drm_display_mode *mode; int hstart, hend, vstart, vend; uint32_t frame_ctrl; - mode = adjusted_mode; - - hdmi->pixclock = mode->clock * 1000; + connector = drm_atomic_get_new_connector_for_encoder(state, encoder); + conn_state = drm_atomic_get_new_connector_state(state, connector); + crtc_state = drm_atomic_get_new_crtc_state(state, conn_state->crtc); + mode = &crtc_state->adjusted_mode; hstart = mode->htotal - mode->hsync_start; hend = mode->htotal - mode->hsync_start + mode->hdisplay; @@ -305,8 +324,8 @@ static const struct drm_bridge_funcs msm_hdmi_bridge_funcs = { .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, .atomic_reset = drm_atomic_helper_bridge_reset, .atomic_pre_enable = msm_hdmi_bridge_atomic_pre_enable, + .atomic_enable = msm_hdmi_bridge_atomic_enable, .atomic_post_disable = msm_hdmi_bridge_atomic_post_disable, - .mode_set = msm_hdmi_bridge_mode_set, .mode_valid = msm_hdmi_bridge_mode_valid, .edid_read = msm_hdmi_bridge_edid_read, .detect = msm_hdmi_bridge_detect,