This reverts commit 9251a71db62ca9cc7e7cf364218610b0f018c291.
This was never discussed with anybody Nouveau related and we would have NACKed this change immediately.
We have a better workaround, which makes it actually work with Nouveau. No idea why the comment mentions the Nvidia driver and assumes it gives any weight to the reasoning.... we don't care about out of tree drivers.
Nouveau does support RTD3, but we had some issues with that. And we even have a better fix for this issue. Also, can we _please_ do it in a way worthy of an upstream community the next time?
If some distribution feels like they have to please companies not wanting to be part of the linux community, please do so downstream and don't try to push something like this upstream.
Signed-off-by: Karol Herbst kherbst@redhat.com CC: Alex Hung alex.hung@canonical.com CC: Rafael J. Wysocki rafael.j.wysocki@intel.com CC: Dave Airlie airlied@redhat.com CC: Lyude Paul lyude@redhat.com CC: Ben Skeggs bskeggs@redhat.com --- drivers/acpi/osi.c | 9 --------- 1 file changed, 9 deletions(-)
diff --git a/drivers/acpi/osi.c b/drivers/acpi/osi.c index 56cc95b6b724..f5d559a2ff14 100644 --- a/drivers/acpi/osi.c +++ b/drivers/acpi/osi.c @@ -44,15 +44,6 @@ osi_setup_entries[OSI_STRING_ENTRIES_MAX] __initdata = { {"Processor Device", true}, {"3.0 _SCP Extensions", true}, {"Processor Aggregator Device", true}, - /* - * Linux-Dell-Video is used by BIOS to disable RTD3 for NVidia graphics - * cards as RTD3 is not supported by drivers now. Systems with NVidia - * cards will hang without RTD3 disabled. - * - * Once NVidia drivers officially support RTD3, this _OSI strings can - * be removed if both new and old graphics cards are supported. - */ - {"Linux-Dell-Video", true}, };
static u32 acpi_osi_handler(acpi_string interface, u32 supported)