From d4a1da2962951ac5d430dd129df8d4ccfa712183 Mon Sep 17 00:00:00 2001
From: Luca Tettamanti <kronos.it@gmail.com>
Date: Thu, 2 Aug 2012 11:39:38 -0400
Subject: [PATCH] --- yaml --- r: 329535 b: refs/heads/master c:
 92fdf89aa95de32dba1cb44fe7f5c54824b4b2c4 h: refs/heads/master i:   329533:
 87bf6894bcd7786af5622d69734f9b8e7ab09aad   329531:
 9399b29540d74007b7a832142fb2080195077259   329527:
 8f9c0500451428ebb4ee01a236a05b4adfbed0ed   329519:
 d44eded499582ae4c8edbd9223e1a0e0cfb50520   329503:
 e06a7b5049247298aa0bb031c3ceceb57ce4aa03   329471:
 c541d921b8ac97c466c04a237b1cc29925cbf072 v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/gpu/drm/radeon/radeon_acpi.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3568a47d5868..0fc915d213d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a37c65df9dcbd1c891df2b4a94157999b654841
+refs/heads/master: 92fdf89aa95de32dba1cb44fe7f5c54824b4b2c4
diff --git a/trunk/drivers/gpu/drm/radeon/radeon_acpi.c b/trunk/drivers/gpu/drm/radeon/radeon_acpi.c
index ea22f4416f48..3486292892b5 100644
--- a/trunk/drivers/gpu/drm/radeon/radeon_acpi.c
+++ b/trunk/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,