Merge branch 'bugzilla-13048' into release (1fe94d37) · Commits · e / devices / android_kernel_teracube_2e

drivers/gpu/drm/i915/i915_opregion.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -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. */