summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_lvds.c
diff options
context:
space:
mode:
authorLukas Wunner2015-11-05 09:30:50 +0100
committerJani Nikula2015-11-11 16:45:31 +0100
commitaf9b9c193184233d470bd71a0edc245feea34da4 (patch)
treee4d4ac3035a9c1429af6415db33cddbd5a049520 /drivers/gpu/drm/i915/intel_lvds.c
parentdrm/i915: Move the fbdev async_schedule() into intel_fbdev.c (diff)
downloadkernel-qcow2-linux-af9b9c193184233d470bd71a0edc245feea34da4.tar.gz
kernel-qcow2-linux-af9b9c193184233d470bd71a0edc245feea34da4.tar.xz
kernel-qcow2-linux-af9b9c193184233d470bd71a0edc245feea34da4.zip
drm/i915: Clean up LVDS register handling harder
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>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_lvds.c')
-rw-r--r--drivers/gpu/drm/i915/intel_lvds.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 7f39b8ad88ae..baf72c193b52 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -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)) {