| Message ID | 20200109152028.28260-2-mario.kleiner.de@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/2] drm/amd/display: Reorder detect_edp_sink_caps before link settings read. | expand |
On 2020-01-09 10:20 a.m., Mario Kleiner wrote: > read_current_link_settings_on_detect() on eDP 1.4+ may use the > edp_supported_link_rates table which is set up by > detect_edp_sink_caps(), so that function needs to be called first. > > Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com> > Cc: Martin Leung <martin.leung@amd.com> Reviewed-by: Harry Wentland <harry.wentland@amd.com> This also fixes our assumption that retrieve_link_cap is the first DPCD reads we perform during detection. Harry > --- > drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c > index cef8c1ba9797..5ea4a1675259 100644 > --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c > +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c > @@ -817,8 +817,8 @@ static bool dc_link_detect_helper(struct dc_link *link, > } > > case SIGNAL_TYPE_EDP: { > - read_current_link_settings_on_detect(link); > detect_edp_sink_caps(link); > + read_current_link_settings_on_detect(link); > sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C_OVER_AUX; > sink_caps.signal = SIGNAL_TYPE_EDP; > break; >
Applied. Thanks! Alex On Thu, Jan 9, 2020 at 1:41 PM Harry Wentland <hwentlan@amd.com> wrote: > > On 2020-01-09 10:20 a.m., Mario Kleiner wrote: > > read_current_link_settings_on_detect() on eDP 1.4+ may use the > > edp_supported_link_rates table which is set up by > > detect_edp_sink_caps(), so that function needs to be called first. > > > > Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com> > > Cc: Martin Leung <martin.leung@amd.com> > > Reviewed-by: Harry Wentland <harry.wentland@amd.com> > > This also fixes our assumption that retrieve_link_cap is the first DPCD > reads we perform during detection. > > Harry > > > --- > > drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c > > index cef8c1ba9797..5ea4a1675259 100644 > > --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c > > +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c > > @@ -817,8 +817,8 @@ static bool dc_link_detect_helper(struct dc_link *link, > > } > > > > case SIGNAL_TYPE_EDP: { > > - read_current_link_settings_on_detect(link); > > detect_edp_sink_caps(link); > > + read_current_link_settings_on_detect(link); > > sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C_OVER_AUX; > > sink_caps.signal = SIGNAL_TYPE_EDP; > > break; > > > _______________________________________________ > amd-gfx mailing list > amd-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/amd-gfx
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c index cef8c1ba9797..5ea4a1675259 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c @@ -817,8 +817,8 @@ static bool dc_link_detect_helper(struct dc_link *link, } case SIGNAL_TYPE_EDP: { - read_current_link_settings_on_detect(link); detect_edp_sink_caps(link); + read_current_link_settings_on_detect(link); sink_caps.transaction_type = DDC_TRANSACTION_TYPE_I2C_OVER_AUX; sink_caps.signal = SIGNAL_TYPE_EDP; break;
read_current_link_settings_on_detect() on eDP 1.4+ may use the edp_supported_link_rates table which is set up by detect_edp_sink_caps(), so that function needs to be called first. Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com> Cc: Martin Leung <martin.leung@amd.com> --- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)