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,