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

Commit 36a21fe6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "Fixes for big 3 drivers:

  nouveau: revert earlier MBP fix, put a dmi based MBP fix in its place
  (fixes a regression we found on some Dell eDP panels doing some
  internal testing)

  radeon: revert pll fixes, real fix is too invasive, fix scratch leak

  intel: 3 minor fixes, one for HDMI audio."

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/nouveau: add dmi quirk for gpio reset
  drm/radeon: Prevent leak of scratch register on resume from suspend
  Revert "drm/nv50-/gpio: initialise to vbios defaults during init"
  Revert "drm/radeon: rework pll selection (v3)"
  drm/i915: HDMI - Clear Audio Enable bit for Hot Plug
  drm/i915: Reduce a pin-leak BUG into a WARN
  drm/i915: enable lvds pin pairs before dpll on gen2
parents 6551d6fe 017a27e7

drivers/gpu/drm/i915/i915_gem.c

+2 −1
Original line number Diff line number Diff line
@@ -3242,7 +3242,8 @@ i915_gem_object_pin(struct drm_i915_gem_object *obj, 
{

	int ret;



	BUG_ON(obj->pin_count == DRM_I915_GEM_OBJECT_MAX_PIN_COUNT);

	if (WARN_ON(obj->pin_count == DRM_I915_GEM_OBJECT_MAX_PIN_COUNT))

		return -EBUSY;



	if (obj->gtt_space != NULL) {

		if ((alignment && obj->gtt_offset & (alignment - 1)) ||

drivers/gpu/drm/i915/intel_display.c

+6 −6
Original line number Diff line number Diff line
@@ -4191,12 +4191,6 @@ static void i8xx_update_pll(struct drm_crtc *crtc, 
	POSTING_READ(DPLL(pipe));

	udelay(150);



	I915_WRITE(DPLL(pipe), dpll);



	/* Wait for the clocks to stabilize. */

	POSTING_READ(DPLL(pipe));

	udelay(150);



	/* The LVDS pin pair needs to be on before the DPLLs are enabled.

	 * This is an exception to the general rule that mode_set doesn't turn

	 * things on.
@@ -4204,6 +4198,12 @@ static void i8xx_update_pll(struct drm_crtc *crtc, 
	if (intel_pipe_has_type(crtc, INTEL_OUTPUT_LVDS))

		intel_update_lvds(crtc, clock, adjusted_mode);



	I915_WRITE(DPLL(pipe), dpll);



	/* Wait for the clocks to stabilize. */

	POSTING_READ(DPLL(pipe));

	udelay(150);



	/* The pixel multiplier can only be updated once the

	 * DPLL is enabled and the clocks are stable.

	 *

drivers/gpu/drm/i915/intel_hdmi.c

+1 −1
Original line number Diff line number Diff line
@@ -609,7 +609,7 @@ static void intel_hdmi_dpms(struct drm_encoder *encoder, int mode) 
	u32 temp;

	u32 enable_bits = SDVO_ENABLE;



	if (intel_hdmi->has_audio)

	if (intel_hdmi->has_audio || mode != DRM_MODE_DPMS_ON)

		enable_bits |= SDVO_AUDIO_ENABLE;



	temp = I915_READ(intel_hdmi->sdvox_reg);

drivers/gpu/drm/nouveau/nv50_gpio.c

+14 −1
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
 * Authors: Ben Skeggs

 */



#include <linux/dmi.h>

#include "drmP.h"

#include "nouveau_drv.h"

#include "nouveau_hw.h"
@@ -110,12 +111,24 @@ nv50_gpio_isr(struct drm_device *dev) 
		nv_wr32(dev, 0xe074, intr1);

}



static struct dmi_system_id gpio_reset_ids[] = {

	{

		.ident = "Apple Macbook 10,1",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Apple Inc."),

			DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro10,1"),

		}

	},

	{ }

};



int

nv50_gpio_init(struct drm_device *dev)

{

	struct drm_nouveau_private *dev_priv = dev->dev_private;



	/* initialise gpios and routing to vbios defaults */

	if (dmi_check_system(gpio_reset_ids))

		nouveau_gpio_reset(dev);



	/* disable, and ack any pending gpio interrupts */

drivers/gpu/drm/radeon/atombios_crtc.c

+34 −129
Original line number Diff line number Diff line
@@ -1479,98 +1479,14 @@ static void radeon_legacy_atom_fixup(struct drm_crtc *crtc) 
	}

}



/**

 * radeon_get_pll_use_mask - look up a mask of which pplls are in use

 *

 * @crtc: drm crtc

 *

 * Returns the mask of which PPLLs (Pixel PLLs) are in use.

 */

static u32 radeon_get_pll_use_mask(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct drm_crtc *test_crtc;

	struct radeon_crtc *radeon_test_crtc;

	u32 pll_in_use = 0;



	list_for_each_entry(test_crtc, &dev->mode_config.crtc_list, head) {

		if (crtc == test_crtc)

			continue;



		radeon_test_crtc = to_radeon_crtc(test_crtc);

		if (radeon_test_crtc->pll_id != ATOM_PPLL_INVALID)

			pll_in_use |= (1 << radeon_test_crtc->pll_id);

	}

	return pll_in_use;

}



/**

 * radeon_get_shared_dp_ppll - return the PPLL used by another crtc for DP

 *

 * @crtc: drm crtc

 *

 * Returns the PPLL (Pixel PLL) used by another crtc/encoder which is

 * also in DP mode.  For DP, a single PPLL can be used for all DP

 * crtcs/encoders.

 */

static int radeon_get_shared_dp_ppll(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct drm_encoder *test_encoder;

	struct radeon_crtc *radeon_test_crtc;



	list_for_each_entry(test_encoder, &dev->mode_config.encoder_list, head) {

		if (test_encoder->crtc && (test_encoder->crtc != crtc)) {

			if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(test_encoder))) {

				/* for DP use the same PLL for all */

				radeon_test_crtc = to_radeon_crtc(test_encoder->crtc);

				if (radeon_test_crtc->pll_id != ATOM_PPLL_INVALID)

					return radeon_test_crtc->pll_id;

			}

		}

	}

	return ATOM_PPLL_INVALID;

}



/**

 * radeon_atom_pick_pll - Allocate a PPLL for use by the crtc.

 *

 * @crtc: drm crtc

 *

 * Returns the PPLL (Pixel PLL) to be used by the crtc.  For DP monitors

 * a single PPLL can be used for all DP crtcs/encoders.  For non-DP

 * monitors a dedicated PPLL must be used.  If a particular board has

 * an external DP PLL, return ATOM_PPLL_INVALID to skip PLL programming

 * as there is no need to program the PLL itself.  If we are not able to

 * allocate a PLL, return ATOM_PPLL_INVALID to skip PLL programming to

 * avoid messing up an existing monitor.

 *

 * Asic specific PLL information

 *

 * DCE 6.1

 * - PPLL2 is only available to UNIPHYA (both DP and non-DP)

 * - PPLL0, PPLL1 are available for UNIPHYB/C/D/E/F (both DP and non-DP)

 *

 * DCE 6.0

 * - PPLL0 is available to all UNIPHY (DP only)

 * - PPLL1, PPLL2 are available for all UNIPHY (both DP and non-DP) and DAC

 *

 * DCE 5.0

 * - DCPLL is available to all UNIPHY (DP only)

 * - PPLL1, PPLL2 are available for all UNIPHY (both DP and non-DP) and DAC

 *

 * DCE 3.0/4.0/4.1

 * - PPLL1, PPLL2 are available for all UNIPHY (both DP and non-DP) and DAC

 *

 */

static int radeon_atom_pick_pll(struct drm_crtc *crtc)

{

	struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc);

	struct drm_device *dev = crtc->dev;

	struct radeon_device *rdev = dev->dev_private;

	struct drm_encoder *test_encoder;

	u32 pll_in_use;

	int pll;

	struct drm_crtc *test_crtc;

	uint32_t pll_in_use = 0;



	if (ASIC_IS_DCE61(rdev)) {

		list_for_each_entry(test_encoder, &dev->mode_config.encoder_list, head) {
@@ -1582,40 +1498,32 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc) 


				if ((test_radeon_encoder->encoder_id ==

				     ENCODER_OBJECT_ID_INTERNAL_UNIPHY) &&

				    (dig->linkb == false))

					/* UNIPHY A uses PPLL2 */

				    (dig->linkb == false)) /* UNIPHY A uses PPLL2 */

					return ATOM_PPLL2;

				else if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(test_encoder))) {

					/* UNIPHY B/C/D/E/F */

					if (rdev->clock.dp_extclk)

						/* skip PPLL programming if using ext clock */

						return ATOM_PPLL_INVALID;

					else {

						/* use the same PPLL for all DP monitors */

						pll = radeon_get_shared_dp_ppll(crtc);

						if (pll != ATOM_PPLL_INVALID)

							return pll;

					}

				}

				break;

			}

		}

		/* UNIPHY B/C/D/E/F */

		pll_in_use = radeon_get_pll_use_mask(crtc);

		if (!(pll_in_use & (1 << ATOM_PPLL0)))

		list_for_each_entry(test_crtc, &dev->mode_config.crtc_list, head) {

			struct radeon_crtc *radeon_test_crtc;



			if (crtc == test_crtc)

				continue;



			radeon_test_crtc = to_radeon_crtc(test_crtc);

			if ((radeon_test_crtc->pll_id == ATOM_PPLL0) ||

			    (radeon_test_crtc->pll_id == ATOM_PPLL1))

				pll_in_use |= (1 << radeon_test_crtc->pll_id);

		}

		if (!(pll_in_use & 4))

			return ATOM_PPLL0;

		if (!(pll_in_use & (1 << ATOM_PPLL1)))

		return ATOM_PPLL1;

		DRM_ERROR("unable to allocate a PPLL\n");

		return ATOM_PPLL_INVALID;

	} else if (ASIC_IS_DCE4(rdev)) {

		list_for_each_entry(test_encoder, &dev->mode_config.encoder_list, head) {

			if (test_encoder->crtc && (test_encoder->crtc == crtc)) {

				/* in DP mode, the DP ref clock can come from PPLL, DCPLL, or ext clock,

				 * depending on the asic:

				 * DCE4: PPLL or ext clock

				 * DCE5: PPLL, DCPLL, or ext clock

				 * DCE6: PPLL, PPLL0, or ext clock

				 * DCE5: DCPLL or ext clock

				 *

				 * Setting ATOM_PPLL_INVALID will cause SetPixelClock to skip

				 * PPLL/DCPLL programming and only program the DP DTO for the
@@ -1623,34 +1531,31 @@ static int radeon_atom_pick_pll(struct drm_crtc *crtc) 
				 */

				if (ENCODER_MODE_IS_DP(atombios_get_encoder_mode(test_encoder))) {

					if (rdev->clock.dp_extclk)

						/* skip PPLL programming if using ext clock */

						return ATOM_PPLL_INVALID;

					else if (ASIC_IS_DCE6(rdev))

						/* use PPLL0 for all DP */

						return ATOM_PPLL0;

					else if (ASIC_IS_DCE5(rdev))

						/* use DCPLL for all DP */

						return ATOM_DCPLL;

					else {

						/* use the same PPLL for all DP monitors */

						pll = radeon_get_shared_dp_ppll(crtc);

						if (pll != ATOM_PPLL_INVALID)

							return pll;

				}

			}

				break;

		}



		/* otherwise, pick one of the plls */

		list_for_each_entry(test_crtc, &dev->mode_config.crtc_list, head) {

			struct radeon_crtc *radeon_test_crtc;



			if (crtc == test_crtc)

				continue;



			radeon_test_crtc = to_radeon_crtc(test_crtc);

			if ((radeon_test_crtc->pll_id >= ATOM_PPLL1) &&

			    (radeon_test_crtc->pll_id <= ATOM_PPLL2))

				pll_in_use |= (1 << radeon_test_crtc->pll_id);

		}

		/* all other cases */

		pll_in_use = radeon_get_pll_use_mask(crtc);

		if (!(pll_in_use & (1 << ATOM_PPLL2)))

			return ATOM_PPLL2;

		if (!(pll_in_use & (1 << ATOM_PPLL1)))

		if (!(pll_in_use & 1))

			return ATOM_PPLL1;

		DRM_ERROR("unable to allocate a PPLL\n");

		return ATOM_PPLL_INVALID;

		return ATOM_PPLL2;

	} else

		/* use PPLL1 or PPLL2 */

		return radeon_crtc->crtc_id;



}
@@ -1792,7 +1697,7 @@ static void atombios_crtc_disable(struct drm_crtc *crtc) 
		break;

	}

done:

	radeon_crtc->pll_id = ATOM_PPLL_INVALID;

	radeon_crtc->pll_id = -1;

}



static const struct drm_crtc_helper_funcs atombios_helper_funcs = {
@@ -1841,6 +1746,6 @@ void radeon_atombios_init_crtc(struct drm_device *dev, 
		else

			radeon_crtc->crtc_offset = 0;

	}

	radeon_crtc->pll_id = ATOM_PPLL_INVALID;

	radeon_crtc->pll_id = -1;

	drm_crtc_helper_add(&radeon_crtc->base, &atombios_helper_funcs);

}