Skip to contentSkip to conversation

drm/amdgpu: Fix copy error in uvd_v6/7_0.c

PATCH In review Rex Zhu 2 participants 3 messages Sep 26, 2018 2 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

Rex Zhu

author
#0 lore raw

PATCH 1/1 drm/amdgpu: Fix copy error in uvd_v6/7_0.c

---
 drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 2 +-
 drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +1 -1
index 8ef4a53..2ceab76 100644
@@ -313,7 +313,7 @@ static int uvd_v6_0_enc_get_destroy_msg(struct amdgpu_ring *ring,
 	if (direct)
 		r = amdgpu_job_submit_direct(job, ring, &f);
 	else
-		r = amdgpu_job_submit(job, &ring->adev->vce.entity,
+		r = amdgpu_job_submit(job, &ring->adev->uvd.entity,
 				      AMDGPU_FENCE_OWNER_UNDEFINED, &f);
 	if (r)
 		goto err;
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +1 -1
index a289f6a..31a9665 100644
@@ -320,7 +320,7 @@ int uvd_v7_0_enc_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle,
 	if (direct)
 		r = amdgpu_job_submit_direct(job, ring, &f);
 	else
-		r = amdgpu_job_submit(job, &ring->adev->vce.entity,
+		r = amdgpu_job_submit(job, &ring->adev->uvd.entity,
 				      AMDGPU_FENCE_OWNER_UNDEFINED, &f);
 	if (r)
 		goto err;
Signature · 6 lines
1.9.1

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 1537965697-29140-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org

#2 lore raw

Am 26.09.2018 um 14:41 schrieb Rex Zhu:

Quoted 1 line

Actually that code can just be removed because uvd_*_enc_get_destroy_msg is only called with direct=true.

Christian.

Quoted 23 lines
---
  drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 2 +-
  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +1 -1
index 8ef4a53..2ceab76 100644
@@ -313,7 +313,7 @@ static int uvd_v6_0_enc_get_destroy_msg(struct amdgpu_ring *ring,
  	if (direct)
  		r = amdgpu_job_submit_direct(job, ring, &f);
  	else
-		r = amdgpu_job_submit(job, &ring->adev->vce.entity,
+		r = amdgpu_job_submit(job, &ring->adev->uvd.entity,
  				      AMDGPU_FENCE_OWNER_UNDEFINED, &f);
  	if (r)
  		goto err;
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +0 -0
index a289f6a..31a9665 100644

drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c int uvd_v7_0_enc_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle, · line 326

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +1 -1
@@ -320,7 +320,7 @@ int uvd_v7_0_enc_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle,
  	if (direct)
  		r = amdgpu_job_submit_direct(job, ring, &f);
  	else
-		r = amdgpu_job_submit(job, &ring->adev->vce.entity,
+		r = amdgpu_job_submit(job, &ring->adev->uvd.entity,
  				      AMDGPU_FENCE_OWNER_UNDEFINED, &f);
  	if (r)
  		goto err;

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

A message that is not in the archive (sent off-list or not yet received): 241c41f3-8adb-6630-5e53-5a758eb52fac-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

author
#4 lore raw

Ok. I will remove the code.

Best Regards

Rex

________________________________
From: Christian König <[email protected]>
Sent: Wednesday, September 26, 2018 8:45 PM
To: Zhu, Rex; [email protected]
Subject: Re: [PATCH] drm/amdgpu: Fix copy error in uvd_v6/7_0.c

Am 26.09.2018 um 14:41 schrieb Rex Zhu:

Quoted 1 line

Actually that code can just be removed because uvd_*_enc_get_destroy_msg is only called with direct=true.

Christian.

Quoted 23 lines
---
  drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 2 +-
  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c +1 -1
index 8ef4a53..2ceab76 100644
@@ -313,7 +313,7 @@ static int uvd_v6_0_enc_get_destroy_msg(struct amdgpu_ring *ring,
       if (direct)
               r = amdgpu_job_submit_direct(job, ring, &f);
       else
-             r = amdgpu_job_submit(job, &ring->adev->vce.entity,
+             r = amdgpu_job_submit(job, &ring->adev->uvd.entity,
                                     AMDGPU_FENCE_OWNER_UNDEFINED, &f);
       if (r)
               goto err;
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +0 -0
index a289f6a..31a9665 100644

drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c int uvd_v7_0_enc_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle, · line 326

Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c +1 -1
@@ -320,7 +320,7 @@ int uvd_v7_0_enc_get_destroy_msg(struct amdgpu_ring *ring, uint32_t handle,
       if (direct)
               r = amdgpu_job_submit_direct(job, ring, &f);
       else
-             r = amdgpu_job_submit(job, &ring->adev->vce.entity,
+             r = amdgpu_job_submit(job, &ring->adev->uvd.entity,
                                     AMDGPU_FENCE_OWNER_UNDEFINED, &f);
       if (r)
               goto err;

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx