linux-next: manual merge of the drm tree with Linus' tree

[Stephen Rothwell]

Hi Dave,

Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/radeon/evergreen.c between commit 77e00f2ea94a
("drm/radeon/kms: bail on BTC parts if MC ucode is missing") from Linus'
tree and commit b15ba51207e5 ("drm/radeon: introduce a sub allocator and
convert ib pool to it v4") from the drm tree.

I think it is just context changes.  I fixed it up (see below) and can
carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/gpu/drm/radeon/evergreen.c
index 92c9628,1934728..0000000
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@@ -3264,30 -3337,6 +3337,18 @@@ int evergreen_init(struct radeon_devic
  		evergreen_pcie_gart_fini(rdev);
  		rdev->accel_working = false;
  	}
- 	if (rdev->accel_working) {
- 		r = radeon_ib_pool_init(rdev);
- 		if (r) {
- 			DRM_ERROR("radeon: failed initializing IB pool (%d).\n", r);
- 			rdev->accel_working = false;
- 		}
- 		r = r600_ib_test(rdev);
- 		if (r) {
- 			DRM_ERROR("radeon: failed testing IB (%d).\n", r);
- 			rdev->accel_working = false;
- 		}
- 	}
 +
 +	/* Don't start up if the MC ucode is missing on BTC parts.
 +	 * The default clocks and voltages before the MC ucode
 +	 * is loaded are not suffient for advanced operations.
 +	 */
 +	if (ASIC_IS_DCE5(rdev)) {
 +		if (!rdev->mc_fw && !(rdev->flags & RADEON_IS_IGP)) {
 +			DRM_ERROR("radeon: MC ucode required for NI+.\n");
 +			return -EINVAL;
 +		}
 +	}
 +
  	return 0;
  }

Attachment: pgp00000.pgp
Description: PGP signature