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

Commit 6d7c2a67 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2014-03-04' of ssh://git.freedesktop.org/git/drm-intel into drm-fixes 

Small fixes all around, mostly stable material. Please pull.

* tag 'drm-intel-fixes-2014-03-04' of ssh://git.freedesktop.org/git/drm-intel:
  drm/i915: Reject >165MHz modes w/ DVI monitors
  drm/i915: fix assert_cursor on BDW
  drm/i915: vlv: reserve GT power context early
  drm/i915: fix pch pci device enumeration
  drm/i915: Resolving the memory region conflict for Stolen area
  drm/i915: use backlight legacy combination mode also for i915gm/i945gm
parents 878eaf61 6375b768

drivers/gpu/drm/i915/i915_drv.c

+9 −14
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ MODULE_DEVICE_TABLE(pci, pciidlist); 
void intel_detect_pch(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct pci_dev *pch;

	struct pci_dev *pch = NULL;



	/* In all current cases, num_pipes is equivalent to the PCH_NOP setting

	 * (which really amounts to a PCH but no South Display).
@@ -424,12 +424,9 @@ void intel_detect_pch(struct drm_device *dev) 
	 * all the ISA bridge devices and check for the first match, instead

	 * of only checking the first one.

	 */

	pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL);

	while (pch) {

		struct pci_dev *curr = pch;

	while ((pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, pch))) {

		if (pch->vendor == PCI_VENDOR_ID_INTEL) {

			unsigned short id;

			id = pch->device & INTEL_PCH_DEVICE_ID_MASK;

			unsigned short id = pch->device & INTEL_PCH_DEVICE_ID_MASK;

			dev_priv->pch_id = id;



			if (id == INTEL_PCH_IBX_DEVICE_ID_TYPE) {
@@ -461,18 +458,16 @@ void intel_detect_pch(struct drm_device *dev) 
				DRM_DEBUG_KMS("Found LynxPoint LP PCH\n");

				WARN_ON(!IS_HASWELL(dev));

				WARN_ON(!IS_ULT(dev));

			} else {

				goto check_next;

			}

			pci_dev_put(pch);

			} else

				continue;



			break;

		}

check_next:

		pch = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, curr);

		pci_dev_put(curr);

	}

	if (!pch)

		DRM_DEBUG_KMS("No PCH found?\n");

		DRM_DEBUG_KMS("No PCH found.\n");



	pci_dev_put(pch);

}



bool i915_semaphore_is_enabled(struct drm_device *dev)

drivers/gpu/drm/i915/i915_gem_stolen.c

+16 −3
Original line number Diff line number Diff line
@@ -81,11 +81,24 @@ static unsigned long i915_stolen_to_physical(struct drm_device *dev) 
	 */

	r = devm_request_mem_region(dev->dev, base, dev_priv->gtt.stolen_size,

				    "Graphics Stolen Memory");

	if (r == NULL) {

		/*

		 * One more attempt but this time requesting region from

		 * base + 1, as we have seen that this resolves the region

		 * conflict with the PCI Bus.

		 * This is a BIOS w/a: Some BIOS wrap stolen in the root

		 * PCI bus, but have an off-by-one error. Hence retry the

		 * reservation starting from 1 instead of 0.

		 */

		r = devm_request_mem_region(dev->dev, base + 1,

					    dev_priv->gtt.stolen_size - 1,

					    "Graphics Stolen Memory");

		if (r == NULL) {

			DRM_ERROR("conflict detected with stolen region: [0x%08x - 0x%08x]\n",

				  base, base + (uint32_t)dev_priv->gtt.stolen_size);

			base = 0;

		}

	}



	return base;

}

drivers/gpu/drm/i915/intel_display.c

+4 −4
Original line number Diff line number Diff line
@@ -1092,12 +1092,12 @@ static void assert_cursor(struct drm_i915_private *dev_priv, 
	struct drm_device *dev = dev_priv->dev;

	bool cur_state;



	if (IS_IVYBRIDGE(dev) || IS_HASWELL(dev))

		cur_state = I915_READ(CURCNTR_IVB(pipe)) & CURSOR_MODE;

	else if (IS_845G(dev) || IS_I865G(dev))

	if (IS_845G(dev) || IS_I865G(dev))

		cur_state = I915_READ(_CURACNTR) & CURSOR_ENABLE;

	else

	else if (INTEL_INFO(dev)->gen <= 6 || IS_VALLEYVIEW(dev))

		cur_state = I915_READ(CURCNTR(pipe)) & CURSOR_MODE;

	else

		cur_state = I915_READ(CURCNTR_IVB(pipe)) & CURSOR_MODE;



	WARN(cur_state != state,

	     "cursor on pipe %c assertion failure (expected %s, current %s)\n",

drivers/gpu/drm/i915/intel_hdmi.c

+3 −3
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ static int hdmi_portclock_limit(struct intel_hdmi *hdmi) 
{

	struct drm_device *dev = intel_hdmi_to_dev(hdmi);



	if (IS_G4X(dev))

	if (!hdmi->has_hdmi_sink || IS_G4X(dev))

		return 165000;

	else if (IS_HASWELL(dev) || INTEL_INFO(dev)->gen >= 8)

		return 300000;
@@ -899,8 +899,8 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, 
	 * outputs. We also need to check that the higher clock still fits

	 * within limits.

	 */

	if (pipe_config->pipe_bpp > 8*3 && clock_12bpc <= portclock_limit

	    && HAS_PCH_SPLIT(dev)) {

	if (pipe_config->pipe_bpp > 8*3 && intel_hdmi->has_hdmi_sink &&

	    clock_12bpc <= portclock_limit && HAS_PCH_SPLIT(dev)) {

		DRM_DEBUG_KMS("picking bpc to 12 for HDMI output\n");

		desired_bpp = 12*3;

drivers/gpu/drm/i915/intel_panel.c

+2 −2
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ static void i9xx_enable_backlight(struct intel_connector *connector) 
		freq /= 0xff;



	ctl = freq << 17;

	if (IS_GEN2(dev) && panel->backlight.combination_mode)

	if (panel->backlight.combination_mode)

		ctl |= BLM_LEGACY_MODE;

	if (IS_PINEVIEW(dev) && panel->backlight.active_low_pwm)

		ctl |= BLM_POLARITY_PNV;
@@ -979,7 +979,7 @@ static int i9xx_setup_backlight(struct intel_connector *connector) 


	ctl = I915_READ(BLC_PWM_CTL);



	if (IS_GEN2(dev))

	if (IS_GEN2(dev) || IS_I915GM(dev) || IS_I945GM(dev))

		panel->backlight.combination_mode = ctl & BLM_LEGACY_MODE;



	if (IS_PINEVIEW(dev))