Message ID | 1369149258-11065-1-git-send-email-deathsimple@vodafone.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On Tue, May 21, 2013 at 11:14 AM, Christian König <deathsimple@vodafone.de> wrote: > From: Christian König <christian.koenig@amd.com> > > The chip id for SUMO2 isn't used. > > Signed-off-by: Christian König <christian.koenig@amd.com> Applied. thanks! Alex > --- > drivers/gpu/drm/radeon/rv770.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c > index 83f612a..3fc2985 100644 > --- a/drivers/gpu/drm/radeon/rv770.c > +++ b/drivers/gpu/drm/radeon/rv770.c > @@ -862,10 +862,8 @@ int rv770_uvd_resume(struct radeon_device *rdev) > chip_id = 0x0100000b; > break; > case CHIP_SUMO: > - chip_id = 0x0100000c; > - break; > case CHIP_SUMO2: > - chip_id = 0x0100000d; > + chip_id = 0x0100000c; > break; > case CHIP_PALM: > chip_id = 0x0100000e; > -- > 1.7.9.5 >
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 83f612a..3fc2985 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c @@ -862,10 +862,8 @@ int rv770_uvd_resume(struct radeon_device *rdev) chip_id = 0x0100000b; break; case CHIP_SUMO: - chip_id = 0x0100000c; - break; case CHIP_SUMO2: - chip_id = 0x0100000d; + chip_id = 0x0100000c; break; case CHIP_PALM: chip_id = 0x0100000e;