Commit b53ac1ee authored by Pierre Moreau's avatar Pierre Moreau Committed by Ben Skeggs

drm/nouveau/bl: Do not register interface if Apple GMUX detected

The Apple GMUX is the one managing the backlight, so there is no need for
Nouveau to register its own backlight interface.

v2: Do not split information message on two lines as it prevents from grepping
    it, as pointed out by Lukas Wunner

v3: Add a missing end-of-line character to the printed message
Signed-off-by: default avatarPierre Moreau <pierre.morrow@free.fr>
Reviewed-by: default avatarLukas Wunner <lukas@wunner.de>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent db1a0ae2
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
* Register locations derived from NVClock by Roderick Colenbrander * Register locations derived from NVClock by Roderick Colenbrander
*/ */
#include <linux/apple-gmux.h>
#include <linux/backlight.h> #include <linux/backlight.h>
#include <linux/idr.h> #include <linux/idr.h>
...@@ -267,6 +268,11 @@ nouveau_backlight_init(struct drm_device *dev) ...@@ -267,6 +268,11 @@ nouveau_backlight_init(struct drm_device *dev)
struct nvif_device *device = &drm->device; struct nvif_device *device = &drm->device;
struct drm_connector *connector; struct drm_connector *connector;
if (apple_gmux_present()) {
NV_INFO(drm, "Apple GMUX detected: not registering Nouveau backlight interface\n");
return 0;
}
INIT_LIST_HEAD(&drm->bl_connectors); INIT_LIST_HEAD(&drm->bl_connectors);
list_for_each_entry(connector, &dev->mode_config.connector_list, head) { list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
......
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