On Wed, Jan 15, 2020 at 5:40 PM Liu, Leo <Leo.Liu@xxxxxxx> 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@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Alex Deucher > Sent: January 15, 2020 5:16 PM > To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: Deucher, Alexander <Alexander.Deucher@xxxxxxx> > 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@xxxxxxx> > --- > 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@xxxxxxxxxxxxxxxxxxxxx > https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Cleo.liu%40amd.com%7Cd684fdd7f88f4246831608d79a088016%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637147233724222499&sdata=jFi5Npjg6nXtQlA5JEu3dHnjiKHeBZfOWbr2KBrqYI0%3D&reserved=0 _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
