drm/i915: Add missing MacBook Pro models with dual channel LVDS

Submitted by Lukas Wunner on April 12, 2015, 7:10 p.m.

Details

Message ID 20150416071459.DB68B6E96B@gabe.freedesktop.org
State New
Headers show

Not browsing as part of any series.

Commit Message

Lukas Wunner April 12, 2015, 7:10 p.m.
Single channel LVDS maxes out at 112 MHz. All 17" models with i915
graphics had a resolution of 1920x1200 (193 MHz), necessitating dual
channel LVDS. The 15" pre-retina models had either 1440x900 (106 MHz)
or 1680x1050 (119 MHz), both versions used dual channel LVDS even
though the smaller one would have fit into a single channel.

Signed-off-by: Lukas Wunner <lukas@wunner.de>
Tested-by: Lukas Wunner <lukas@wunner.de>
---
 drivers/gpu/drm/i915/intel_lvds.c | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index 071b96d..417ccab 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -812,12 +812,28 @@  static int intel_dual_link_lvds_callback(const struct dmi_system_id *id)
 static const struct dmi_system_id intel_dual_link_lvds[] = {
 	{
 		.callback = intel_dual_link_lvds_callback,
-		.ident = "Apple MacBook Pro (Core i5/i7 Series)",
+		.ident = "Apple MacBook Pro 15\" (2010)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro6,2"),
+		},
+	},
+	{
+		.callback = intel_dual_link_lvds_callback,
+		.ident = "Apple MacBook Pro 15\" (2011)",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
 			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro8,2"),
 		},
 	},
+	{
+		.callback = intel_dual_link_lvds_callback,
+		.ident = "Apple MacBook Pro 15\" (2012)",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro9,1"),
+		},
+	},
 	{ }	/* terminating entry */
 };
 
@@ -847,6 +863,11 @@  static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder)
 	if (i915.lvds_channel_mode > 0)
 		return i915.lvds_channel_mode == 2;
 
+	/* single channel LVDS is limited to 112 kHz */
+	if (lvds_encoder->attached_connector->base.panel.fixed_mode->clock
+	    > 112999)
+		return true;
+
 	if (dmi_check_system(intel_dual_link_lvds))
 		return true;
 
@@ -1104,6 +1125,8 @@  void intel_lvds_init(struct drm_device *dev)
 out:
 	mutex_unlock(&dev->mode_config.mutex);
 
+	intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
+
 	lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder);
 	DRM_DEBUG_KMS("detected %s-link lvds configuration\n",
 		      lvds_encoder->is_dual_link ? "dual" : "single");
@@ -1118,7 +1141,6 @@  out:
 	}
 	drm_connector_register(connector);
 
-	intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
 	intel_panel_setup_backlight(connector, INVALID_PIPE);
 
 	return;

Comments

On Sun, 12 Apr 2015, Lukas Wunner <lukas@wunner.de> wrote:
> Single channel LVDS maxes out at 112 MHz. All 17" models with i915
> graphics had a resolution of 1920x1200 (193 MHz), necessitating dual
> channel LVDS. The 15" pre-retina models had either 1440x900 (106 MHz)
> or 1680x1050 (119 MHz), both versions used dual channel LVDS even
> though the smaller one would have fit into a single channel.
>
> Signed-off-by: Lukas Wunner <lukas@wunner.de>
> Tested-by: Lukas Wunner <lukas@wunner.de>

Acked-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/i915/intel_lvds.c | 26 ++++++++++++++++++++++++--
>  1 file changed, 24 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> index 071b96d..417ccab 100644
> --- a/drivers/gpu/drm/i915/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/intel_lvds.c
> @@ -812,12 +812,28 @@ static int intel_dual_link_lvds_callback(const struct dmi_system_id *id)
>  static const struct dmi_system_id intel_dual_link_lvds[] = {
>  	{
>  		.callback = intel_dual_link_lvds_callback,
> -		.ident = "Apple MacBook Pro (Core i5/i7 Series)",
> +		.ident = "Apple MacBook Pro 15\" (2010)",
> +		.matches = {
> +			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro6,2"),
> +		},
> +	},
> +	{
> +		.callback = intel_dual_link_lvds_callback,
> +		.ident = "Apple MacBook Pro 15\" (2011)",
>  		.matches = {
>  			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
>  			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro8,2"),
>  		},
>  	},
> +	{
> +		.callback = intel_dual_link_lvds_callback,
> +		.ident = "Apple MacBook Pro 15\" (2012)",
> +		.matches = {
> +			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro9,1"),
> +		},
> +	},
>  	{ }	/* terminating entry */
>  };
>  
> @@ -847,6 +863,11 @@ static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder)
>  	if (i915.lvds_channel_mode > 0)
>  		return i915.lvds_channel_mode == 2;
>  
> +	/* single channel LVDS is limited to 112 kHz */
> +	if (lvds_encoder->attached_connector->base.panel.fixed_mode->clock
> +	    > 112999)
> +		return true;
> +
>  	if (dmi_check_system(intel_dual_link_lvds))
>  		return true;
>  
> @@ -1104,6 +1125,8 @@ void intel_lvds_init(struct drm_device *dev)
>  out:
>  	mutex_unlock(&dev->mode_config.mutex);
>  
> +	intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
> +
>  	lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder);
>  	DRM_DEBUG_KMS("detected %s-link lvds configuration\n",
>  		      lvds_encoder->is_dual_link ? "dual" : "single");
> @@ -1118,7 +1141,6 @@ out:
>  	}
>  	drm_connector_register(connector);
>  
> -	intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
>  	intel_panel_setup_backlight(connector, INVALID_PIPE);
>  
>  	return;
> -- 
> 1.8.5.2 (Apple Git-48)
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
On ke, 2015-04-29 at 17:21 +0300, Jani Nikula wrote:
> On Sun, 12 Apr 2015, Lukas Wunner <lukas@wunner.de> wrote:
> > Single channel LVDS maxes out at 112 MHz. All 17" models with i915
> > graphics had a resolution of 1920x1200 (193 MHz), necessitating dual
> > channel LVDS. The 15" pre-retina models had either 1440x900 (106 MHz)
> > or 1680x1050 (119 MHz), both versions used dual channel LVDS even
> > though the smaller one would have fit into a single channel.
> >
> > Signed-off-by: Lukas Wunner <lukas@wunner.de>
> > Tested-by: Lukas Wunner <lukas@wunner.de>
> 
> Acked-by: Jani Nikula <jani.nikula@intel.com>
> 
> > ---
> >  drivers/gpu/drm/i915/intel_lvds.c | 26 ++++++++++++++++++++++++--
> >  1 file changed, 24 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
> > index 071b96d..417ccab 100644
> > --- a/drivers/gpu/drm/i915/intel_lvds.c
> > +++ b/drivers/gpu/drm/i915/intel_lvds.c
> > @@ -812,12 +812,28 @@ static int intel_dual_link_lvds_callback(const struct dmi_system_id *id)
> >  static const struct dmi_system_id intel_dual_link_lvds[] = {
> >  	{
> >  		.callback = intel_dual_link_lvds_callback,
> > -		.ident = "Apple MacBook Pro (Core i5/i7 Series)",
> > +		.ident = "Apple MacBook Pro 15\" (2010)",
> > +		.matches = {
> > +			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
> > +			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro6,2"),
> > +		},
> > +	},
> > +	{
> > +		.callback = intel_dual_link_lvds_callback,
> > +		.ident = "Apple MacBook Pro 15\" (2011)",
> >  		.matches = {
> >  			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
> >  			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro8,2"),
> >  		},
> >  	},
> > +	{
> > +		.callback = intel_dual_link_lvds_callback,
> > +		.ident = "Apple MacBook Pro 15\" (2012)",
> > +		.matches = {
> > +			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),
> > +			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro9,1"),
> > +		},
> > +	},
> >  	{ }	/* terminating entry */
> >  };
> >  
> > @@ -847,6 +863,11 @@ static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder)
> >  	if (i915.lvds_channel_mode > 0)
> >  		return i915.lvds_channel_mode == 2;
> >  
> > +	/* single channel LVDS is limited to 112 kHz */

s/kHz/MHz/

> > +	if (lvds_encoder->attached_connector->base.panel.fixed_mode->clock
> > +	    > 112999)
> > +		return true;
> > +
> >  	if (dmi_check_system(intel_dual_link_lvds))
> >  		return true;
> >  
> > @@ -1104,6 +1125,8 @@ void intel_lvds_init(struct drm_device *dev)
> >  out:
> >  	mutex_unlock(&dev->mode_config.mutex);
> >  
> > +	intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
> > +
> >  	lvds_encoder->is_dual_link = compute_is_dual_link_lvds(lvds_encoder);
> >  	DRM_DEBUG_KMS("detected %s-link lvds configuration\n",
> >  		      lvds_encoder->is_dual_link ? "dual" : "single");
> > @@ -1118,7 +1141,6 @@ out:
> >  	}
> >  	drm_connector_register(connector);
> >  
> > -	intel_panel_init(&intel_connector->panel, fixed_mode, downclock_mode);
> >  	intel_panel_setup_backlight(connector, INVALID_PIPE);
> >  
> >  	return;
> > -- 
> > 1.8.5.2 (Apple Git-48)
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>