diff options
| author |   Luca Tettamanti <kronos.it@gmail.com> | 2012-08-02 11:39:38 -0400 |
|---|---|---|
| committer |   Alex Deucher <alexander.deucher@amd.com> | 2012-09-20 13:10:36 -0400 |
| commit | 92fdf89aa95de32dba1cb44fe7f5c54824b4b2c4 (patch) | |
| tree | 75d509fd7b255fe67162c026c3435eb0f2db9e89 /drivers/gpu/drm/radeon/radeon_acpi.c | |
| parent | ACPI video: allow events handlers to veto the keypress (diff) | |
| download | linux-dev-92fdf89aa95de32dba1cb44fe7f5c54824b4b2c4.tar.xz linux-dev-92fdf89aa95de32dba1cb44fe7f5c54824b4b2c4.zip | |
drm/radeon: block the keypress on ATIF events
The AMD ACPI interface may use ACPI_VIDEO_NOTIFY_PROBE to signal SBIOS
requests; block the keypress in this case since the user did not
actually press the mode switch key.
Signed-off-by: Luca Tettamanti <kronos.it@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_acpi.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_acpi.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_acpi.c b/drivers/gpu/drm/radeon/radeon_acpi.c index ea22f4416f48..3486292892b5 100644 --- a/drivers/gpu/drm/radeon/radeon_acpi.c +++ b/drivers/gpu/drm/radeon/radeon_acpi.c @@ -301,7 +301,12 @@ int radeon_atif_handler(struct radeon_device *rdev, } /* TODO: check other events */ - return NOTIFY_OK; + /* We've handled the event, stop the notifier chain. The ACPI interface + * overloads ACPI_VIDEO_NOTIFY_PROBE, we don't want to send that to + * userspace if the event was generated only to signal a SBIOS + * request. + */ + return NOTIFY_BAD; } static int radeon_acpi_event(struct notifier_block *nb, |