1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/gpu/drm/nouveau/nouveau_backlight.c b/drivers/gpu/drm/nouveau/nouveau_backlight.c
index a34cd35d4965..8b1ca4add2ed 100644
--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
@@ -30,6 +30,7 @@
  * Register locations derived from NVClock by Roderick Colenbrander
  */
 
+#include <linux/apple-gmux.h>
 #include <linux/backlight.h>
 #include <linux/idr.h>
 
@@ -267,6 +268,11 @@ nouveau_backlight_init(struct drm_device *dev)
         struct nvif_device *device = &drm->device;
         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);
 
         list_for_each_entry(connector, &dev->mode_config.connector_list, head) {