platform-drivers-x86 for v6.7-4
Changes: - tablet-mode-switch events fix - kernel-doc warning fixes The following is an automated shortlog grouped by driver: intel_ips: - fix kernel-doc formatting intel-vbtn: - Fix missing tablet-mode-switch events thinkpad_acpi: - fix kernel-doc warnings -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQSCSUwRdwTNL2MhaBlZrE9hU+XOMQUCZXsmeAAKCRBZrE9hU+XO MTloAQD4LVq4SjFt6ioTe/rViBNEp2SzMIVg7TCGVmK03l/wVQEAthR0Wm0m+PhK CNKXB0PhFkf1rPLznaO1nRh6MIYZUQE= =Uqjo -----END PGP SIGNATURE----- Merge tag 'platform-drivers-x86-v6.7-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86 Pull x86 platform driver fixes from Ilpo Järvinen: - tablet-mode-switch events fix - kernel-doc warning fixes * tag 'platform-drivers-x86-v6.7-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86: platform/x86: intel_ips: fix kernel-doc formatting platform/x86: thinkpad_acpi: fix kernel-doc warnings platform/x86: intel-vbtn: Fix missing tablet-mode-switch events
This commit is contained in:
Linus Torvalds
commit
976600c6da
@ -73,10 +73,10 @@ struct intel_vbtn_priv {
|
||||
bool wakeup_mode;
|
||||
};
|
||||
|
||||
static void detect_tablet_mode(struct platform_device *device)
|
||||
static void detect_tablet_mode(struct device *dev)
|
||||
{
|
||||
struct intel_vbtn_priv *priv = dev_get_drvdata(&device->dev);
|
||||
acpi_handle handle = ACPI_HANDLE(&device->dev);
|
||||
struct intel_vbtn_priv *priv = dev_get_drvdata(dev);
|
||||
acpi_handle handle = ACPI_HANDLE(dev);
|
||||
unsigned long long vgbs;
|
||||
acpi_status status;
|
||||
int m;
|
||||
@ -89,6 +89,8 @@ static void detect_tablet_mode(struct platform_device *device)
|
||||
input_report_switch(priv->switches_dev, SW_TABLET_MODE, m);
|
||||
m = (vgbs & VGBS_DOCK_MODE_FLAG) ? 1 : 0;
|
||||
input_report_switch(priv->switches_dev, SW_DOCK, m);
|
||||
|
||||
input_sync(priv->switches_dev);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -134,7 +136,7 @@ static int intel_vbtn_input_setup(struct platform_device *device)
|
||||
priv->switches_dev->id.bustype = BUS_HOST;
|
||||
|
||||
if (priv->has_switches) {
|
||||
detect_tablet_mode(device);
|
||||
detect_tablet_mode(&device->dev);
|
||||
|
||||
ret = input_register_device(priv->switches_dev);
|
||||
if (ret)
|
||||
@ -198,6 +200,9 @@ static void notify_handler(acpi_handle handle, u32 event, void *context)
|
||||
autorelease = val && (!ke_rel || ke_rel->type == KE_IGNORE);
|
||||
|
||||
sparse_keymap_report_event(input_dev, event, val, autorelease);
|
||||
|
||||
/* Some devices need this to report further events */
|
||||
acpi_evaluate_object(handle, "VBDL", NULL, NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -352,7 +357,13 @@ static void intel_vbtn_pm_complete(struct device *dev)
|
||||
|
||||
static int intel_vbtn_pm_resume(struct device *dev)
|
||||
{
|
||||
struct intel_vbtn_priv *priv = dev_get_drvdata(dev);
|
||||
|
||||
intel_vbtn_pm_complete(dev);
|
||||
|
||||
if (priv->has_switches)
|
||||
detect_tablet_mode(dev);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
@ -590,6 +590,8 @@ static void ips_disable_gpu_turbo(struct ips_driver *ips)
|
||||
* @ips: IPS driver struct
|
||||
*
|
||||
* Check whether the MCP is over its thermal or power budget.
|
||||
*
|
||||
* Returns: %true if the temp or power has exceeded its maximum, else %false
|
||||
*/
|
||||
static bool mcp_exceeded(struct ips_driver *ips)
|
||||
{
|
||||
@ -619,6 +621,8 @@ static bool mcp_exceeded(struct ips_driver *ips)
|
||||
* @cpu: CPU number to check
|
||||
*
|
||||
* Check a given CPU's average temp or power is over its limit.
|
||||
*
|
||||
* Returns: %true if the temp or power has exceeded its maximum, else %false
|
||||
*/
|
||||
static bool cpu_exceeded(struct ips_driver *ips, int cpu)
|
||||
{
|
||||
@ -645,6 +649,8 @@ static bool cpu_exceeded(struct ips_driver *ips, int cpu)
|
||||
* @ips: IPS driver struct
|
||||
*
|
||||
* Check the MCH temp & power against their maximums.
|
||||
*
|
||||
* Returns: %true if the temp or power has exceeded its maximum, else %false
|
||||
*/
|
||||
static bool mch_exceeded(struct ips_driver *ips)
|
||||
{
|
||||
@ -742,12 +748,13 @@ static void update_turbo_limits(struct ips_driver *ips)
|
||||
* - down (at TDP limit)
|
||||
* - adjust both CPU and GPU down if possible
|
||||
*
|
||||
cpu+ gpu+ cpu+gpu- cpu-gpu+ cpu-gpu-
|
||||
cpu < gpu < cpu+gpu+ cpu+ gpu+ nothing
|
||||
cpu < gpu >= cpu+gpu-(mcp<) cpu+gpu-(mcp<) gpu- gpu-
|
||||
cpu >= gpu < cpu-gpu+(mcp<) cpu- cpu-gpu+(mcp<) cpu-
|
||||
cpu >= gpu >= cpu-gpu- cpu-gpu- cpu-gpu- cpu-gpu-
|
||||
* |cpu+ gpu+ cpu+gpu- cpu-gpu+ cpu-gpu-
|
||||
* cpu < gpu < |cpu+gpu+ cpu+ gpu+ nothing
|
||||
* cpu < gpu >= |cpu+gpu-(mcp<) cpu+gpu-(mcp<) gpu- gpu-
|
||||
* cpu >= gpu < |cpu-gpu+(mcp<) cpu- cpu-gpu+(mcp<) cpu-
|
||||
* cpu >= gpu >=|cpu-gpu- cpu-gpu- cpu-gpu- cpu-gpu-
|
||||
*
|
||||
* Returns: %0
|
||||
*/
|
||||
static int ips_adjust(void *data)
|
||||
{
|
||||
@ -935,11 +942,13 @@ static void monitor_timeout(struct timer_list *t)
|
||||
* @data: ips driver structure
|
||||
*
|
||||
* This is the main function for the IPS driver. It monitors power and
|
||||
* tempurature in the MCP and adjusts CPU and GPU power clams accordingly.
|
||||
* temperature in the MCP and adjusts CPU and GPU power clamps accordingly.
|
||||
*
|
||||
* We keep a 5s moving average of power consumption and tempurature. Using
|
||||
* We keep a 5s moving average of power consumption and temperature. Using
|
||||
* that data, along with CPU vs GPU preference, we adjust the power clamps
|
||||
* up or down.
|
||||
*
|
||||
* Returns: %0 on success or -errno on error
|
||||
*/
|
||||
static int ips_monitor(void *data)
|
||||
{
|
||||
@ -1146,6 +1155,8 @@ static void dump_thermal_info(struct ips_driver *ips)
|
||||
* Handle temperature limit trigger events, generally by lowering the clamps.
|
||||
* If we're at a critical limit, we clamp back to the lowest possible value
|
||||
* to prevent emergency shutdown.
|
||||
*
|
||||
* Returns: IRQ_NONE or IRQ_HANDLED
|
||||
*/
|
||||
static irqreturn_t ips_irq_handler(int irq, void *arg)
|
||||
{
|
||||
@ -1293,9 +1304,12 @@ static void ips_debugfs_init(struct ips_driver *ips)
|
||||
|
||||
/**
|
||||
* ips_detect_cpu - detect whether CPU supports IPS
|
||||
* @ips: IPS driver struct
|
||||
*
|
||||
* Walk our list and see if we're on a supported CPU. If we find one,
|
||||
* return the limits for it.
|
||||
*
|
||||
* Returns: the &ips_mcp_limits struct that matches the boot CPU or %NULL
|
||||
*/
|
||||
static struct ips_mcp_limits *ips_detect_cpu(struct ips_driver *ips)
|
||||
{
|
||||
@ -1352,6 +1366,8 @@ static struct ips_mcp_limits *ips_detect_cpu(struct ips_driver *ips)
|
||||
* monitor and control graphics turbo mode. If we can find them, we can
|
||||
* enable graphics turbo, otherwise we must disable it to avoid exceeding
|
||||
* thermal and power limits in the MCP.
|
||||
*
|
||||
* Returns: %true if the required symbols are found, else %false
|
||||
*/
|
||||
static bool ips_get_i915_syms(struct ips_driver *ips)
|
||||
{
|
||||
|
||||
@ -512,10 +512,10 @@ struct tpacpi_quirk {
|
||||
* Iterates over a quirks list until one is found that matches the
|
||||
* ThinkPad's vendor, BIOS and EC model.
|
||||
*
|
||||
* Returns 0 if nothing matches, otherwise returns the quirks field of
|
||||
* Returns: %0 if nothing matches, otherwise returns the quirks field of
|
||||
* the matching &struct tpacpi_quirk entry.
|
||||
*
|
||||
* The match criteria is: vendor, ec and bios much match.
|
||||
* The match criteria is: vendor, ec and bios must match.
|
||||
*/
|
||||
static unsigned long __init tpacpi_check_quirks(
|
||||
const struct tpacpi_quirk *qlist,
|
||||
@ -9303,7 +9303,7 @@ static struct tpacpi_battery_driver_data battery_info;
|
||||
|
||||
/* ACPI helpers/functions/probes */
|
||||
|
||||
/**
|
||||
/*
|
||||
* This evaluates a ACPI method call specific to the battery
|
||||
* ACPI extension. The specifics are that an error is marked
|
||||
* in the 32rd bit of the response, so we just check that here.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user