diff options
| author | Christian König <deathsimple@vodafone.de> | 2012-05-02 09:11:24 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-03 04:16:40 -0400 |
| commit | 8ba957b5b69dd107fa6056094416954d0b6e27c1 (patch) | |
| tree | d633b744767222e4840db3cb77cb6fe07e1e5659 /drivers/gpu/drm/radeon/radeon_asic.c | |
| parent | 7b9ef16bd187b7e7f43887afb393d1f89e5bee71 (diff) | |
drm/radeon: remove r300_gpu_is_lockup
Since it is now identical to r100_gpu_is_lockup.
Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_asic.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_asic.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c index 958b9ea66f7..5e5694e1126 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.c +++ b/drivers/gpu/drm/radeon/radeon_asic.c | |||
| @@ -299,7 +299,7 @@ static struct radeon_asic r300_asic = { | |||
| 299 | .ring_start = &r300_ring_start, | 299 | .ring_start = &r300_ring_start, |
| 300 | .ring_test = &r100_ring_test, | 300 | .ring_test = &r100_ring_test, |
| 301 | .ib_test = &r100_ib_test, | 301 | .ib_test = &r100_ib_test, |
| 302 | .is_lockup = &r300_gpu_is_lockup, | 302 | .is_lockup = &r100_gpu_is_lockup, |
| 303 | } | 303 | } |
| 304 | }, | 304 | }, |
| 305 | .irq = { | 305 | .irq = { |
| @@ -373,7 +373,7 @@ static struct radeon_asic r300_asic_pcie = { | |||
| 373 | .ring_start = &r300_ring_start, | 373 | .ring_start = &r300_ring_start, |
| 374 | .ring_test = &r100_ring_test, | 374 | .ring_test = &r100_ring_test, |
| 375 | .ib_test = &r100_ib_test, | 375 | .ib_test = &r100_ib_test, |
| 376 | .is_lockup = &r300_gpu_is_lockup, | 376 | .is_lockup = &r100_gpu_is_lockup, |
| 377 | } | 377 | } |
| 378 | }, | 378 | }, |
| 379 | .irq = { | 379 | .irq = { |
| @@ -447,7 +447,7 @@ static struct radeon_asic r420_asic = { | |||
| 447 | .ring_start = &r300_ring_start, | 447 | .ring_start = &r300_ring_start, |
| 448 | .ring_test = &r100_ring_test, | 448 | .ring_test = &r100_ring_test, |
| 449 | .ib_test = &r100_ib_test, | 449 | .ib_test = &r100_ib_test, |
| 450 | .is_lockup = &r300_gpu_is_lockup, | 450 | .is_lockup = &r100_gpu_is_lockup, |
| 451 | } | 451 | } |
| 452 | }, | 452 | }, |
| 453 | .irq = { | 453 | .irq = { |
| @@ -521,7 +521,7 @@ static struct radeon_asic rs400_asic = { | |||
| 521 | .ring_start = &r300_ring_start, | 521 | .ring_start = &r300_ring_start, |
| 522 | .ring_test = &r100_ring_test, | 522 | .ring_test = &r100_ring_test, |
| 523 | .ib_test = &r100_ib_test, | 523 | .ib_test = &r100_ib_test, |
| 524 | .is_lockup = &r300_gpu_is_lockup, | 524 | .is_lockup = &r100_gpu_is_lockup, |
| 525 | } | 525 | } |
| 526 | }, | 526 | }, |
| 527 | .irq = { | 527 | .irq = { |
| @@ -595,7 +595,7 @@ static struct radeon_asic rs600_asic = { | |||
| 595 | .ring_start = &r300_ring_start, | 595 | .ring_start = &r300_ring_start, |
| 596 | .ring_test = &r100_ring_test, | 596 | .ring_test = &r100_ring_test, |
| 597 | .ib_test = &r100_ib_test, | 597 | .ib_test = &r100_ib_test, |
| 598 | .is_lockup = &r300_gpu_is_lockup, | 598 | .is_lockup = &r100_gpu_is_lockup, |
| 599 | } | 599 | } |
| 600 | }, | 600 | }, |
| 601 | .irq = { | 601 | .irq = { |
| @@ -669,7 +669,7 @@ static struct radeon_asic rs690_asic = { | |||
| 669 | .ring_start = &r300_ring_start, | 669 | .ring_start = &r300_ring_start, |
| 670 | .ring_test = &r100_ring_test, | 670 | .ring_test = &r100_ring_test, |
| 671 | .ib_test = &r100_ib_test, | 671 | .ib_test = &r100_ib_test, |
| 672 | .is_lockup = &r300_gpu_is_lockup, | 672 | .is_lockup = &r100_gpu_is_lockup, |
| 673 | } | 673 | } |
| 674 | }, | 674 | }, |
| 675 | .irq = { | 675 | .irq = { |
| @@ -743,7 +743,7 @@ static struct radeon_asic rv515_asic = { | |||
| 743 | .ring_start = &rv515_ring_start, | 743 | .ring_start = &rv515_ring_start, |
| 744 | .ring_test = &r100_ring_test, | 744 | .ring_test = &r100_ring_test, |
| 745 | .ib_test = &r100_ib_test, | 745 | .ib_test = &r100_ib_test, |
| 746 | .is_lockup = &r300_gpu_is_lockup, | 746 | .is_lockup = &r100_gpu_is_lockup, |
| 747 | } | 747 | } |
| 748 | }, | 748 | }, |
| 749 | .irq = { | 749 | .irq = { |
| @@ -817,7 +817,7 @@ static struct radeon_asic r520_asic = { | |||
| 817 | .ring_start = &rv515_ring_start, | 817 | .ring_start = &rv515_ring_start, |
| 818 | .ring_test = &r100_ring_test, | 818 | .ring_test = &r100_ring_test, |
| 819 | .ib_test = &r100_ib_test, | 819 | .ib_test = &r100_ib_test, |
| 820 | .is_lockup = &r300_gpu_is_lockup, | 820 | .is_lockup = &r100_gpu_is_lockup, |
| 821 | } | 821 | } |
| 822 | }, | 822 | }, |
| 823 | .irq = { | 823 | .irq = { |