diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index f21db7a0b34d..68528619834a 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
@@ -730,6 +730,12 @@ struct cik_irq_stat_regs { | |||
730 | u32 disp_int_cont4; | 730 | u32 disp_int_cont4; |
731 | u32 disp_int_cont5; | 731 | u32 disp_int_cont5; |
732 | u32 disp_int_cont6; | 732 | u32 disp_int_cont6; |
733 | u32 d1grph_int; | ||
734 | u32 d2grph_int; | ||
735 | u32 d3grph_int; | ||
736 | u32 d4grph_int; | ||
737 | u32 d5grph_int; | ||
738 | u32 d6grph_int; | ||
733 | }; | 739 | }; |
734 | 740 | ||
735 | union radeon_irq_stat_regs { | 741 | union radeon_irq_stat_regs { |
@@ -739,7 +745,7 @@ union radeon_irq_stat_regs { | |||
739 | struct cik_irq_stat_regs cik; | 745 | struct cik_irq_stat_regs cik; |
740 | }; | 746 | }; |
741 | 747 | ||
742 | #define RADEON_MAX_HPD_PINS 6 | 748 | #define RADEON_MAX_HPD_PINS 7 |
743 | #define RADEON_MAX_CRTCS 6 | 749 | #define RADEON_MAX_CRTCS 6 |
744 | #define RADEON_MAX_AFMT_BLOCKS 7 | 750 | #define RADEON_MAX_AFMT_BLOCKS 7 |
745 | 751 | ||
@@ -2321,6 +2327,7 @@ struct radeon_device { | |||
2321 | bool have_disp_power_ref; | 2327 | bool have_disp_power_ref; |
2322 | }; | 2328 | }; |
2323 | 2329 | ||
2330 | bool radeon_is_px(struct drm_device *dev); | ||
2324 | int radeon_device_init(struct radeon_device *rdev, | 2331 | int radeon_device_init(struct radeon_device *rdev, |
2325 | struct drm_device *ddev, | 2332 | struct drm_device *ddev, |
2326 | struct pci_dev *pdev, | 2333 | struct pci_dev *pdev, |
@@ -2631,6 +2638,9 @@ void r100_pll_errata_after_index(struct radeon_device *rdev); | |||
2631 | #define ASIC_IS_DCE64(rdev) ((rdev->family == CHIP_OLAND)) | 2638 | #define ASIC_IS_DCE64(rdev) ((rdev->family == CHIP_OLAND)) |
2632 | #define ASIC_IS_NODCE(rdev) ((rdev->family == CHIP_HAINAN)) | 2639 | #define ASIC_IS_NODCE(rdev) ((rdev->family == CHIP_HAINAN)) |
2633 | #define ASIC_IS_DCE8(rdev) ((rdev->family >= CHIP_BONAIRE)) | 2640 | #define ASIC_IS_DCE8(rdev) ((rdev->family >= CHIP_BONAIRE)) |
2641 | #define ASIC_IS_DCE81(rdev) ((rdev->family == CHIP_KAVERI)) | ||
2642 | #define ASIC_IS_DCE82(rdev) ((rdev->family == CHIP_BONAIRE)) | ||
2643 | #define ASIC_IS_DCE83(rdev) ((rdev->family == CHIP_KABINI)) | ||
2634 | 2644 | ||
2635 | #define ASIC_IS_LOMBOK(rdev) ((rdev->ddev->pdev->device == 0x6849) || \ | 2645 | #define ASIC_IS_LOMBOK(rdev) ((rdev->ddev->pdev->device == 0x6849) || \ |
2636 | (rdev->ddev->pdev->device == 0x6850) || \ | 2646 | (rdev->ddev->pdev->device == 0x6850) || \ |