svn commit: r278945 - head/sys/powerpc/powermac
Justin Hibbits
jhibbits at FreeBSD.org
Wed Feb 18 07:34:34 UTC 2015
Author: jhibbits
Date: Wed Feb 18 07:34:32 2015
New Revision: 278945
URL: https://svnweb.freebsd.org/changeset/base/278945
Log:
Match the right backlight driver.
Some ATI-based PowerBooks use the string 'mnca' in the backlight controller
device tree entry, so account for this and don't use nVidia when it's not an
nVidia device.
MFC after: 3 weeks
Modified:
head/sys/powerpc/powermac/atibl.c
head/sys/powerpc/powermac/nvbl.c
Modified: head/sys/powerpc/powermac/atibl.c
==============================================================================
--- head/sys/powerpc/powermac/atibl.c Wed Feb 18 06:55:11 2015 (r278944)
+++ head/sys/powerpc/powermac/atibl.c Wed Feb 18 07:34:32 2015 (r278945)
@@ -38,6 +38,11 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <dev/ofw/openfirm.h>
+#include <dev/pci/pcivar.h>
+
+#ifndef PCI_VENDOR_ID_ATI
+#define PCI_VENDOR_ID_ATI 0x1002
+#endif
/* From the xf86-video-ati driver's radeon_reg.h */
#define RADEON_LVDS_GEN_CNTL 0x02d0
@@ -121,7 +126,9 @@ atibl_probe(device_t dev)
if (OF_getprop(handle, "backlight-control", &control, sizeof(control)) < 0)
return (ENXIO);
- if (strcmp(control, "ati") != 0)
+ if (strcmp(control, "ati") != 0 &&
+ (strcmp(control, "mnca") != 0 ||
+ pci_get_vendor(device_get_parent(dev)) != 0x1002))
return (ENXIO);
device_set_desc(dev, "PowerBook backlight for ATI graphics");
Modified: head/sys/powerpc/powermac/nvbl.c
==============================================================================
--- head/sys/powerpc/powermac/nvbl.c Wed Feb 18 06:55:11 2015 (r278944)
+++ head/sys/powerpc/powermac/nvbl.c Wed Feb 18 07:34:32 2015 (r278945)
@@ -38,6 +38,9 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <dev/ofw/openfirm.h>
+#include <dev/pci/pcivar.h>
+
+#define PCI_VENDOR_ID_NVIDIA 0x10de
#define NVIDIA_BRIGHT_MIN (0x0ec)
#define NVIDIA_BRIGHT_MAX (0x538)
@@ -102,7 +105,8 @@ nvbl_probe(device_t dev)
if (OF_getprop(handle, "backlight-control", &control, sizeof(control)) < 0)
return (ENXIO);
- if (strcmp(control, "mnca") != 0)
+ if ((strcmp(control, "mnca") != 0) ||
+ pci_get_vendor(device_get_parent(dev)) != PCI_VENDOR_ID_NVIDIA)
return (ENXIO);
device_set_desc(dev, "PowerBook backlight for nVidia graphics");
More information about the svn-src-all
mailing list