Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'drm-nouveau-fixes' of git://anongit.freedesktop.org/nouveau/linux-2.6 into drm-fixes

These two fix the MacBook Pro 2012 Retina display.

* 'drm-nouveau-fixes' of git://anongit.freedesktop.org/nouveau/linux-2.6:
  drm/nv50-/gpio: initialise to vbios defaults during init
  drm/nvd0/disp: hopefully fix selection of 6/8bpc mode on DP outputs
Dave Airlie 13 years ago
parent
4cbe5a555f 991083ba60
commit
f4fe968b61
2 changed files with 5 additions and 2 deletions
Split View Show Diff Stats
  1. 3 0
      drivers/gpu/drm/nouveau/nv50_gpio.c
  2. 2 2
      drivers/gpu/drm/nouveau/nvd0_display.c

+ 3 - 0
drivers/gpu/drm/nouveau/nv50_gpio.c
View File 

@@ -115,6 +115,9 @@ nv50_gpio_init(struct drm_device *dev)
 
 {
 
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
 
 
+	/* initialise gpios and routing to vbios defaults */
 
+	nouveau_gpio_reset(dev);
 
+
 
 	/* disable, and ack any pending gpio interrupts */
 
 	nv_wr32(dev, 0xe050, 0x00000000);
 
 	nv_wr32(dev, 0xe054, 0xffffffff);

+ 2 - 2
drivers/gpu/drm/nouveau/nvd0_display.c
View File 

@@ -1510,10 +1510,10 @@ nvd0_sor_mode_set(struct drm_encoder *encoder, struct drm_display_mode *umode,
 
 	case OUTPUT_DP:
 
 		if (nv_connector->base.display_info.bpc == 6) {
 
 			nv_encoder->dp.datarate = mode->clock * 18 / 8;
 
-			syncs |= 0x00000140;
 
+			syncs |= 0x00000002 << 6;
 
 		} else {
 
 			nv_encoder->dp.datarate = mode->clock * 24 / 8;
 
-			syncs |= 0x00000180;
 
+			syncs |= 0x00000005 << 6;
 
 		}
 
 
 		if (nv_encoder->dcb->sorconf.link & 1)