On Tue, Aug 30, 2016 at 10:17:58PM +0800, Deucher, Alexander wrote: > > -----Original Message----- > > From: amd-gfx [mailto:amd-gfx-bounces at lists.freedesktop.org] On Behalf > > Of Huang Rui > > Sent: Tuesday, August 30, 2016 7:50 AM > > To: amd-gfx at lists.freedesktop.org; Deucher, Alexander > > Cc: Wang, Ken; Yu, Hui; Huang, Ray; Huan, Alvin > > Subject: [PATCH 07/14] drm/amdgpu/si: fix the dce6 for si macro > > > > Change-Id: I3e5f42158c57d1ec722f713b129189bc5f802b11 > > Signed-off-by: Huang Rui <ray.huang at amd.com> > > --- > > drivers/gpu/drm/amd/include/asic_reg/si/sid.h | 6 +++++- > > 1 file changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/amd/include/asic_reg/si/sid.h > > b/drivers/gpu/drm/amd/include/asic_reg/si/sid.h > > index 9609199..ced0390 100644 > > --- a/drivers/gpu/drm/amd/include/asic_reg/si/sid.h > > +++ b/drivers/gpu/drm/amd/include/asic_reg/si/sid.h > > @@ -1968,7 +1968,11 @@ > > #define AMDGPU_MM_INDEX 0x0000 > > #define AMDGPU_MM_DATA 0x0001 > > > > -#define ASIC_IS_DCE6(adev) ((adev->asic_type == CHIP_VERDE)) > > +#define ASIC_IS_DCE6(adev) ((adev->asic_type == CHIP_VERDE) || \ > > + (adev->asic_type == CHIP_TAHITI) || \ > > + (adev->asic_type == CHIP_PITCAIRN) || \ > > + (adev->asic_type == CHIP_OLAND)) > > + > > Let's just drop this macro and check the asic types explicitly. > OK, will remove this macro in V2. Thanks, Rui