Commit 336aae5c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

ACPI: scan: Register platform devices for backlight device objects 



ACPI device objects associated with backlight interfaces are special
because they are ACPI companions of PCI devices (GPUs), but the
interfaces exposed by them resemble platform device one.

Currently, the ACPI video driver binds to them with the help of a
special "synthetic" device ID regardless of the pairing with the PCI
devices, but since it is generally better to use platform drivers for
handling such interfaces, the plan is to convert that drviver into a
platform one.

However, for this purpose, platform devices corresponding to the
ACPI backlight device objects need to be registered, so update
acpi_bus_attach() to apply the default ACPI enumeration to them
and modify acpi_create_platform_device() to avoid bailing out early
if a "physical" device is already attached to a backlight ACPI device
object.

In addition, update acpi_companion_match() to return a valid struct
acpi_device pointer if the ACPI companion of the given device is a
backlight ACPI device object, which will facilitate driver matching
for platform devices corresponding to those objects.

No intentional functional impact.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarArmin Wolf <W_Armin@gmx.de>
Link: https://patch.msgid.link/5081593.31r3eYUQgx@rafael.j.wysocki
parent 9460eaae

drivers/acpi/acpi_platform.c

+2 −2
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev, 
	int count = 0;



	/* If the ACPI node already has a physical device attached, skip it. */

	if (adev->physical_node_count)

	if (adev->physical_node_count && !adev->pnp.type.backlight)

		return NULL;



	match = acpi_match_acpi_device(forbidden_id_list, adev);
@@ -135,7 +135,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev, 
		}

	}



	if (adev->device_type == ACPI_BUS_TYPE_DEVICE) {

	if (adev->device_type == ACPI_BUS_TYPE_DEVICE && !adev->pnp.type.backlight) {

		struct list_head resource_list = LIST_HEAD_INIT(resource_list);



		count = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);

drivers/acpi/bus.c

+3 −0
Original line number Diff line number Diff line
@@ -761,6 +761,9 @@ const struct acpi_device *acpi_companion_match(const struct device *dev) 
	if (list_empty(&adev->pnp.ids))

		return NULL;



	if (adev->pnp.type.backlight)

		return adev;



	return acpi_primary_dev_companion(adev, dev);

}

drivers/acpi/scan.c

+2 −1
Original line number Diff line number Diff line
@@ -2350,7 +2350,8 @@ static int acpi_bus_attach(struct acpi_device *device, void *first_pass) 
	if (ret < 0)

		return 0;



	if (device->pnp.type.platform_id || device->flags.enumeration_by_parent)

	if (device->pnp.type.platform_id || device->pnp.type.backlight ||

	    device->flags.enumeration_by_parent)

		acpi_default_enumeration(device);

	else

		acpi_device_set_enumerated(device);