On Wed, 06 Nov 2024, Matt Roper <matthew.d.roper@xxxxxxxxx> wrote:
> On Wed, Nov 06, 2024 at 06:23:25PM +0200, Jani Nikula wrote:
>> Commit 1f12d63a14d7 ("drm/i915/dp: Write the source OUI for non-eDP
>> sinks as well") started writing source OUI for non-eDP sinks as well,
>> increasing the possibilities of hitting read/write failures either due
>> to the sink behaviour or hotplug or whatever.
>>
>> Even before that, commit 3fb0501f0c07 ("drm/i915/display/dp: Reduce log
>> level for SOURCE OUI write failures") already reduced write failures to
>> info level when source OUI was just for eDP.
>>
>> Further reduce the log level to just debug. Switch to struct intel_dp
>> while at it.
>
> Did you mean intel_display here rather than intel_dp?
Yes, fixed while pushing!
>
> Aside from that,
>
> Reviewed-by: Matt Roper <matthew.d.roper@xxxxxxxxx>
Thanks!
BR,
Jani.
>
>
> Matt
>
>>
>> Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/3372
>> Cc: Clint Taylor <clinton.a.taylor@xxxxxxxxx>
>> Cc: Imre Deak <imre.deak@xxxxxxxxx>
>> Signed-off-by: Jani Nikula <jani.nikula@xxxxxxxxx>
>> ---
>> drivers/gpu/drm/i915/display/intel_dp.c | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
>> index 5b918363df16..95c71e425fbe 100644
>> --- a/drivers/gpu/drm/i915/display/intel_dp.c
>> +++ b/drivers/gpu/drm/i915/display/intel_dp.c
>> @@ -3432,7 +3432,7 @@ void intel_dp_sink_disable_decompression(struct intel_atomic_state *state,
>> static void
>> intel_dp_init_source_oui(struct intel_dp *intel_dp)
>> {
>> - struct drm_i915_private *i915 = dp_to_i915(intel_dp);
>> + struct intel_display *display = to_intel_display(intel_dp);
>> u8 oui[] = { 0x00, 0xaa, 0x01 };
>> u8 buf[3] = {};
>>
>> @@ -3446,7 +3446,7 @@ intel_dp_init_source_oui(struct intel_dp *intel_dp)
>> * already set to what we want, so as to avoid clearing any state by accident
>> */
>> if (drm_dp_dpcd_read(&intel_dp->aux, DP_SOURCE_OUI, buf, sizeof(buf)) < 0)
>> - drm_err(&i915->drm, "Failed to read source OUI\n");
>> + drm_dbg_kms(display->drm, "Failed to read source OUI\n");
>>
>> if (memcmp(oui, buf, sizeof(oui)) == 0) {
>> /* Assume the OUI was written now. */
>> @@ -3455,7 +3455,7 @@ intel_dp_init_source_oui(struct intel_dp *intel_dp)
>> }
>>
>> if (drm_dp_dpcd_write(&intel_dp->aux, DP_SOURCE_OUI, oui, sizeof(oui)) < 0) {
>> - drm_info(&i915->drm, "Failed to write source OUI\n");
>> + drm_dbg_kms(display->drm, "Failed to write source OUI\n");
>> WRITE_ONCE(intel_dp->oui_valid, false);
>> }
>>
>> --
>> 2.39.5
>>
--
Jani Nikula, Intel
