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

Pull drm radeon fixes from Dave Airlie: "One core fix, but mostly radeon fixes for s/r and big endian UVD support, and a fix to stop the GPU being reset for no good reason, and crashing people's machines." * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm/radeon: update lockup tracking when scheduling in empty ring drm/prime: Honor requested file flags when exporting a buffer drm/radeon: fix UVD on big endian drm/radeon: fix write back suspend regression with uvd v2 drm/radeon: do not try to uselessly update virtual memory pagetable

Linus Torvalds committed 13 years ago

Commit e61cd5e2 parents 64a2f30 9aa36877 files · +85 −55Browse files

Unified · Split

7 files

drivers/gpu/drm/drm_prime.c +1 −2
drivers/gpu/drm/radeon/r600.c +10 −3
drivers/gpu/drm/radeon/radeon_device.c +24 −29
drivers/gpu/drm/radeon/radeon_fence.c +8 −2
drivers/gpu/drm/radeon/radeon_gart.c +4 −2
drivers/gpu/drm/radeon/radeon_ring.c +7 −0
drivers/gpu/drm/radeon/radeon_uvd.c +31 −17

drivers/gpu/drm/drm_prime.c+1−2

@@ -190,8 +190,7 @@ struct dma_buf drm_gem_prime_export(struct drm_device dev, · 189 unmodified lines
190	if (ret)	190	if (ret)
191	return ERR_PTR(ret);	191	return ERR_PTR(ret);
192	}	192	}
193	return dma_buf_export(obj, &drm_gem_prime_dmabuf_ops, obj->size,	193	return dma_buf_export(obj, &drm_gem_prime_dmabuf_ops, obj->size, flags);
194	0600);
195	}	194	}
196	EXPORT_SYMBOL(drm_gem_prime_export);	195	EXPORT_SYMBOL(drm_gem_prime_export);
197		196

drivers/gpu/drm/radeon/r600.c+10−3

 int r600_uvd_init(struct radeon_device *rdev)
 {
 	int i, j, r;
+	/* disable byte swapping */
+	u32 lmi_swap_cntl = 0;
+	u32 mp_swap_cntl = 0;
 	/* raise clocks while booting up the VCPU */
 	radeon_set_uvd_clocks(rdev, 53300, 40000);
 	WREG32(UVD_LMI_CTRL, 0x40 | (1 << 8) | (1 << 13) |
 			     (1 << 21) | (1 << 9) | (1 << 20));
-	/* disable byte swapping */
+#ifdef __BIG_ENDIAN
-	WREG32(UVD_LMI_SWAP_CNTL, 0);
+	/* swap (8 in 32) RB and IB */
-	WREG32(UVD_MP_SWAP_CNTL, 0);
+	lmi_swap_cntl = 0xa;
+	mp_swap_cntl = 0;
+#endif
+	WREG32(UVD_LMI_SWAP_CNTL, lmi_swap_cntl);
+	WREG32(UVD_MP_SWAP_CNTL, mp_swap_cntl);
 	WREG32(UVD_MPC_SET_MUXA0, 0x40c2040);
 	WREG32(UVD_MPC_SET_MUXA1, 0x0);

drivers/gpu/drm/radeon/radeon_device.c+24−29

  */
 void radeon_wb_disable(struct radeon_device *rdev)
 {
-	int r;
-	if (rdev->wb.wb_obj) {
-		r = radeon_bo_reserve(rdev->wb.wb_obj, false);
-		if (unlikely(r != 0))
-			return;
-		radeon_bo_kunmap(rdev->wb.wb_obj);
-		radeon_bo_unpin(rdev->wb.wb_obj);
-		radeon_bo_unreserve(rdev->wb.wb_obj);
-	}
 	rdev->wb.enabled = false;
 }
 {
 	radeon_wb_disable(rdev);
 	if (rdev->wb.wb_obj) {
+		if (!radeon_bo_reserve(rdev->wb.wb_obj, false)) {
+			radeon_bo_kunmap(rdev->wb.wb_obj);
+			radeon_bo_unpin(rdev->wb.wb_obj);
+			radeon_bo_unreserve(rdev->wb.wb_obj);
+		}
 		radeon_bo_unref(&rdev->wb.wb_obj);
 		rdev->wb.wb = NULL;
 		rdev->wb.wb_obj = NULL;
 			dev_warn(rdev->dev, "(%d) create WB bo failed\n", r);
 			return r;
 		}
-	}
+		r = radeon_bo_reserve(rdev->wb.wb_obj, false);
-	r = radeon_bo_reserve(rdev->wb.wb_obj, false);
+		if (unlikely(r != 0)) {
-	if (unlikely(r != 0)) {
+			radeon_wb_fini(rdev);
-		radeon_wb_fini(rdev);
+			return r;
-		return r;
+		}
-	}
+		r = radeon_bo_pin(rdev->wb.wb_obj, RADEON_GEM_DOMAIN_GTT,
-	r = radeon_bo_pin(rdev->wb.wb_obj, RADEON_GEM_DOMAIN_GTT,
+				&rdev->wb.gpu_addr);
-			  &rdev->wb.gpu_addr);
+		if (r) {
-	if (r) {
+			radeon_bo_unreserve(rdev->wb.wb_obj);
+			dev_warn(rdev->dev, "(%d) pin WB bo failed\n", r);
+			radeon_wb_fini(rdev);
+			return r;
+		}
+		r = radeon_bo_kmap(rdev->wb.wb_obj, (void **)&rdev->wb.wb);
 		radeon_bo_unreserve(rdev->wb.wb_obj);
-		dev_warn(rdev->dev, "(%d) pin WB bo failed\n", r);
+		if (r) {
-		radeon_wb_fini(rdev);
+			dev_warn(rdev->dev, "(%d) map WB bo failed\n", r);
-		return r;
+			radeon_wb_fini(rdev);
-	}
+			return r;
-	r = radeon_bo_kmap(rdev->wb.wb_obj, (void **)&rdev->wb.wb);
+		}
-	radeon_bo_unreserve(rdev->wb.wb_obj);
-	if (r) {
-		dev_warn(rdev->dev, "(%d) map WB bo failed\n", r);
-		radeon_wb_fini(rdev);
-		return r;
 	}
 	/* clear wb memory */

drivers/gpu/drm/radeon/radeon_fence.c+8−2

 {
 	struct radeon_fence_driver *drv = &rdev->fence_drv[ring];
 	if (likely(rdev->wb.enabled || !drv->scratch_reg)) {
-		*drv->cpu_addr = cpu_to_le32(seq);
+		if (drv->cpu_addr) {
+			*drv->cpu_addr = cpu_to_le32(seq);
+		}
 	} else {
 		WREG32(drv->scratch_reg, seq);
 	}
 	u32 seq = 0;
 	if (likely(rdev->wb.enabled || !drv->scratch_reg)) {
-		seq = le32_to_cpu(*drv->cpu_addr);
+		if (drv->cpu_addr) {
+			seq = le32_to_cpu(*drv->cpu_addr);
+		} else {
+			seq = lower_32_bits(atomic64_read(&drv->last_seq));
+		}
 	} else {
 		seq = RREG32(drv->scratch_reg);
 	}

drivers/gpu/drm/radeon/radeon_gart.c+4−2

 int radeon_vm_bo_rmv(struct radeon_device *rdev,
 		     struct radeon_bo_va *bo_va)
 {
-	int r;
+	int r = 0;
 	mutex_lock(&rdev->vm_manager.lock);
 	mutex_lock(&bo_va->vm->mutex);
-	r = radeon_vm_bo_update_pte(rdev, bo_va->vm, bo_va->bo, NULL);
+	if (bo_va->soffset) {
+		r = radeon_vm_bo_update_pte(rdev, bo_va->vm, bo_va->bo, NULL);
+	}
 	mutex_unlock(&rdev->vm_manager.lock);
 	list_del(&bo_va->vm_list);
 	mutex_unlock(&bo_va->vm->mutex);

drivers/gpu/drm/radeon/radeon_ring.c+7−0

@@ -402,6 +402,13 @@ int radeon_ring_alloc(struct radeon_device rdev, struct radeon_ring ring, unsi · 401 unmodified lines
402	return -ENOMEM;	402	return -ENOMEM;
403	/* Align requested size with padding so unlock_commit can	403	/* Align requested size with padding so unlock_commit can
404	* pad safely */	404	* pad safely */
		405	radeon_ring_free_size(rdev, ring);
		406	if (ring->ring_free_dw == (ring->ring_size / 4)) {
		407	/* This is an empty ring update lockup info to avoid
		408	* false positive.
		409	*/
		410	radeon_ring_lockup_update(ring);
		411	}
405	ndw = (ndw + ring->align_mask) & ~ring->align_mask;	412	ndw = (ndw + ring->align_mask) & ~ring->align_mask;
406	while (ndw > (ring->ring_free_dw - 1)) {	413	while (ndw > (ring->ring_free_dw - 1)) {
407	radeon_ring_free_size(rdev, ring);	414	radeon_ring_free_size(rdev, ring);

drivers/gpu/drm/radeon/radeon_uvd.c+31−17

 	if (!r) {
 		radeon_bo_kunmap(rdev->uvd.vcpu_bo);
 		radeon_bo_unpin(rdev->uvd.vcpu_bo);
+		rdev->uvd.cpu_addr = NULL;
+		if (!radeon_bo_pin(rdev->uvd.vcpu_bo, RADEON_GEM_DOMAIN_CPU, NULL)) {
+			radeon_bo_kmap(rdev->uvd.vcpu_bo, &rdev->uvd.cpu_addr);
+		}
 		radeon_bo_unreserve(rdev->uvd.vcpu_bo);
+		if (rdev->uvd.cpu_addr) {
+			radeon_fence_driver_start_ring(rdev, R600_RING_TYPE_UVD_INDEX);
+		} else {
+			rdev->fence_drv[R600_RING_TYPE_UVD_INDEX].cpu_addr = NULL;
+		}
 	}
 	return r;
 }
 		return r;
 	}
+	/* Have been pin in cpu unmap unpin */
+	radeon_bo_kunmap(rdev->uvd.vcpu_bo);
+	radeon_bo_unpin(rdev->uvd.vcpu_bo);
 	r = radeon_bo_pin(rdev->uvd.vcpu_bo, RADEON_GEM_DOMAIN_VRAM,
 			  &rdev->uvd.gpu_addr);
 	if (r) {
 	}
 	/* stitch together an UVD create msg */
-	msg[0] = 0x00000de4;
+	msg[0] = cpu_to_le32(0x00000de4);
-	msg[1] = 0x00000000;
+	msg[1] = cpu_to_le32(0x00000000);
-	msg[2] = handle;
+	msg[2] = cpu_to_le32(handle);
-	msg[3] = 0x00000000;
+	msg[3] = cpu_to_le32(0x00000000);
-	msg[4] = 0x00000000;
+	msg[4] = cpu_to_le32(0x00000000);
-	msg[5] = 0x00000000;
+	msg[5] = cpu_to_le32(0x00000000);
-	msg[6] = 0x00000000;
+	msg[6] = cpu_to_le32(0x00000000);
-	msg[7] = 0x00000780;
+	msg[7] = cpu_to_le32(0x00000780);
-	msg[8] = 0x00000440;
+	msg[8] = cpu_to_le32(0x00000440);
-	msg[9] = 0x00000000;
+	msg[9] = cpu_to_le32(0x00000000);
-	msg[10] = 0x01b37000;
+	msg[10] = cpu_to_le32(0x01b37000);
 	for (i = 11; i < 1024; ++i)
-		msg[i] = 0x0;
+		msg[i] = cpu_to_le32(0x0);
 	radeon_bo_kunmap(bo);
 	radeon_bo_unreserve(bo);
 	}
 	/* stitch together an UVD destroy msg */
-	msg[0] = 0x00000de4;
+	msg[0] = cpu_to_le32(0x00000de4);
-	msg[1] = 0x00000002;
+	msg[1] = cpu_to_le32(0x00000002);
-	msg[2] = handle;
+	msg[2] = cpu_to_le32(handle);
-	msg[3] = 0x00000000;
+	msg[3] = cpu_to_le32(0x00000000);
 	for (i = 4; i < 1024; ++i)
-		msg[i] = 0x0;
+		msg[i] = cpu_to_le32(0x0);
 	radeon_bo_kunmap(bo);
 	radeon_bo_unreserve(bo);

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

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code