drm/radeon/kms: merge conflicted badly



Not sure why git didn't flag this, but the result of automerge
from 3.14-rc7 screwed up the radeon init procedure.

Reported-by: Fireburn on #radeon
Signed-off-by: Dave Airlie <airlied@redhat.com>

parent 5a08c075

drivers/gpu/drm/radeon/radeon_kms.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -575,10 +575,6 @@ int radeon_driver_open_kms(struct drm_device dev, struct drm_file file_priv)
		if (r)
		return r;

		r = radeon_bo_reserve(rdev->ring_tmp_bo.bo, false);
		if (r)
		return r;

		/* map the ib pool buffer read only into
		* virtual address space */
		bo_va = radeon_vm_bo_add(rdev, &fpriv->vm,