Commit 0f746650 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm+acpi-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI and power management fixes from Rafael Wysocki:
 "These are just two fixes, a revert of the would-be backlight fix that
  didn't work and an intel_pstate fix for two problems related to
  maximum P-state selection.

  Specifics:

   - Revert of the ACPI video commit that I hoped would help fix
     backlight problems related to Windows 8 compatibility on some
     systems.  Unfortunately, it turned out to cause problems to happen
     too.

   - Fix for two problems in intel_pstate, a possible failure to respond
     to a load change on a quiet system and a possible failure to select
     the highest available P-state on some systems.  From Dirk
     Brandewie"

* tag 'pm+acpi-3.11-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  Revert "ACPI / video / i915: No ACPI backlight if firmware expects Windows 8"
  cpufreq / intel_pstate: Change to scale off of max P-state
parents a9b5f023 8e5c2b77

drivers/acpi/internal.h

+0 −2
Original line number Diff line number Diff line
@@ -169,10 +169,8 @@ int acpi_create_platform_device(struct acpi_device *adev, 
  -------------------------------------------------------------------------- */

#if defined(CONFIG_ACPI_VIDEO) || defined(CONFIG_ACPI_VIDEO_MODULE)

bool acpi_video_backlight_quirks(void);

bool acpi_video_verify_backlight_support(void);

#else

static inline bool acpi_video_backlight_quirks(void) { return false; }

static inline bool acpi_video_verify_backlight_support(void) { return false; }

#endif



#endif /* _ACPI_INTERNAL_H_ */

drivers/acpi/video.c

+8 −59
Original line number Diff line number Diff line
@@ -911,7 +911,7 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) 
	if (acpi_video_init_brightness(device))

		return;



	if (acpi_video_verify_backlight_support()) {

	if (acpi_video_backlight_support()) {

		struct backlight_properties props;

		struct pci_dev *pdev;

		acpi_handle acpi_parent;
@@ -1366,8 +1366,8 @@ acpi_video_switch_brightness(struct acpi_video_device *device, int event) 
	unsigned long long level_current, level_next;

	int result = -EINVAL;



	/* no warning message if acpi_backlight=vendor or a quirk is used */

	if (!acpi_video_verify_backlight_support())

	/* no warning message if acpi_backlight=vendor is used */

	if (!acpi_video_backlight_support())

		return 0;



	if (!device->brightness)
@@ -1875,46 +1875,6 @@ static int acpi_video_bus_remove(struct acpi_device *device) 
	return 0;

}



static acpi_status video_unregister_backlight(acpi_handle handle, u32 lvl,

					      void *context, void **rv)

{

	struct acpi_device *acpi_dev;

	struct acpi_video_bus *video;

	struct acpi_video_device *dev, *next;



	if (acpi_bus_get_device(handle, &acpi_dev))

		return AE_OK;



	if (acpi_match_device_ids(acpi_dev, video_device_ids))

		return AE_OK;



	video = acpi_driver_data(acpi_dev);

	if (!video)

		return AE_OK;



	acpi_video_bus_stop_devices(video);

	mutex_lock(&video->device_list_lock);

	list_for_each_entry_safe(dev, next, &video->video_device_list, entry) {

		if (dev->backlight) {

			backlight_device_unregister(dev->backlight);

			dev->backlight = NULL;

			kfree(dev->brightness->levels);

			kfree(dev->brightness);

		}

		if (dev->cooling_dev) {

			sysfs_remove_link(&dev->dev->dev.kobj,

					  "thermal_cooling");

			sysfs_remove_link(&dev->cooling_dev->device.kobj,

					  "device");

			thermal_cooling_device_unregister(dev->cooling_dev);

			dev->cooling_dev = NULL;

		}

	}

	mutex_unlock(&video->device_list_lock);

	acpi_video_bus_start_devices(video);

	return AE_OK;

}



static int __init is_i740(struct pci_dev *dev)

{

	if (dev->device == 0x00D1)
@@ -1946,25 +1906,14 @@ static int __init intel_opregion_present(void) 
	return opregion;

}



int __acpi_video_register(bool backlight_quirks)

int acpi_video_register(void)

{

	bool no_backlight;

	int result;



	no_backlight = backlight_quirks ? acpi_video_backlight_quirks() : false;



	int result = 0;

	if (register_count) {

		/*

		 * If acpi_video_register() has been called already, don't try

		 * to register acpi_video_bus, but unregister backlight devices

		 * if no backlight support is requested.

		 * if the function of acpi_video_register is already called,

		 * don't register the acpi_vide_bus again and return no error.

		 */

		if (no_backlight)

			acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,

					    ACPI_UINT32_MAX,

					    video_unregister_backlight,

					    NULL, NULL, NULL);



		return 0;

	}
@@ -1980,7 +1929,7 @@ int __acpi_video_register(bool backlight_quirks) 


	return 0;

}

EXPORT_SYMBOL(__acpi_video_register);

EXPORT_SYMBOL(acpi_video_register);



void acpi_video_unregister(void)

{

drivers/acpi/video_detect.c

+1 −14
Original line number Diff line number Diff line
@@ -238,12 +238,7 @@ static void acpi_video_caps_check(void) 


bool acpi_video_backlight_quirks(void)

{

	if (acpi_gbl_osi_data >= ACPI_OSI_WIN_8) {

		acpi_video_caps_check();

		acpi_video_support |= ACPI_VIDEO_SKIP_BACKLIGHT;

		return true;

	}

	return false;

	return acpi_gbl_osi_data >= ACPI_OSI_WIN_8;

}

EXPORT_SYMBOL(acpi_video_backlight_quirks);
@@ -291,14 +286,6 @@ int acpi_video_backlight_support(void) 
}

EXPORT_SYMBOL(acpi_video_backlight_support);



/* For the ACPI video driver use only. */

bool acpi_video_verify_backlight_support(void)

{

	return (acpi_video_support & ACPI_VIDEO_SKIP_BACKLIGHT) ?

		false : acpi_video_backlight_support();

}

EXPORT_SYMBOL(acpi_video_verify_backlight_support);



/*

 * Use acpi_backlight=vendor/video to force that backlight switching

 * is processed by vendor specific acpi drivers or video.ko driver.

drivers/cpufreq/intel_pstate.c

+6 −6
Original line number Diff line number Diff line
@@ -103,10 +103,10 @@ struct pstate_adjust_policy { 
static struct pstate_adjust_policy default_policy = {

	.sample_rate_ms = 10,

	.deadband = 0,

	.setpoint = 109,

	.p_gain_pct = 17,

	.setpoint = 97,

	.p_gain_pct = 20,

	.d_gain_pct = 0,

	.i_gain_pct = 4,

	.i_gain_pct = 0,

};



struct perf_limits {
@@ -468,12 +468,12 @@ static inline void intel_pstate_set_sample_time(struct cpudata *cpu) 
static inline int intel_pstate_get_scaled_busy(struct cpudata *cpu)

{

	int32_t busy_scaled;

	int32_t core_busy, turbo_pstate, current_pstate;

	int32_t core_busy, max_pstate, current_pstate;



	core_busy = int_tofp(cpu->samples[cpu->sample_ptr].core_pct_busy);

	turbo_pstate = int_tofp(cpu->pstate.turbo_pstate);

	max_pstate = int_tofp(cpu->pstate.max_pstate);

	current_pstate = int_tofp(cpu->pstate.current_pstate);

	busy_scaled = mul_fp(core_busy, div_fp(turbo_pstate, current_pstate));

	busy_scaled = mul_fp(core_busy, div_fp(max_pstate, current_pstate));



	return fp_toint(busy_scaled);

}

drivers/gpu/drm/i915/i915_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -1648,7 +1648,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	if (INTEL_INFO(dev)->num_pipes) {

		/* Must be done after probing outputs */

		intel_opregion_init(dev);

		acpi_video_register_with_quirks();

		acpi_video_register();

	}



	if (IS_GEN5(dev))

CRA Git | Maintained and supported by SUSTech CRA and CCSE