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

Commit f4fe968b authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents 4cbe5a55 991083ba

drivers/gpu/drm/nouveau/nv50_gpio.c

+3 −0
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/nouveau/nvd0_display.c

+2 −2
Original line number Diff line number Diff line
@@ -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)