diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 4ad12dde5938b52217d9fb56ad83506e2303d6cb..81b11f83c666c3552ee02f216c7e9a46b5e3a8ec 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1815,29 +1815,6 @@ void intel_dp_sink_set_decompression_state(struct intel_dp *intel_dp, enabledisable(enable)); } -static void -intel_edp_init_source_oui(struct intel_dp *intel_dp, bool careful) -{ - struct drm_i915_private *i915 = dp_to_i915(intel_dp); - u8 oui[] = { 0x00, 0xaa, 0x01 }; - u8 buf[3] = { 0 }; - - /* - * During driver init, we want to be careful and avoid changing the source OUI if it's - * already set to what we want, so as to avoid clearing any state by accident - */ - if (careful) { - 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"); - - if (memcmp(oui, buf, sizeof(oui)) == 0) - return; - } - - if (drm_dp_dpcd_write(&intel_dp->aux, DP_SOURCE_OUI, oui, sizeof(oui)) < 0) - drm_err(&i915->drm, "Failed to write source OUI\n"); -} - /* If the device supports it, try to set the power state appropriately */ void intel_dp_set_power(struct intel_dp *intel_dp, u8 mode) { @@ -1859,10 +1836,6 @@ void intel_dp_set_power(struct intel_dp *intel_dp, u8 mode) lspcon_resume(dp_to_dig_port(intel_dp)); - /* Write the source OUI as early as possible */ - if (intel_dp_is_edp(intel_dp)) - intel_edp_init_source_oui(intel_dp, false); - /* * When turning on, we need to retry for 1ms to give the sink * time to wake up. @@ -2480,12 +2453,6 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp) if (DISPLAY_VER(dev_priv) >= 10) intel_dp_get_dsc_sink_cap(intel_dp); - /* - * If needed, program our source OUI so we can make various Intel-specific AUX services - * available (such as HDR backlight controls) - */ - intel_edp_init_source_oui(intel_dp, true); - intel_edp_mso_init(intel_dp); return true;