Commit 5bead799 authored by Ben Skeggs's avatar Ben Skeggs

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: default avatarAaron Sowry <aaron@aeneby.se>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent cac8f05b
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
*/ */
#include <linux/backlight.h> #include <linux/backlight.h>
#include <linux/acpi.h>
#include "drmP.h" #include "drmP.h"
#include "nouveau_drv.h" #include "nouveau_drv.h"
...@@ -136,6 +137,14 @@ int nouveau_backlight_init(struct drm_device *dev) ...@@ -136,6 +137,14 @@ int nouveau_backlight_init(struct drm_device *dev)
{ {
struct drm_nouveau_private *dev_priv = dev->dev_private; 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) { switch (dev_priv->card_type) {
case NV_40: case NV_40:
return nouveau_nv40_backlight_init(dev); return nouveau_nv40_backlight_init(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment