Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 565dcd46 authored by Paul Collins's avatar Paul Collins Committed by Dave Airlie
Browse files

drm/i915: skip LVDS initialization on Apple Mac Mini 



The Apple Mac Mini falsely reports LVDS.  Use DMI to check whether we
are running on a Mac Mini, and skip LVDS initialization if that proves
to be the case.

Signed-off-by: default avatarPaul Collins <paul@ondioline.org>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarDave Airlie <airlied@linux.ie>
parent e2f0ba97

drivers/gpu/drm/i915/intel_lvds.c

+13 −34
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
 *      Jesse Barnes <jesse.barnes@intel.com>

 */



#include <linux/dmi.h>

#include <linux/i2c.h>

#include "drmP.h"

#include "drm.h"
@@ -403,6 +404,16 @@ void intel_lvds_init(struct drm_device *dev) 
	u32 lvds;

	int pipe;



	/* Blacklist machines that we know falsely report LVDS. */

	/* FIXME: add a check for the Aopen Mini PC */



	/* Apple Mac Mini Core Duo and Mac Mini Core 2 Duo */

	if(dmi_match(DMI_PRODUCT_NAME, "Macmini1,1") ||

	   dmi_match(DMI_PRODUCT_NAME, "Macmini2,1")) {

		DRM_DEBUG("Skipping LVDS initialization for Apple Mac Mini\n");

		return;

	}



	intel_output = kzalloc(sizeof(struct intel_output), GFP_KERNEL);

	if (!intel_output) {

		return;
@@ -456,7 +467,7 @@ void intel_lvds_init(struct drm_device *dev) 
			dev_priv->panel_fixed_mode =

				drm_mode_duplicate(dev, scan);

			mutex_unlock(&dev->mode_config.mutex);

			goto out; /* FIXME: check for quirks */

			goto out;

		}

		mutex_unlock(&dev->mode_config.mutex);

	}
@@ -490,7 +501,7 @@ void intel_lvds_init(struct drm_device *dev) 
		if (dev_priv->panel_fixed_mode) {

			dev_priv->panel_fixed_mode->type |=

				DRM_MODE_TYPE_PREFERRED;

			goto out; /* FIXME: check for quirks */

			goto out;

		}

	}
@@ -498,38 +509,6 @@ void intel_lvds_init(struct drm_device *dev) 
	if (!dev_priv->panel_fixed_mode)

		goto failed;



	/* FIXME: detect aopen & mac mini type stuff automatically? */

	/*

	 * Blacklist machines with BIOSes that list an LVDS panel without

	 * actually having one.

	 */

	if (IS_I945GM(dev)) {

		/* aopen mini pc */

		if (dev->pdev->subsystem_vendor == 0xa0a0)

			goto failed;



		if ((dev->pdev->subsystem_vendor == 0x8086) &&

		    (dev->pdev->subsystem_device == 0x7270)) {

			/* It's a Mac Mini or Macbook Pro.

			 *

			 * Apple hardware is out to get us.  The macbook pro

			 * has a real LVDS panel, but the mac mini does not,

			 * and they have the same device IDs.  We'll

			 * distinguish by panel size, on the assumption

			 * that Apple isn't about to make any machines with an

			 * 800x600 display.

			 */



			if (dev_priv->panel_fixed_mode != NULL &&

			    dev_priv->panel_fixed_mode->hdisplay == 800 &&

			    dev_priv->panel_fixed_mode->vdisplay == 600) {

				DRM_DEBUG("Suspected Mac Mini, ignoring the LVDS\n");

				goto failed;

			}

		}

	}





out:

	drm_sysfs_connector_add(connector);

	return;