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

Commit 6419ec78 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-next-4.13' of git://people.freedesktop.org/~agd5f/linux into drm-next 

single r700 fix.
* 'drm-next-4.13' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: Fix eDP for single-display iMac10,1 (v2)
parents 0355e22a 564d8a2c

drivers/gpu/drm/radeon/atombios_encoders.c

+11 −2
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "radeon_asic.h"

#include "atom.h"

#include <linux/backlight.h>

#include <linux/dmi.h>



extern int atom_debug;
@@ -2184,9 +2185,17 @@ int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder, int fe_idx) 
		goto assigned;

	}



	/* on DCE32 and encoder can driver any block so just crtc id */

	/*

	 * On DCE32 any encoder can drive any block so usually just use crtc id,

	 * but Apple thinks different at least on iMac10,1, so there use linkb,

	 * otherwise the internal eDP panel will stay dark.

	 */

	if (ASIC_IS_DCE32(rdev)) {

		if (dmi_match(DMI_PRODUCT_NAME, "iMac10,1"))

			enc_idx = (dig->linkb) ? 1 : 0;

		else

			enc_idx = radeon_crtc->crtc_id;



		goto assigned;

	}