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

Commit df5f4158 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:
 "i915 and radeon fixes:

  i915:
      fix for connector oops regression
      DDC probing fix

  radeon:
      two radeon reverts, along with a freeze workaround and a fix"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/radeon: Make sure radeon_vm_bo_set_addr always unreserves the BO
  Revert "drm/radeon: adjust pll when audio is not enabled"
  Revert "drm/radeon: don't share plls if monitors differ in audio support"
  drm/radeon: fix freeze for laptop with Turks/Thames GPU.
  drm/i915: Fix DDC probe for passive adapters
  drm/i915: Properly initialize SDVO analog connectors
parents cff100f5 6e2eb00f

drivers/gpu/drm/i915/intel_i2c.c

+17 −3
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ gmbus_xfer(struct i2c_adapter *adapter, 
					       struct intel_gmbus,

					       adapter);

	struct drm_i915_private *dev_priv = bus->dev_priv;

	int i, reg_offset;

	int i = 0, inc, try = 0, reg_offset;

	int ret = 0;



	intel_aux_display_runtime_get(dev_priv);
@@ -448,12 +448,14 @@ gmbus_xfer(struct i2c_adapter *adapter, 


	reg_offset = dev_priv->gpio_mmio_base;



retry:

	I915_WRITE(GMBUS0 + reg_offset, bus->reg0);



	for (i = 0; i < num; i++) {

	for (; i < num; i += inc) {

		inc = 1;

		if (gmbus_is_index_read(msgs, i, num)) {

			ret = gmbus_xfer_index_read(dev_priv, &msgs[i]);

			i += 1;  /* set i to the index of the read xfer */

			inc = 2; /* an index read is two msgs */

		} else if (msgs[i].flags & I2C_M_RD) {

			ret = gmbus_xfer_read(dev_priv, &msgs[i], 0);

		} else {
@@ -525,6 +527,18 @@ gmbus_xfer(struct i2c_adapter *adapter, 
			 adapter->name, msgs[i].addr,

			 (msgs[i].flags & I2C_M_RD) ? 'r' : 'w', msgs[i].len);



	/*

	 * Passive adapters sometimes NAK the first probe. Retry the first

	 * message once on -ENXIO for GMBUS transfers; the bit banging algorithm

	 * has retries internally. See also the retry loop in

	 * drm_do_probe_ddc_edid, which bails out on the first -ENXIO.

	 */

	if (ret == -ENXIO && i == 0 && try++ == 0) {

		DRM_DEBUG_KMS("GMBUS [%s] NAK on first message, retry\n",

			      adapter->name);

		goto retry;

	}



	goto out;



timeout:

drivers/gpu/drm/i915/intel_sdvo.c

+1 −1
Original line number Diff line number Diff line
@@ -2550,7 +2550,7 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device) 


	DRM_DEBUG_KMS("initialising analog device %d\n", device);



	intel_sdvo_connector = kzalloc(sizeof(*intel_sdvo_connector), GFP_KERNEL);

	intel_sdvo_connector = intel_sdvo_connector_alloc();

	if (!intel_sdvo_connector)

		return false;

drivers/gpu/drm/radeon/atombios_crtc.c

+1 −6
Original line number Diff line number Diff line
@@ -580,9 +580,6 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, 
		else

			radeon_crtc->pll_flags |= RADEON_PLL_PREFER_LOW_REF_DIV;



		/* if there is no audio, set MINM_OVER_MAXP  */

		if (!drm_detect_monitor_audio(radeon_connector_edid(connector)))

			radeon_crtc->pll_flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP;

		if (rdev->family < CHIP_RV770)

			radeon_crtc->pll_flags |= RADEON_PLL_PREFER_MINM_OVER_MAXP;

		/* use frac fb div on APUs */
@@ -1798,9 +1795,7 @@ static int radeon_get_shared_nondp_ppll(struct drm_crtc *crtc) 
			if ((crtc->mode.clock == test_crtc->mode.clock) &&

			    (adjusted_clock == test_adjusted_clock) &&

			    (radeon_crtc->ss_enabled == test_radeon_crtc->ss_enabled) &&

			    (test_radeon_crtc->pll_id != ATOM_PPLL_INVALID) &&

			    (drm_detect_monitor_audio(radeon_connector_edid(test_radeon_crtc->connector)) ==

			     drm_detect_monitor_audio(radeon_connector_edid(radeon_crtc->connector))))

			    (test_radeon_crtc->pll_id != ATOM_PPLL_INVALID))

				return test_radeon_crtc->pll_id;

		}

	}

drivers/gpu/drm/radeon/radeon_device.c

+15 −0
Original line number Diff line number Diff line
@@ -1463,6 +1463,21 @@ int radeon_device_init(struct radeon_device *rdev, 
	if (r)

		DRM_ERROR("ib ring test failed (%d).\n", r);



	/*

	 * Turks/Thames GPU will freeze whole laptop if DPM is not restarted

	 * after the CP ring have chew one packet at least. Hence here we stop

	 * and restart DPM after the radeon_ib_ring_tests().

	 */

	if (rdev->pm.dpm_enabled &&

	    (rdev->pm.pm_method == PM_METHOD_DPM) &&

	    (rdev->family == CHIP_TURKS) &&

	    (rdev->flags & RADEON_IS_MOBILITY)) {

		mutex_lock(&rdev->pm.mutex);

		radeon_dpm_disable(rdev);

		radeon_dpm_enable(rdev);

		mutex_unlock(&rdev->pm.mutex);

	}



	if ((radeon_testing & 1)) {

		if (rdev->accel_working)

			radeon_test_moves(rdev);

drivers/gpu/drm/radeon/radeon_vm.c

+12 −5
Original line number Diff line number Diff line
@@ -458,14 +458,16 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev, 
		/* make sure object fit at this offset */

		eoffset = soffset + size;

		if (soffset >= eoffset) {

			return -EINVAL;

			r = -EINVAL;

			goto error_unreserve;

		}



		last_pfn = eoffset / RADEON_GPU_PAGE_SIZE;

		if (last_pfn > rdev->vm_manager.max_pfn) {

			dev_err(rdev->dev, "va above limit (0x%08X > 0x%08X)\n",

				last_pfn, rdev->vm_manager.max_pfn);

			return -EINVAL;

			r = -EINVAL;

			goto error_unreserve;

		}



	} else {
@@ -486,7 +488,8 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev, 
				"(bo %p 0x%010lx 0x%010lx)\n", bo_va->bo,

				soffset, tmp->bo, tmp->it.start, tmp->it.last);

			mutex_unlock(&vm->mutex);

			return -EINVAL;

			r = -EINVAL;

			goto error_unreserve;

		}

	}
@@ -497,7 +500,8 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev, 
			tmp = kzalloc(sizeof(struct radeon_bo_va), GFP_KERNEL);

			if (!tmp) {

				mutex_unlock(&vm->mutex);

				return -ENOMEM;

				r = -ENOMEM;

				goto error_unreserve;

			}

			tmp->it.start = bo_va->it.start;

			tmp->it.last = bo_va->it.last;
@@ -555,7 +559,6 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev, 
		r = radeon_vm_clear_bo(rdev, pt);

		if (r) {

			radeon_bo_unref(&pt);

			radeon_bo_reserve(bo_va->bo, false);

			return r;

		}
@@ -575,6 +578,10 @@ int radeon_vm_bo_set_addr(struct radeon_device *rdev, 


	mutex_unlock(&vm->mutex);

	return 0;



error_unreserve:

	radeon_bo_unreserve(bo_va->bo);

	return r;

}



/**