Commit c0845493 authored by Lyude Paul's avatar Lyude Paul Committed by Greg Kroah-Hartman

drm/amdgpu: Suppress keypresses from ACPI_VIDEO events

commit 582f58de upstream.

Currently we return NOTIFY_DONE for any event which we don't think is
ours. However, many laptops will send more then just an ATIF event and
will also send an ACPI_VIDEO_NOTIFY_PROBE event as well. Since we don't
check for this, we return NOTIFY_DONE which causes a keypress for the
ACPI event to be propogated to userspace. This is the equivalent of
someone pressing the display key on a laptop every time there's a
hotplug event.

So, check for ACPI_VIDEO_NOTIFY_PROBE events and suppress keypresses
from them.
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3f43692a
...@@ -358,7 +358,9 @@ static int amdgpu_atif_get_sbios_requests(struct amdgpu_atif *atif, ...@@ -358,7 +358,9 @@ static int amdgpu_atif_get_sbios_requests(struct amdgpu_atif *atif,
* *
* Checks the acpi event and if it matches an atif event, * Checks the acpi event and if it matches an atif event,
* handles it. * handles it.
* Returns NOTIFY code *
* Returns:
* NOTIFY_BAD or NOTIFY_DONE, depending on the event.
*/ */
static int amdgpu_atif_handler(struct amdgpu_device *adev, static int amdgpu_atif_handler(struct amdgpu_device *adev,
struct acpi_bus_event *event) struct acpi_bus_event *event)
...@@ -372,11 +374,16 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev, ...@@ -372,11 +374,16 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev,
if (strcmp(event->device_class, ACPI_VIDEO_CLASS) != 0) if (strcmp(event->device_class, ACPI_VIDEO_CLASS) != 0)
return NOTIFY_DONE; return NOTIFY_DONE;
/* Is this actually our event? */
if (!atif || if (!atif ||
!atif->notification_cfg.enabled || !atif->notification_cfg.enabled ||
event->type != atif->notification_cfg.command_code) event->type != atif->notification_cfg.command_code) {
/* Not our event */ /* These events will generate keypresses otherwise */
return NOTIFY_DONE; if (event->type == ACPI_VIDEO_NOTIFY_PROBE)
return NOTIFY_BAD;
else
return NOTIFY_DONE;
}
if (atif->functions.sbios_requests) { if (atif->functions.sbios_requests) {
struct atif_sbios_requests req; struct atif_sbios_requests req;
...@@ -385,7 +392,7 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev, ...@@ -385,7 +392,7 @@ static int amdgpu_atif_handler(struct amdgpu_device *adev,
count = amdgpu_atif_get_sbios_requests(atif, &req); count = amdgpu_atif_get_sbios_requests(atif, &req);
if (count <= 0) if (count <= 0)
return NOTIFY_DONE; return NOTIFY_BAD;
DRM_DEBUG_DRIVER("ATIF: %d pending SBIOS requests\n", count); DRM_DEBUG_DRIVER("ATIF: %d pending SBIOS requests\n", count);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment