| Message ID | 20151107141244.AB7616E242@gabe.freedesktop.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 05 Nov 2015, Lukas Wunner <lukas@wunner.de> wrote: > 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> Pushed to drm-intel-next-queued, thanks for the patch. BR, Jani. > --- > drivers/gpu/drm/i915/intel_lvds.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c > index 7f39b8a..baf72c1 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)) {
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 7f39b8a..baf72c1 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)) {
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> --- drivers/gpu/drm/i915/intel_lvds.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)