---

yaml --- r: 329535 b: refs/heads/master c: 92fdf89 h: refs/heads/master i: 329533: 87bf689 329531: 9399b29 329527: 8f9c050 329519: d44eded 329503: e06a7b5 329471: c541d92 v: v3
git-mirror · Sep 20, 2012 · d4a1da2 · d4a1da2
1 parent 401d140
commit d4a1da2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git 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
@@ -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,