On Thu, 2009-04-16 at 00:49 +0800, Matthew Garrett wrote: > Does this help? If so, we don't need the following patch. >http://marc.info/?l=linux-acpi&m=123967828429865&w=2 >check whether the ACPI video driver is deferrable only when KMS is set > diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c > index 6942772..8dc1fd3 100644 > --- a/drivers/gpu/drm/i915/i915_opregion.c > +++ b/drivers/gpu/drm/i915/i915_opregion.c > @@ -370,11 +370,8 @@ int intel_opregion_init(struct drm_device *dev, int resume) > if (mboxes & MBOX_ACPI) { > DRM_DEBUG("Public ACPI methods supported\n"); > opregion->acpi = base + OPREGION_ACPI_OFFSET; > - if (drm_core_check_feature(dev, DRIVER_MODESET)) { > + if (drm_core_check_feature(dev, DRIVER_MODESET)) > intel_didl_outputs(dev); > - if (!resume) > - acpi_video_register(); > - } > } else { > DRM_DEBUG("Public ACPI methods not supported\n"); > err = -ENOTSUPP; > @@ -391,6 +388,10 @@ int intel_opregion_init(struct drm_device *dev, int resume) > opregion->asle = base + OPREGION_ASLE_OFFSET; > } > > + if (!resume) > + acpi_video_register(); > + > + > /* Notify BIOS we are ready to handle ACPI video ext notifs. > * Right now, all the events are handled by the ACPI video module. > * We don't actually need to do anything with them. */ > -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
