Message ID | 1368478504-13798-1-git-send-email-alexdeucher@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Am 13.05.2013 22:54, schrieb alexdeucher@gmail.com: > From: Alex Deucher <alexander.deucher@amd.com> > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> With the exception of patch 6 this series is: Reviewed-by: Christian König <christian.koenig@amd.com> > --- > drivers/gpu/drm/radeon/radeon.h | 1 + > drivers/gpu/drm/radeon/radeon_device.c | 1 + > drivers/gpu/drm/radeon/radeon_family.h | 1 + > 3 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h > index 1442ce7..ec26d68 100644 > --- a/drivers/gpu/drm/radeon/radeon.h > +++ b/drivers/gpu/drm/radeon/radeon.h > @@ -1838,6 +1838,7 @@ void r100_pll_errata_after_index(struct radeon_device *rdev); > #define ASIC_IS_DCE61(rdev) ((rdev->family >= CHIP_ARUBA) && \ > (rdev->flags & RADEON_IS_IGP)) > #define ASIC_IS_DCE64(rdev) ((rdev->family == CHIP_OLAND)) > +#define ASIC_IS_NODCE(rdev) ((rdev->family == CHIP_HAINAN)) > > /* > * BIOS helpers. > diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c > index a8f6089..c2c59fb 100644 > --- a/drivers/gpu/drm/radeon/radeon_device.c > +++ b/drivers/gpu/drm/radeon/radeon_device.c > @@ -94,6 +94,7 @@ static const char radeon_family_name[][16] = { > "PITCAIRN", > "VERDE", > "OLAND", > + "HAINAN", > "LAST", > }; > > diff --git a/drivers/gpu/drm/radeon/radeon_family.h b/drivers/gpu/drm/radeon/radeon_family.h > index 2d91123..36e9803 100644 > --- a/drivers/gpu/drm/radeon/radeon_family.h > +++ b/drivers/gpu/drm/radeon/radeon_family.h > @@ -92,6 +92,7 @@ enum radeon_family { > CHIP_PITCAIRN, > CHIP_VERDE, > CHIP_OLAND, > + CHIP_HAINAN, > CHIP_LAST, > }; >
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 1442ce7..ec26d68 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -1838,6 +1838,7 @@ void r100_pll_errata_after_index(struct radeon_device *rdev); #define ASIC_IS_DCE61(rdev) ((rdev->family >= CHIP_ARUBA) && \ (rdev->flags & RADEON_IS_IGP)) #define ASIC_IS_DCE64(rdev) ((rdev->family == CHIP_OLAND)) +#define ASIC_IS_NODCE(rdev) ((rdev->family == CHIP_HAINAN)) /* * BIOS helpers. diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index a8f6089..c2c59fb 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -94,6 +94,7 @@ static const char radeon_family_name[][16] = { "PITCAIRN", "VERDE", "OLAND", + "HAINAN", "LAST", }; diff --git a/drivers/gpu/drm/radeon/radeon_family.h b/drivers/gpu/drm/radeon/radeon_family.h index 2d91123..36e9803 100644 --- a/drivers/gpu/drm/radeon/radeon_family.h +++ b/drivers/gpu/drm/radeon/radeon_family.h @@ -92,6 +92,7 @@ enum radeon_family { CHIP_PITCAIRN, CHIP_VERDE, CHIP_OLAND, + CHIP_HAINAN, CHIP_LAST, };