From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 3 Nov 2010 23:56:12 +0000 (+1000)
Subject: drm/nouveau: don't expose backlight control when available through ACPI
X-Git-Tag: Ubuntu-5.2.0-15.16~22985^2~3^2~2
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=5bead799d3f8f1500c4b59301b8a2732a92f559f;p=mirror_ubuntu-eoan-kernel.git

drm/nouveau: don't expose backlight control when available through ACPI

Avoid confusing userspace by not publishing backlight controls if ACPI
equivalents are available.

Reported-by: Aaron Sowry <aaron@aeneby.se>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
index 406228f4a2a0..b14c81110575 100644
--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
@@ -31,6 +31,7 @@
  */
 
 #include <linux/backlight.h>
+#include <linux/acpi.h>
 
 #include "drmP.h"
 #include "nouveau_drv.h"
@@ -136,6 +137,14 @@ int nouveau_backlight_init(struct drm_device *dev)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
 
+#ifdef CONFIG_ACPI
+	if (acpi_video_backlight_support()) {
+		NV_INFO(dev, "ACPI backlight interface available, "
+			     "not registering our own\n");
+		return 0;
+	}
+#endif
+
 	switch (dev_priv->card_type) {
 	case NV_40:
 		return nouveau_nv40_backlight_init(dev);