All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] drm/amdgpu: fix typo in amdgpu_vcn_sw_fini
@ 2020-01-15 22:15 Alex Deucher
  2020-01-15 22:15 ` [PATCH 2/2] drm/amdgpu/vcn1.0: remove duplicate defines Alex Deucher
  0 siblings, 1 reply; 4+ messages in thread
From: Alex Deucher @ 2020-01-15 22:15 UTC (permalink / raw)
  To: amd-gfx; +Cc: Alex Deucher

Using the wrong iterator.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
index ab51f0e9539c..f96464e2c157 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
@@ -193,9 +193,9 @@ int amdgpu_vcn_sw_fini(struct amdgpu_device *adev)
 		if (adev->vcn.harvest_config & (1 << j))
 			continue;
 		if (adev->vcn.indirect_sram) {
-			amdgpu_bo_free_kernel(&adev->vcn.inst[i].dpg_sram_bo,
-						  &adev->vcn.inst[i].dpg_sram_gpu_addr,
-						  (void **)&adev->vcn.inst[i].dpg_sram_cpu_addr);
+			amdgpu_bo_free_kernel(&adev->vcn.inst[j].dpg_sram_bo,
+						  &adev->vcn.inst[j].dpg_sram_gpu_addr,
+						  (void **)&adev->vcn.inst[j].dpg_sram_cpu_addr);
 		}
 		kvfree(adev->vcn.inst[j].saved_bo);
 
-- 
2.24.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH 2/2] drm/amdgpu/vcn1.0: remove duplicate defines
  2020-01-15 22:15 [PATCH 1/2] drm/amdgpu: fix typo in amdgpu_vcn_sw_fini Alex Deucher
@ 2020-01-15 22:15 ` Alex Deucher
  2020-01-15 22:40   ` Liu, Leo
  0 siblings, 1 reply; 4+ messages in thread
From: Alex Deucher @ 2020-01-15 22:15 UTC (permalink / raw)
  To: amd-gfx; +Cc: Alex Deucher

These were added to amdgpu_vcn.h so remove the duplicates
in this file.  Fixes a warning.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
index a70351f2740c..2b9e3098d4e2 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@ -39,11 +39,6 @@
 #include "ivsrcid/vcn/irqsrcs_vcn_1_0.h"
 #include "jpeg_v1_0.h"
 
-#define mmUVD_RBC_XX_IB_REG_CHECK				0x05ab
-#define mmUVD_RBC_XX_IB_REG_CHECK_BASE_IDX	1
-#define mmUVD_REG_XX_MASK							0x05ac
-#define mmUVD_REG_XX_MASK_BASE_IDX				1
-
 static int vcn_v1_0_stop(struct amdgpu_device *adev);
 static void vcn_v1_0_set_dec_ring_funcs(struct amdgpu_device *adev);
 static void vcn_v1_0_set_enc_ring_funcs(struct amdgpu_device *adev);
-- 
2.24.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* RE: [PATCH 2/2] drm/amdgpu/vcn1.0: remove duplicate defines
  2020-01-15 22:15 ` [PATCH 2/2] drm/amdgpu/vcn1.0: remove duplicate defines Alex Deucher
@ 2020-01-15 22:40   ` Liu, Leo
  2020-01-15 22:44     ` Alex Deucher
  0 siblings, 1 reply; 4+ messages in thread
From: Liu, Leo @ 2020-01-15 22:40 UTC (permalink / raw)
  To: Alex Deucher, amd-gfx; +Cc: Deucher, Alexander

The value are different between VCN 1.0 and 2.x.

Regards,
Leo

-----Original Message-----
From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Alex Deucher
Sent: January 15, 2020 5:16 PM
To: amd-gfx@lists.freedesktop.org
Cc: Deucher, Alexander <Alexander.Deucher@amd.com>
Subject: [PATCH 2/2] drm/amdgpu/vcn1.0: remove duplicate defines

These were added to amdgpu_vcn.h so remove the duplicates in this file.  Fixes a warning.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
index a70351f2740c..2b9e3098d4e2 100644
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
@@ -39,11 +39,6 @@
 #include "ivsrcid/vcn/irqsrcs_vcn_1_0.h"
 #include "jpeg_v1_0.h"
 
-#define mmUVD_RBC_XX_IB_REG_CHECK				0x05ab
-#define mmUVD_RBC_XX_IB_REG_CHECK_BASE_IDX	1
-#define mmUVD_REG_XX_MASK							0x05ac
-#define mmUVD_REG_XX_MASK_BASE_IDX				1
-
 static int vcn_v1_0_stop(struct amdgpu_device *adev);  static void vcn_v1_0_set_dec_ring_funcs(struct amdgpu_device *adev);  static void vcn_v1_0_set_enc_ring_funcs(struct amdgpu_device *adev);
--
2.24.1

_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Cleo.liu%40amd.com%7Cd684fdd7f88f4246831608d79a088016%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637147233724222499&amp;sdata=jFi5Npjg6nXtQlA5JEu3dHnjiKHeBZfOWbr2KBrqYI0%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] drm/amdgpu/vcn1.0: remove duplicate defines
  2020-01-15 22:40   ` Liu, Leo
@ 2020-01-15 22:44     ` Alex Deucher
  0 siblings, 0 replies; 4+ messages in thread
From: Alex Deucher @ 2020-01-15 22:44 UTC (permalink / raw)
  To: Liu, Leo, James Zhu; +Cc: Deucher, Alexander, amd-gfx

On Wed, Jan 15, 2020 at 5:40 PM Liu, Leo <Leo.Liu@amd.com> wrote:
>
> The value are different between VCN 1.0 and 2.x.
>

Ah, sorry, missed that.  James, please fix the conflict then since
amdgpu_vcn.h is included by both files.

Alex

> Regards,
> Leo
>
> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces@lists.freedesktop.org> On Behalf Of Alex Deucher
> Sent: January 15, 2020 5:16 PM
> To: amd-gfx@lists.freedesktop.org
> Cc: Deucher, Alexander <Alexander.Deucher@amd.com>
> Subject: [PATCH 2/2] drm/amdgpu/vcn1.0: remove duplicate defines
>
> These were added to amdgpu_vcn.h so remove the duplicates in this file.  Fixes a warning.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 5 -----
>  1 file changed, 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> index a70351f2740c..2b9e3098d4e2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
> @@ -39,11 +39,6 @@
>  #include "ivsrcid/vcn/irqsrcs_vcn_1_0.h"
>  #include "jpeg_v1_0.h"
>
> -#define mmUVD_RBC_XX_IB_REG_CHECK                              0x05ab
> -#define mmUVD_RBC_XX_IB_REG_CHECK_BASE_IDX     1
> -#define mmUVD_REG_XX_MASK                                                      0x05ac
> -#define mmUVD_REG_XX_MASK_BASE_IDX                             1
> -
>  static int vcn_v1_0_stop(struct amdgpu_device *adev);  static void vcn_v1_0_set_dec_ring_funcs(struct amdgpu_device *adev);  static void vcn_v1_0_set_enc_ring_funcs(struct amdgpu_device *adev);
> --
> 2.24.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Cleo.liu%40amd.com%7Cd684fdd7f88f4246831608d79a088016%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637147233724222499&amp;sdata=jFi5Npjg6nXtQlA5JEu3dHnjiKHeBZfOWbr2KBrqYI0%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-01-15 22:44 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-15 22:15 [PATCH 1/2] drm/amdgpu: fix typo in amdgpu_vcn_sw_fini Alex Deucher
2020-01-15 22:15 ` [PATCH 2/2] drm/amdgpu/vcn1.0: remove duplicate defines Alex Deucher
2020-01-15 22:40   ` Liu, Leo
2020-01-15 22:44     ` Alex Deucher

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.