[2/8] drm/amdgpu: "revert fix exclusive mode game texture blank(v2)"

Submitted by Christian König on Oct. 5, 2016, 2:13 p.m.

Details

Message ID 1475676809-3061-2-git-send-email-deathsimple@vodafone.de
State New
Headers show
Series "Series without cover letter" ( rev: 1 ) in AMD X.Org drivers

Not browsing as part of any series.

Commit Message

Christian König Oct. 5, 2016, 2:13 p.m.
From: Christian König <christian.koenig@amd.com>

This reverts commit e3bb40fcd1a3e889cf2c8972f1925083dd9f96dc and
commit 52d7a0c509a48f228d1ec04eaadb2056c201e06e.

Shouldn't be necessary any more with the increased padding and we
really don't want engine specific code here.

Signed-off-by: Christian König <christian.koenig@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 8 --------
 1 file changed, 8 deletions(-)

Patch hide | download patch | download mbox

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
index 3e39039..38261a0 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
@@ -129,7 +129,6 @@  int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
 
 	unsigned i;
 	int r = 0;
-	unsigned extra_nop = 0;
 
 	if (num_ibs == 0)
 		return -EINVAL;
@@ -156,11 +155,6 @@  int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
 	alloc_size = amdgpu_ring_get_dma_frame_size(ring) +
 		num_ibs * amdgpu_ring_get_emit_ib_size(ring);
 
-	if (job && !job->vm_needs_flush && ring->type == AMDGPU_RING_TYPE_GFX) {
-		extra_nop = 128;
-		alloc_size += extra_nop;
-	}
-
 	r = amdgpu_ring_alloc(ring, alloc_size);
 	if (r) {
 		dev_err(adev->dev, "scheduling IB failed (%d).\n", r);
@@ -171,8 +165,6 @@  int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs,
 		patch_offset = amdgpu_ring_init_cond_exec(ring);
 
 	if (vm) {
-		amdgpu_ring_insert_nop(ring, extra_nop); /* prevent CE go too fast than DE */
-
 		r = amdgpu_vm_flush(ring, job);
 		if (r) {
 			amdgpu_ring_undo(ring);