drm/i915: Clean up LVDS register handling harder
authorLukas Wunner <lukas@wunner.de>
Thu, 5 Nov 2015 08:30:50 +0000 (09:30 +0100)
committerJani Nikula <jani.nikula@intel.com>
Wed, 11 Nov 2015 15:45:31 +0000 (17:45 +0200)
Minor fixup to d0669d007542 ("drm/i915: Clean up LVDS register
handling") which intended to read lvds_reg just once at the
beginning of intel_lvds_init() and use that throughout the rest
of the function but accidentally missed one register readout.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Lukas Wunner <lukas@wunner.de>
Link: http://patchwork.freedesktop.org/patch/msgid/20151107141244.AB7616E242@gabe.freedesktop.org
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_lvds.c

index 7f39b8a..baf72c1 100644 (file)
@@ -1164,8 +1164,7 @@ out:
        DRM_DEBUG_KMS("detected %s-link lvds configuration\n",
                      lvds_encoder->is_dual_link ? "dual" : "single");
 
-       lvds_encoder->a3_power = I915_READ(lvds_encoder->reg) &
-                                LVDS_A3_POWER_MASK;
+       lvds_encoder->a3_power = lvds & LVDS_A3_POWER_MASK;
 
        lvds_connector->lid_notifier.notifier_call = intel_lid_notify;
        if (acpi_lid_notifier_register(&lvds_connector->lid_notifier)) {