This reverts commit d2a4bb6f8bc8cf2d788adf7e59b5b52fe3a3333c.
So, turns out that this ended up just breaking things. While many laptops incorrectly advertise themselves as supporting PWM backlight controls, they actually will only work with DPCD backlight controls. Unfortunately, it also seems there are a number of systems which advertise DPCD backlight controls in their eDP DPCD but don't actually support them. Talking with some laptop manufacturers has shown it might be possible to probe this support via the EDID (!?!?) but I haven't been able to confirm that this would work on any other manufacturer's systems.
So in the mean time, we'll just revert this commit for now and go back to the old way of doing things. Additionally, let's print out an info message into the kernel log so that it's a little more obvious if a system needs DPCD backlight controls enabled through a quirk (which we'll introduce in the next commit).
Signed-off-by: Lyude Paul lyude@redhat.com Cc: Jani Nikula jani.nikula@intel.com --- drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c index e86feebef299..48276237b362 100644 --- a/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c +++ b/drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c @@ -328,16 +328,15 @@ intel_dp_aux_display_control_capable(struct intel_connector *connector) int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector) { struct intel_panel *panel = &intel_connector->panel; - enum intel_backlight_type type = - to_i915(intel_connector->base.dev)->vbt.backlight.type; + struct drm_i915_private *dev_priv = to_i915(intel_connector->base.dev);
if (i915_modparams.enable_dpcd_backlight == 0 || (i915_modparams.enable_dpcd_backlight == -1 && - !intel_dp_aux_display_control_capable(intel_connector))) + dev_priv->vbt.backlight.type != INTEL_BACKLIGHT_VESA_EDP_AUX_INTERFACE)) return -ENODEV;
- if (type != INTEL_BACKLIGHT_VESA_EDP_AUX_INTERFACE) - DRM_DEBUG_DRIVER("Ignoring VBT backlight type\n"); + if (!intel_dp_aux_display_control_capable(intel_connector)) + return -ENODEV;
panel->backlight.setup = intel_dp_aux_setup_backlight; panel->backlight.enable = intel_dp_aux_enable_backlight;