radeon: add pageflip support
Subsystems (2)
cover radeon: add pageflip support
This set of patches adds pageflipping support for radeon. There are two drm patches and one ddx patch required. The drm patches are against Dave's drm-next branch and the ddx patch is against git master. So far it's been lightly tested with openarena on a variety of radeons. Feedback appreciated.
Alex
PATCH 1/2 drm/radeon/kms: add support for pflip interrupts on 6xx/7xx/evergreen
--- drivers/gpu/drm/radeon/evergreen.c | 228 ++++++++++++++++++++----------- drivers/gpu/drm/radeon/r600.c | 120 ++++++++++------- drivers/gpu/drm/radeon/r600d.h | 9 ++ drivers/gpu/drm/radeon/radeon.h | 35 +++++ drivers/gpu/drm/radeon/radeon_irq_kms.c | 8 +- drivers/gpu/drm/radeon/rs600.c | 37 +++--- 6 files changed, 291 insertions(+), 146 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +151 -77
@@ -2031,6 +2031,7 @@ int evergreen_irq_set(struct radeon_device *rdev)u32 crtc1 =0 , crtc2 =0 , crtc3 =0 , crtc4 =0 , crtc5 =0 , crtc6 =0 ;u32 hpd1, hpd2, hpd3, hpd4, hpd5, hpd6;u32 grbm_int_cntl =0 ; +u32 grph1 =0 , grph2 =0 , grph3 =0 , grph4 =0 , grph5 =0 , grph6 =0 ;if (!rdev->irq.installed) {WARN (1 ,"Can't enable IRQ/MSI because no handler is installed.\n" );
@@ -2108,6 +2109,30 @@ int evergreen_irq_set(struct radeon_device *rdev)DRM_DEBUG ("gui idle\n" ); grbm_int_cntl |=GUI_IDLE_INT_ENABLE ; } +if (rdev->irq.pflip[0 ]) { +DRM_DEBUG ("pflip 0\n" ); + grph1 |=GRPH_PFLIP_INT_MASK ; + } +if (rdev->irq.pflip[1 ]) { +DRM_DEBUG ("pflip 1\n" ); + grph2 |=GRPH_PFLIP_INT_MASK ; + } +if (rdev->irq.pflip[2 ]) { +DRM_DEBUG ("pflip 2\n" ); + grph3 |=GRPH_PFLIP_INT_MASK ; + } +if (rdev->irq.pflip[3 ]) { +DRM_DEBUG ("pflip 3\n" ); + grph4 |=GRPH_PFLIP_INT_MASK ; + } +if (rdev->irq.pflip[4 ]) { +DRM_DEBUG ("pflip 4\n" ); + grph5 |=GRPH_PFLIP_INT_MASK ; + } +if (rdev->irq.pflip[5 ]) { +DRM_DEBUG ("pflip 5\n" ); + grph6 |=GRPH_PFLIP_INT_MASK ; + }WREG32 (CP_INT_CNTL , cp_int_cntl);WREG32 (GRBM_INT_CNTL , grbm_int_cntl);
@@ -2119,6 +2144,13 @@ int evergreen_irq_set(struct radeon_device *rdev)WREG32 (INT_MASK +EVERGREEN_CRTC4_REGISTER_OFFSET , crtc5);WREG32 (INT_MASK +EVERGREEN_CRTC5_REGISTER_OFFSET , crtc6); +WREG32 (GRPH_INT_CONTROL +EVERGREEN_CRTC0_REGISTER_OFFSET , grph1); +WREG32 (GRPH_INT_CONTROL +EVERGREEN_CRTC1_REGISTER_OFFSET , grph2); +WREG32 (GRPH_INT_CONTROL +EVERGREEN_CRTC2_REGISTER_OFFSET , grph3); +WREG32 (GRPH_INT_CONTROL +EVERGREEN_CRTC3_REGISTER_OFFSET , grph4); +WREG32 (GRPH_INT_CONTROL +EVERGREEN_CRTC4_REGISTER_OFFSET , grph5); +WREG32 (GRPH_INT_CONTROL +EVERGREEN_CRTC5_REGISTER_OFFSET , grph6); +WREG32 (DC_HPD1_INT_CONTROL , hpd1);WREG32 (DC_HPD2_INT_CONTROL , hpd2);WREG32 (DC_HPD3_INT_CONTROL , hpd3);
@@ -2129,79 +2161,92 @@ int evergreen_irq_set(struct radeon_device *rdev)return 0 ; } -static inline void evergreen_irq_ack (struct radeon_device *rdev, -u32 *disp_int, -u32 *disp_int_cont, -u32 *disp_int_cont2, -u32 *disp_int_cont3, -u32 *disp_int_cont4, -u32 *disp_int_cont5) +static inline void evergreen_irq_ack (struct radeon_device *rdev) {u32 tmp; - *disp_int =RREG32 (DISP_INTERRUPT_STATUS ); - *disp_int_cont =RREG32 (DISP_INTERRUPT_STATUS_CONTINUE ); - *disp_int_cont2 =RREG32 (DISP_INTERRUPT_STATUS_CONTINUE2 ); - *disp_int_cont3 =RREG32 (DISP_INTERRUPT_STATUS_CONTINUE3 ); - *disp_int_cont4 =RREG32 (DISP_INTERRUPT_STATUS_CONTINUE4 ); - *disp_int_cont5 =RREG32 (DISP_INTERRUPT_STATUS_CONTINUE5 ); - -if (*disp_int &LB_D1_VBLANK_INTERRUPT ) + rdev->irq.stat_regs.evergreen.disp_int =RREG32 (DISP_INTERRUPT_STATUS ); + rdev->irq.stat_regs.evergreen.disp_int_cont =RREG32 (DISP_INTERRUPT_STATUS_CONTINUE ); + rdev->irq.stat_regs.evergreen.disp_int_cont2 =RREG32 (DISP_INTERRUPT_STATUS_CONTINUE2 ); + rdev->irq.stat_regs.evergreen.disp_int_cont3 =RREG32 (DISP_INTERRUPT_STATUS_CONTINUE3 ); + rdev->irq.stat_regs.evergreen.disp_int_cont4 =RREG32 (DISP_INTERRUPT_STATUS_CONTINUE4 ); + rdev->irq.stat_regs.evergreen.disp_int_cont5 =RREG32 (DISP_INTERRUPT_STATUS_CONTINUE5 ); + rdev->irq.stat_regs.evergreen.d1grph_int =RREG32 (GRPH_INT_STATUS +EVERGREEN_CRTC0_REGISTER_OFFSET ); + rdev->irq.stat_regs.evergreen.d2grph_int =RREG32 (GRPH_INT_STATUS +EVERGREEN_CRTC1_REGISTER_OFFSET ); + rdev->irq.stat_regs.evergreen.d3grph_int =RREG32 (GRPH_INT_STATUS +EVERGREEN_CRTC2_REGISTER_OFFSET ); + rdev->irq.stat_regs.evergreen.d4grph_int =RREG32 (GRPH_INT_STATUS +EVERGREEN_CRTC3_REGISTER_OFFSET ); + rdev->irq.stat_regs.evergreen.d5grph_int =RREG32 (GRPH_INT_STATUS +EVERGREEN_CRTC4_REGISTER_OFFSET ); + rdev->irq.stat_regs.evergreen.d6grph_int =RREG32 (GRPH_INT_STATUS +EVERGREEN_CRTC5_REGISTER_OFFSET ); + +if (rdev->irq.stat_regs.evergreen.d1grph_int &GRPH_PFLIP_INT_OCCURRED ) +WREG32 (GRPH_INT_STATUS +EVERGREEN_CRTC0_REGISTER_OFFSET ,GRPH_PFLIP_INT_CLEAR ); +if (rdev->irq.stat_regs.evergreen.d2grph_int &GRPH_PFLIP_INT_OCCURRED ) +WREG32 (GRPH_INT_STATUS +EVERGREEN_CRTC1_REGISTER_OFFSET ,GRPH_PFLIP_INT_CLEAR ); +if (rdev->irq.stat_regs.evergreen.d3grph_int &GRPH_PFLIP_INT_OCCURRED ) +WREG32 (GRPH_INT_STATUS +EVERGREEN_CRTC2_REGISTER_OFFSET ,GRPH_PFLIP_INT_CLEAR ); +if (rdev->irq.stat_regs.evergreen.d4grph_int &GRPH_PFLIP_INT_OCCURRED ) +WREG32 (GRPH_INT_STATUS +EVERGREEN_CRTC3_REGISTER_OFFSET ,GRPH_PFLIP_INT_CLEAR ); +if (rdev->irq.stat_regs.evergreen.d5grph_int &GRPH_PFLIP_INT_OCCURRED ) +WREG32 (GRPH_INT_STATUS +EVERGREEN_CRTC4_REGISTER_OFFSET ,GRPH_PFLIP_INT_CLEAR ); +if (rdev->irq.stat_regs.evergreen.d6grph_int &GRPH_PFLIP_INT_OCCURRED ) +WREG32 (GRPH_INT_STATUS +EVERGREEN_CRTC5_REGISTER_OFFSET ,GRPH_PFLIP_INT_CLEAR ); + +if (rdev->irq.stat_regs.evergreen.disp_int &LB_D1_VBLANK_INTERRUPT )WREG32 (VBLANK_STATUS +EVERGREEN_CRTC0_REGISTER_OFFSET ,VBLANK_ACK ); -if (*disp_int &LB_D1_VLINE_INTERRUPT ) +if (rdev->irq.stat_regs.evergreen.disp_int &LB_D1_VLINE_INTERRUPT )WREG32 (VLINE_STATUS +EVERGREEN_CRTC0_REGISTER_OFFSET ,VLINE_ACK ); -if (*disp_int_cont &LB_D2_VBLANK_INTERRUPT ) +if (rdev->irq.stat_regs.evergreen.disp_int_cont &LB_D2_VBLANK_INTERRUPT )WREG32 (VBLANK_STATUS +EVERGREEN_CRTC1_REGISTER_OFFSET ,VBLANK_ACK ); -if (*disp_int_cont &LB_D2_VLINE_INTERRUPT ) +if (rdev->irq.stat_regs.evergreen.disp_int_cont &LB_D2_VLINE_INTERRUPT )WREG32 (VLINE_STATUS +EVERGREEN_CRTC1_REGISTER_OFFSET ,VLINE_ACK ); -if (*disp_int_cont2 &LB_D3_VBLANK_INTERRUPT ) +if (rdev->irq.stat_regs.evergreen.disp_int_cont2 &LB_D3_VBLANK_INTERRUPT )WREG32 (VBLANK_STATUS +EVERGREEN_CRTC2_REGISTER_OFFSET ,VBLANK_ACK ); -if (*disp_int_cont2 &LB_D3_VLINE_INTERRUPT ) +if (rdev->irq.stat_regs.evergreen.disp_int_cont2 &LB_D3_VLINE_INTERRUPT )WREG32 (VLINE_STATUS +EVERGREEN_CRTC2_REGISTER_OFFSET ,VLINE_ACK ); -if (*disp_int_cont3 &LB_D4_VBLANK_INTERRUPT ) +if (rdev->irq.stat_regs.evergreen.disp_int_cont3 &LB_D4_VBLANK_INTERRUPT )WREG32 (VBLANK_STATUS +EVERGREEN_CRTC3_REGISTER_OFFSET ,VBLANK_ACK ); -if (*disp_int_cont3 &LB_D4_VLINE_INTERRUPT ) +if (rdev->irq.stat_regs.evergreen.disp_int_cont3 &LB_D4_VLINE_INTERRUPT )WREG32 (VLINE_STATUS +EVERGREEN_CRTC3_REGISTER_OFFSET ,VLINE_ACK ); -if (*disp_int_cont4 &LB_D5_VBLANK_INTERRUPT ) +if (rdev->irq.stat_regs.evergreen.disp_int_cont4 &LB_D5_VBLANK_INTERRUPT )WREG32 (VBLANK_STATUS +EVERGREEN_CRTC4_REGISTER_OFFSET ,VBLANK_ACK ); -if (*disp_int_cont4 &LB_D5_VLINE_INTERRUPT ) +if (rdev->irq.stat_regs.evergreen.disp_int_cont4 &LB_D5_VLINE_INTERRUPT )WREG32 (VLINE_STATUS +EVERGREEN_CRTC4_REGISTER_OFFSET ,VLINE_ACK ); -if (*disp_int_cont5 &LB_D6_VBLANK_INTERRUPT ) +if (rdev->irq.stat_regs.evergreen.disp_int_cont5 &LB_D6_VBLANK_INTERRUPT )WREG32 (VBLANK_STATUS +EVERGREEN_CRTC5_REGISTER_OFFSET ,VBLANK_ACK ); -if (*disp_int_cont5 &LB_D6_VLINE_INTERRUPT ) +if (rdev->irq.stat_regs.evergreen.disp_int_cont5 &LB_D6_VLINE_INTERRUPT )WREG32 (VLINE_STATUS +EVERGREEN_CRTC5_REGISTER_OFFSET ,VLINE_ACK ); -if (*disp_int &DC_HPD1_INTERRUPT ) { +if (rdev->irq.stat_regs.evergreen.disp_int &DC_HPD1_INTERRUPT ) { tmp =RREG32 (DC_HPD1_INT_CONTROL ); tmp |= DC_HPDx_INT_ACK;WREG32 (DC_HPD1_INT_CONTROL , tmp); } -if (*disp_int_cont &DC_HPD2_INTERRUPT ) { +if (rdev->irq.stat_regs.evergreen.disp_int_cont &DC_HPD2_INTERRUPT ) { tmp =RREG32 (DC_HPD2_INT_CONTROL ); tmp |= DC_HPDx_INT_ACK;WREG32 (DC_HPD2_INT_CONTROL , tmp); } -if (*disp_int_cont2 &DC_HPD3_INTERRUPT ) { +if (rdev->irq.stat_regs.evergreen.disp_int_cont2 &DC_HPD3_INTERRUPT ) { tmp =RREG32 (DC_HPD3_INT_CONTROL ); tmp |= DC_HPDx_INT_ACK;WREG32 (DC_HPD3_INT_CONTROL , tmp); } -if (*disp_int_cont3 &DC_HPD4_INTERRUPT ) { +if (rdev->irq.stat_regs.evergreen.disp_int_cont3 &DC_HPD4_INTERRUPT ) { tmp =RREG32 (DC_HPD4_INT_CONTROL ); tmp |= DC_HPDx_INT_ACK;WREG32 (DC_HPD4_INT_CONTROL , tmp); } -if (*disp_int_cont4 &DC_HPD5_INTERRUPT ) { +if (rdev->irq.stat_regs.evergreen.disp_int_cont4 &DC_HPD5_INTERRUPT ) { tmp =RREG32 (DC_HPD5_INT_CONTROL ); tmp |= DC_HPDx_INT_ACK;WREG32 (DC_HPD5_INT_CONTROL , tmp); } -if (*disp_int_cont5 &DC_HPD6_INTERRUPT ) { +if (rdev->irq.stat_regs.evergreen.disp_int_cont5 &DC_HPD6_INTERRUPT ) { tmp =RREG32 (DC_HPD5_INT_CONTROL ); tmp |= DC_HPDx_INT_ACK;WREG32 (DC_HPD6_INT_CONTROL , tmp);
@@ -2210,14 +2255,10 @@ static inline void evergreen_irq_ack(struct radeon_device *rdev,void evergreen_irq_disable (struct radeon_device *rdev) { -u32 disp_int, disp_int_cont, disp_int_cont2; -u32 disp_int_cont3, disp_int_cont4, disp_int_cont5; -r600_disable_interrupts (rdev);/* Wait and acknowledge irq */ mdelay (1 ); -evergreen_irq_ack (rdev, &disp_int, &disp_int_cont, &disp_int_cont2, - &disp_int_cont3, &disp_int_cont4, &disp_int_cont5); +evergreen_irq_ack (rdev);evergreen_disable_interrupt_state (rdev); }
@@ -2257,8 +2298,6 @@ int evergreen_irq_process(struct radeon_device *rdev)u32 rptr = rdev->ih.rptr;u32 src_id, src_data;u32 ring_index; -u32 disp_int, disp_int_cont, disp_int_cont2; -u32 disp_int_cont3, disp_int_cont4, disp_int_cont5;unsigned long flags;bool queue_hotplug = false;
@@ -2279,8 +2318,7 @@ int evergreen_irq_process(struct radeon_device *rdev) restart_ih:/* display interrupts */ -evergreen_irq_ack (rdev, &disp_int, &disp_int_cont, &disp_int_cont2, - &disp_int_cont3, &disp_int_cont4, &disp_int_cont5); +evergreen_irq_ack (rdev); rdev->ih.wptr = wptr;while (rptr != wptr) {
@@ -2293,16 +2331,16 @@ restart_ih:case 1 :/* D1 vblank/vline */ switch (src_data) {case 0 :/* D1 vblank */ -if (disp_int &LB_D1_VBLANK_INTERRUPT ) { +if (rdev->irq.stat_regs.evergreen.disp_int &LB_D1_VBLANK_INTERRUPT ) {drm_handle_vblank (rdev->ddev,0 );wake_up (&rdev->irq.vblank_queue); - disp_int &= ~LB_D1_VBLANK_INTERRUPT ; + rdev->irq.stat_regs.evergreen.disp_int &= ~LB_D1_VBLANK_INTERRUPT ;DRM_DEBUG ("IH: D1 vblank\n" ); }break ;case 1 :/* D1 vline */ -if (disp_int &LB_D1_VLINE_INTERRUPT ) { - disp_int &= ~LB_D1_VLINE_INTERRUPT ; +if (rdev->irq.stat_regs.evergreen.disp_int &LB_D1_VLINE_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int &= ~LB_D1_VLINE_INTERRUPT ;DRM_DEBUG ("IH: D1 vline\n" ); }break ;
@@ -2314,16 +2352,16 @@ restart_ih:case 2 :/* D2 vblank/vline */ switch (src_data) {case 0 :/* D2 vblank */ -if (disp_int_cont &LB_D2_VBLANK_INTERRUPT ) { +if (rdev->irq.stat_regs.evergreen.disp_int_cont &LB_D2_VBLANK_INTERRUPT ) {drm_handle_vblank (rdev->ddev,1 );wake_up (&rdev->irq.vblank_queue); - disp_int_cont &= ~LB_D2_VBLANK_INTERRUPT ; + rdev->irq.stat_regs.evergreen.disp_int_cont &= ~LB_D2_VBLANK_INTERRUPT ;DRM_DEBUG ("IH: D2 vblank\n" ); }break ;case 1 :/* D2 vline */ -if (disp_int_cont &LB_D2_VLINE_INTERRUPT ) { - disp_int_cont &= ~LB_D2_VLINE_INTERRUPT ; +if (rdev->irq.stat_regs.evergreen.disp_int_cont &LB_D2_VLINE_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont &= ~LB_D2_VLINE_INTERRUPT ;DRM_DEBUG ("IH: D2 vline\n" ); }break ;
@@ -2335,16 +2373,16 @@ restart_ih:case 3 :/* D3 vblank/vline */ switch (src_data) {case 0 :/* D3 vblank */ -if (disp_int_cont2 &LB_D3_VBLANK_INTERRUPT ) { +if (rdev->irq.stat_regs.evergreen.disp_int_cont2 &LB_D3_VBLANK_INTERRUPT ) {drm_handle_vblank (rdev->ddev,2 );wake_up (&rdev->irq.vblank_queue); - disp_int_cont2 &= ~LB_D3_VBLANK_INTERRUPT ; + rdev->irq.stat_regs.evergreen.disp_int_cont2 &= ~LB_D3_VBLANK_INTERRUPT ;DRM_DEBUG ("IH: D3 vblank\n" ); }break ;case 1 :/* D3 vline */ -if (disp_int_cont2 &LB_D3_VLINE_INTERRUPT ) { - disp_int_cont2 &= ~LB_D3_VLINE_INTERRUPT ; +if (rdev->irq.stat_regs.evergreen.disp_int_cont2 &LB_D3_VLINE_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont2 &= ~LB_D3_VLINE_INTERRUPT ;DRM_DEBUG ("IH: D3 vline\n" ); }break ;
@@ -2356,16 +2394,16 @@ restart_ih:case 4 :/* D4 vblank/vline */ switch (src_data) {case 0 :/* D4 vblank */ -if (disp_int_cont3 &LB_D4_VBLANK_INTERRUPT ) { +if (rdev->irq.stat_regs.evergreen.disp_int_cont3 &LB_D4_VBLANK_INTERRUPT ) {drm_handle_vblank (rdev->ddev,3 );wake_up (&rdev->irq.vblank_queue); - disp_int_cont3 &= ~LB_D4_VBLANK_INTERRUPT ; + rdev->irq.stat_regs.evergreen.disp_int_cont3 &= ~LB_D4_VBLANK_INTERRUPT ;DRM_DEBUG ("IH: D4 vblank\n" ); }break ;case 1 :/* D4 vline */ -if (disp_int_cont3 &LB_D4_VLINE_INTERRUPT ) { - disp_int_cont3 &= ~LB_D4_VLINE_INTERRUPT ; +if (rdev->irq.stat_regs.evergreen.disp_int_cont3 &LB_D4_VLINE_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont3 &= ~LB_D4_VLINE_INTERRUPT ;DRM_DEBUG ("IH: D4 vline\n" ); }break ;
@@ -2377,16 +2415,16 @@ restart_ih:case 5 :/* D5 vblank/vline */ switch (src_data) {case 0 :/* D5 vblank */ -if (disp_int_cont4 &LB_D5_VBLANK_INTERRUPT ) { +if (rdev->irq.stat_regs.evergreen.disp_int_cont4 &LB_D5_VBLANK_INTERRUPT ) {drm_handle_vblank (rdev->ddev,4 );wake_up (&rdev->irq.vblank_queue); - disp_int_cont4 &= ~LB_D5_VBLANK_INTERRUPT ; + rdev->irq.stat_regs.evergreen.disp_int_cont4 &= ~LB_D5_VBLANK_INTERRUPT ;DRM_DEBUG ("IH: D5 vblank\n" ); }break ;case 1 :/* D5 vline */ -if (disp_int_cont4 &LB_D5_VLINE_INTERRUPT ) { - disp_int_cont4 &= ~LB_D5_VLINE_INTERRUPT ; +if (rdev->irq.stat_regs.evergreen.disp_int_cont4 &LB_D5_VLINE_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont4 &= ~LB_D5_VLINE_INTERRUPT ;DRM_DEBUG ("IH: D5 vline\n" ); }break ;
@@ -2398,16 +2436,16 @@ restart_ih:case 6 :/* D6 vblank/vline */ switch (src_data) {case 0 :/* D6 vblank */ -if (disp_int_cont5 &LB_D6_VBLANK_INTERRUPT ) { +if (rdev->irq.stat_regs.evergreen.disp_int_cont5 &LB_D6_VBLANK_INTERRUPT ) {drm_handle_vblank (rdev->ddev,5 );wake_up (&rdev->irq.vblank_queue); - disp_int_cont5 &= ~LB_D6_VBLANK_INTERRUPT ; + rdev->irq.stat_regs.evergreen.disp_int_cont5 &= ~LB_D6_VBLANK_INTERRUPT ;DRM_DEBUG ("IH: D6 vblank\n" ); }break ;case 1 :/* D6 vline */ -if (disp_int_cont5 &LB_D6_VLINE_INTERRUPT ) { - disp_int_cont5 &= ~LB_D6_VLINE_INTERRUPT ; +if (rdev->irq.stat_regs.evergreen.disp_int_cont5 &LB_D6_VLINE_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont5 &= ~LB_D6_VLINE_INTERRUPT ;DRM_DEBUG ("IH: D6 vline\n" ); }break ;
@@ -2416,46 +2454,82 @@ restart_ih:break ; }break ; +case 8 :/* D1 pflip */ +if (rdev->irq.stat_regs.evergreen.d1grph_int &GRPH_PFLIP_INT_OCCURRED ) { + rdev->irq.stat_regs.evergreen.d1grph_int &= ~GRPH_PFLIP_INT_OCCURRED ; +DRM_DEBUG ("IH: D1 pflip\n" ); + } +break ; +case 10 :/* D2 pflip */ +if (rdev->irq.stat_regs.evergreen.d2grph_int &GRPH_PFLIP_INT_OCCURRED ) { + rdev->irq.stat_regs.evergreen.d2grph_int &= ~GRPH_PFLIP_INT_OCCURRED ; +DRM_DEBUG ("IH: D2 pflip\n" ); + } +break ; +case 12 :/* D3 pflip */ +if (rdev->irq.stat_regs.evergreen.d3grph_int &GRPH_PFLIP_INT_OCCURRED ) { + rdev->irq.stat_regs.evergreen.d3grph_int &= ~GRPH_PFLIP_INT_OCCURRED ; +DRM_DEBUG ("IH: D3 pflip\n" ); + } +break ; +case 14 :/* D4 pflip */ +if (rdev->irq.stat_regs.evergreen.d4grph_int &GRPH_PFLIP_INT_OCCURRED ) { + rdev->irq.stat_regs.evergreen.d4grph_int &= ~GRPH_PFLIP_INT_OCCURRED ; +DRM_DEBUG ("IH: D4 pflip\n" ); + } +break ; +case 16 :/* D5 pflip */ +if (rdev->irq.stat_regs.evergreen.d5grph_int &GRPH_PFLIP_INT_OCCURRED ) { + rdev->irq.stat_regs.evergreen.d5grph_int &= ~GRPH_PFLIP_INT_OCCURRED ; +DRM_DEBUG ("IH: D5 pflip\n" ); + } +break ; +case 18 :/* D6 pflip */ +if (rdev->irq.stat_regs.evergreen.d6grph_int &GRPH_PFLIP_INT_OCCURRED ) { + rdev->irq.stat_regs.evergreen.d6grph_int &= ~GRPH_PFLIP_INT_OCCURRED ; +DRM_DEBUG ("IH: D6 pflip\n" ); + } +break ;case 42 :/* HPD hotplug */ switch (src_data) {case 0 : -if (disp_int &DC_HPD1_INTERRUPT ) { - disp_int &= ~DC_HPD1_INTERRUPT ; +if (rdev->irq.stat_regs.evergreen.disp_int &DC_HPD1_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int &= ~DC_HPD1_INTERRUPT ; queue_hotplug = true;DRM_DEBUG ("IH: HPD1\n" ); }break ;case 1 : -if (disp_int_cont &DC_HPD2_INTERRUPT ) { - disp_int_cont &= ~DC_HPD2_INTERRUPT ; +if (rdev->irq.stat_regs.evergreen.disp_int_cont &DC_HPD2_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont &= ~DC_HPD2_INTERRUPT ; queue_hotplug = true;DRM_DEBUG ("IH: HPD2\n" ); }break ;case 2 : -if (disp_int_cont2 &DC_HPD3_INTERRUPT ) { - disp_int_cont2 &= ~DC_HPD3_INTERRUPT ; +if (rdev->irq.stat_regs.evergreen.disp_int_cont2 &DC_HPD3_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont2 &= ~DC_HPD3_INTERRUPT ; queue_hotplug = true;DRM_DEBUG ("IH: HPD3\n" ); }break ;case 3 : -if (disp_int_cont3 &DC_HPD4_INTERRUPT ) { - disp_int_cont3 &= ~DC_HPD4_INTERRUPT ; +if (rdev->irq.stat_regs.evergreen.disp_int_cont3 &DC_HPD4_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont3 &= ~DC_HPD4_INTERRUPT ; queue_hotplug = true;DRM_DEBUG ("IH: HPD4\n" ); }break ;case 4 : -if (disp_int_cont4 &DC_HPD5_INTERRUPT ) { - disp_int_cont4 &= ~DC_HPD5_INTERRUPT ; +if (rdev->irq.stat_regs.evergreen.disp_int_cont4 &DC_HPD5_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont4 &= ~DC_HPD5_INTERRUPT ; queue_hotplug = true;DRM_DEBUG ("IH: HPD5\n" ); }break ;case 5 : -if (disp_int_cont5 &DC_HPD6_INTERRUPT ) { - disp_int_cont5 &= ~DC_HPD6_INTERRUPT ; +if (rdev->irq.stat_regs.evergreen.disp_int_cont5 &DC_HPD6_INTERRUPT ) { + rdev->irq.stat_regs.evergreen.disp_int_cont5 &= ~DC_HPD6_INTERRUPT ; queue_hotplug = true;DRM_DEBUG ("IH: HPD6\n" ); }
drivers/gpu/drm/radeon/r600.c +73 -47
264 lines not on this page · raw message
drivers/gpu/drm/radeon/r600d.h +9 -0
@@ -722,6 +722,15 @@/* DCE 3.2 */ # define DC_HPDx_EN (1 << 28) +#define D1GRPH_INTERRUPT_STATUS 0x6158 +#define D2GRPH_INTERRUPT_STATUS 0x6958 +# define DxGRPH_PFLIP_INT_OCCURRED (1 << 0) +# define DxGRPH_PFLIP_INT_CLEAR (1 << 8) +#define D1GRPH_INTERRUPT_CONTROL 0x615c +#define D2GRPH_INTERRUPT_CONTROL 0x695c +# define DxGRPH_PFLIP_INT_MASK (1 << 0) +# define DxGRPH_PFLIP_INT_TYPE (1 << 8) +/* * PM4 */
drivers/gpu/drm/radeon/radeon.h +35 -0
@@ -377,11 +377,45 @@ void radeon_scratch_free(struct radeon_device *rdev, uint32_t reg);/* * IRQS. */ +struct r500_irq_stat_regs { +u32 disp_int; +}; + +struct r600_irq_stat_regs { +u32 disp_int; +u32 disp_int_cont; +u32 disp_int_cont2; +u32 d1grph_int; +u32 d2grph_int; +}; + +struct evergreen_irq_stat_regs { +u32 disp_int; +u32 disp_int_cont; +u32 disp_int_cont2; +u32 disp_int_cont3; +u32 disp_int_cont4; +u32 disp_int_cont5; +u32 d1grph_int; +u32 d2grph_int; +u32 d3grph_int; +u32 d4grph_int; +u32 d5grph_int; +u32 d6grph_int; +}; + +union radeon_irq_stat_regs { +struct r500_irq_stat_regs r500; +struct r600_irq_stat_regs r600; +struct evergreen_irq_stat_regs evergreen; +}; +struct radeon_irq {bool installed;bool sw_int;/* FIXME: use a define max crtc rather than hardcode it */ bool crtc_vblank_int[6 ]; +bool pflip[6 ];wait_queue_head_t vblank_queue;/* FIXME: use defines for max hpd/dacs */ bool hpd[6 ];
@@ -392,6 +426,7 @@ struct radeon_irq {bool hdmi[2 ];spinlock_t sw_lock;int sw_refcount; +union radeon_irq_stat_regs stat_regs; };int radeon_irq_kms_init (struct radeon_device *rdev);
drivers/gpu/drm/radeon/radeon_irq_kms.c +6 -2
@@ -71,8 +71,10 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev) rdev->irq.gui_idle = false;for (i =0 ; i < rdev->num_crtc; i++) rdev->irq.crtc_vblank_int[i] = false; -for (i =0 ; i <6 ; i++) +for (i =0 ; i <6 ; i++) { rdev->irq.hpd[i] = false; + rdev->irq.pflip[i] = false; + }radeon_irq_set (rdev);/* Clear bits */ radeon_irq_process (rdev);
@@ -101,8 +103,10 @@ void radeon_driver_irq_uninstall_kms(struct drm_device *dev) rdev->irq.gui_idle = false;for (i =0 ; i < rdev->num_crtc; i++) rdev->irq.crtc_vblank_int[i] = false; -for (i =0 ; i <6 ; i++) +for (i =0 ; i <6 ; i++) { rdev->irq.hpd[i] = false; + rdev->irq.pflip[i] = false; + }radeon_irq_set (rdev); }
drivers/gpu/drm/radeon/rs600.c +17 -20
@@ -534,7 +534,7 @@ int rs600_irq_set(struct radeon_device *rdev)return 0 ; } -static inline uint32_t rs600_irq_ack (struct radeon_device *rdev,u32 *r500_disp_int) +static inline u32 rs600_irq_ack (struct radeon_device *rdev) {uint32_t irqs =RREG32 (R_000044_GEN_INT_STATUS );uint32_t irq_mask =S_000044_SW_INT (1 );
@@ -547,27 +547,27 @@ static inline uint32_t rs600_irq_ack(struct radeon_device *rdev, u32 *r500_disp_ }if (G_000044_DISPLAY_INT_STAT (irqs)) { - *r500_disp_int =RREG32 (R_007EDC_DISP_INTERRUPT_STATUS ); -if (G_007EDC_LB_D1_VBLANK_INTERRUPT (*r500_disp_int)) { + rdev->irq.stat_regs.r500.disp_int =RREG32 (R_007EDC_DISP_INTERRUPT_STATUS ); +if (G_007EDC_LB_D1_VBLANK_INTERRUPT (rdev->irq.stat_regs.r500.disp_int)) {WREG32 (R_006534_D1MODE_VBLANK_STATUS ,S_006534_D1MODE_VBLANK_ACK (1 )); } -if (G_007EDC_LB_D2_VBLANK_INTERRUPT (*r500_disp_int)) { +if (G_007EDC_LB_D2_VBLANK_INTERRUPT (rdev->irq.stat_regs.r500.disp_int)) {WREG32 (R_006D34_D2MODE_VBLANK_STATUS ,S_006D34_D2MODE_VBLANK_ACK (1 )); } -if (G_007EDC_DC_HOT_PLUG_DETECT1_INTERRUPT (*r500_disp_int)) { +if (G_007EDC_DC_HOT_PLUG_DETECT1_INTERRUPT (rdev->irq.stat_regs.r500.disp_int)) { tmp =RREG32 (R_007D08_DC_HOT_PLUG_DETECT1_INT_CONTROL ); tmp |=S_007D08_DC_HOT_PLUG_DETECT1_INT_ACK (1 );WREG32 (R_007D08_DC_HOT_PLUG_DETECT1_INT_CONTROL , tmp); } -if (G_007EDC_DC_HOT_PLUG_DETECT2_INTERRUPT (*r500_disp_int)) { +if (G_007EDC_DC_HOT_PLUG_DETECT2_INTERRUPT (rdev->irq.stat_regs.r500.disp_int)) { tmp =RREG32 (R_007D18_DC_HOT_PLUG_DETECT2_INT_CONTROL ); tmp |=S_007D18_DC_HOT_PLUG_DETECT2_INT_ACK (1 );WREG32 (R_007D18_DC_HOT_PLUG_DETECT2_INT_CONTROL , tmp); } }else { - *r500_disp_int =0 ; + rdev->irq.stat_regs.r500.disp_int =0 ; }if (irqs) {
@@ -578,29 +578,26 @@ static inline uint32_t rs600_irq_ack(struct radeon_device *rdev, u32 *r500_disp_void rs600_irq_disable (struct radeon_device *rdev) { -u32 tmp; -WREG32 (R_000040_GEN_INT_CNTL ,0 );WREG32 (R_006540_DxMODE_INT_MASK,0 );/* Wait and acknowledge irq */ mdelay (1 ); -rs600_irq_ack (rdev, &tmp); +rs600_irq_ack (rdev); }int rs600_irq_process (struct radeon_device *rdev) { -uint32_t status, msi_rearm; -uint32_t r500_disp_int; +u32 status, msi_rearm;bool queue_hotplug = false;/* reset gui idle ack. the status bit is broken */ rdev->irq.gui_idle_acked = false; - status =rs600_irq_ack (rdev, &r500_disp_int); -if (!status && !r500_disp_int) { + status =rs600_irq_ack (rdev); +if (!status && !rdev->irq.stat_regs.r500.disp_int) {return IRQ_NONE ; } -while (status || r500_disp_int) { +while (status || rdev->irq.stat_regs.r500.disp_int) {/* SW interrupt */ if (G_000044_SW_INT (status))radeon_fence_process (rdev);
@@ -611,25 +608,25 @@ int rs600_irq_process(struct radeon_device *rdev)wake_up (&rdev->irq.idle_queue); }/* Vertical blank interrupts */ -if (G_007EDC_LB_D1_VBLANK_INTERRUPT (r500_disp_int)) { +if (G_007EDC_LB_D1_VBLANK_INTERRUPT (rdev->irq.stat_regs.r500.disp_int)) {drm_handle_vblank (rdev->ddev,0 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); } -if (G_007EDC_LB_D2_VBLANK_INTERRUPT (r500_disp_int)) { +if (G_007EDC_LB_D2_VBLANK_INTERRUPT (rdev->irq.stat_regs.r500.disp_int)) {drm_handle_vblank (rdev->ddev,1 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); } -if (G_007EDC_DC_HOT_PLUG_DETECT1_INTERRUPT (r500_disp_int)) { +if (G_007EDC_DC_HOT_PLUG_DETECT1_INTERRUPT (rdev->irq.stat_regs.r500.disp_int)) { queue_hotplug = true;DRM_DEBUG ("HPD1\n" ); } -if (G_007EDC_DC_HOT_PLUG_DETECT2_INTERRUPT (r500_disp_int)) { +if (G_007EDC_DC_HOT_PLUG_DETECT2_INTERRUPT (rdev->irq.stat_regs.r500.disp_int)) { queue_hotplug = true;DRM_DEBUG ("HPD2\n" ); } - status =rs600_irq_ack (rdev, &r500_disp_int); + status =rs600_irq_ack (rdev); }/* reset gui idle ack. the status bit is broken */ rdev->irq.gui_idle_acked = false;
Signature · 1 line
1.7.1.1
PATCH 2/2 drm/radeon/kms: add pageflip ioctl support
In reply to Alex DeucherThis adds support for dri2 pageflipping.
--- drivers/gpu/drm/radeon/evergreen.c | 36 +++++++++++ drivers/gpu/drm/radeon/evergreen_reg.h | 3 + drivers/gpu/drm/radeon/evergreend.h | 14 ++++ drivers/gpu/drm/radeon/r100.c | 104 ++++++++++++++++++++++++++++--- drivers/gpu/drm/radeon/r500_reg.h | 1 + drivers/gpu/drm/radeon/r600.c | 23 +++++++ drivers/gpu/drm/radeon/r600d.h | 20 ++++++ drivers/gpu/drm/radeon/radeon.h | 12 ++++ drivers/gpu/drm/radeon/radeon_asic.c | 42 ++++++++++++ drivers/gpu/drm/radeon/radeon_asic.h | 7 ++ drivers/gpu/drm/radeon/radeon_display.c | 101 ++++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/radeon_drv.c | 2 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 62 ++++++++++++++++++ drivers/gpu/drm/radeon/radeon_mode.h | 7 ++ drivers/gpu/drm/radeon/rs600.c | 49 ++++++++++++--- drivers/gpu/drm/radeon/rs600d.h | 13 ++++ drivers/gpu/drm/radeon/rv770.c | 34 ++++++++++ drivers/gpu/drm/radeon/rv770d.h | 39 ++++++++++++ 18 files changed, 552 insertions(+), 17 deletions(-)
drivers/gpu/drm/radeon/evergreen.c +36 -0
@@ -40,6 +40,27 @@static void evergreen_gpu_init (struct radeon_device *rdev);void evergreen_fini (struct radeon_device *rdev); +void evergreen_page_flip (struct drm_crtc *crtc,u64 crtc_base) +{ +struct drm_device *dev = crtc->dev; +struct radeon_device *rdev = dev->dev_private; +struct radeon_crtc *radeon_crtc =to_radeon_crtc (crtc); +#if 0 +radeon_ring_write (rdev, +PACKET0 (EVERGREEN_GRPH_SECONDARY_SURFACE_ADDRESS_HIGH + radeon_crtc->crtc_offset,0 )); +radeon_ring_write (rdev,upper_32_bits (crtc_base)); +radeon_ring_write (rdev, +PACKET0 (EVERGREEN_GRPH_SECONDARY_SURFACE_ADDRESS + radeon_crtc->crtc_offset,0 )); +radeon_ring_write (rdev, (u32 )crtc_base); +#endif +radeon_ring_write (rdev, +PACKET0 (EVERGREEN_GRPH_PRIMARY_SURFACE_ADDRESS_HIGH + radeon_crtc->crtc_offset,0 )); +radeon_ring_write (rdev,upper_32_bits (crtc_base)); +radeon_ring_write (rdev, +PACKET0 (EVERGREEN_GRPH_PRIMARY_SURFACE_ADDRESS + radeon_crtc->crtc_offset,0 )); +radeon_ring_write (rdev, (u32 )crtc_base); +} +/* get temperature in millidegrees */ u32 evergreen_get_temp (struct radeon_device *rdev) {
@@ -2300,6 +2321,7 @@ int evergreen_irq_process(struct radeon_device *rdev)u32 ring_index;unsigned long flags;bool queue_hotplug = false; +bool queue_unpin = false;DRM_DEBUG ("r600_irq_process start: rptr %d, wptr %d\n" , rptr, wptr);if (!rdev->ih.enabled)
@@ -2456,36 +2478,48 @@ restart_ih:break ;case 8 :/* D1 pflip */ if (rdev->irq.stat_regs.evergreen.d1grph_int &GRPH_PFLIP_INT_OCCURRED ) { +radeon_crtc_handle_flip (rdev,0 ); + queue_unpin = true; rdev->irq.stat_regs.evergreen.d1grph_int &= ~GRPH_PFLIP_INT_OCCURRED ;DRM_DEBUG ("IH: D1 pflip\n" ); }break ;case 10 :/* D2 pflip */ if (rdev->irq.stat_regs.evergreen.d2grph_int &GRPH_PFLIP_INT_OCCURRED ) { +radeon_crtc_handle_flip (rdev,1 ); + queue_unpin = true; rdev->irq.stat_regs.evergreen.d2grph_int &= ~GRPH_PFLIP_INT_OCCURRED ;DRM_DEBUG ("IH: D2 pflip\n" ); }break ;case 12 :/* D3 pflip */ if (rdev->irq.stat_regs.evergreen.d3grph_int &GRPH_PFLIP_INT_OCCURRED ) { +radeon_crtc_handle_flip (rdev,2 ); + queue_unpin = true; rdev->irq.stat_regs.evergreen.d3grph_int &= ~GRPH_PFLIP_INT_OCCURRED ;DRM_DEBUG ("IH: D3 pflip\n" ); }break ;case 14 :/* D4 pflip */ if (rdev->irq.stat_regs.evergreen.d4grph_int &GRPH_PFLIP_INT_OCCURRED ) { +radeon_crtc_handle_flip (rdev,3 ); + queue_unpin = true; rdev->irq.stat_regs.evergreen.d4grph_int &= ~GRPH_PFLIP_INT_OCCURRED ;DRM_DEBUG ("IH: D4 pflip\n" ); }break ;case 16 :/* D5 pflip */ if (rdev->irq.stat_regs.evergreen.d5grph_int &GRPH_PFLIP_INT_OCCURRED ) { +radeon_crtc_handle_flip (rdev,4 ); + queue_unpin = true; rdev->irq.stat_regs.evergreen.d5grph_int &= ~GRPH_PFLIP_INT_OCCURRED ;DRM_DEBUG ("IH: D5 pflip\n" ); }break ;case 18 :/* D6 pflip */ if (rdev->irq.stat_regs.evergreen.d6grph_int &GRPH_PFLIP_INT_OCCURRED ) { +radeon_crtc_handle_flip (rdev,5 ); + queue_unpin = true; rdev->irq.stat_regs.evergreen.d6grph_int &= ~GRPH_PFLIP_INT_OCCURRED ;DRM_DEBUG ("IH: D6 pflip\n" ); }
@@ -2569,6 +2603,8 @@ restart_ih: goto restart_ih;if (queue_hotplug)queue_work (rdev->wq, &rdev->hotplug_work); +if (queue_unpin) +queue_work (rdev->wq, &rdev->unpin_work); rdev->ih.rptr = rptr;WREG32 (IH_RB_RPTR , rdev->ih.rptr);spin_unlock_irqrestore (&rdev->ih.lock, flags);
drivers/gpu/drm/radeon/evergreen_reg.h +3 -0
@@ -105,6 +105,9 @@#define EVERGREEN_GRPH_Y_START 0x6830#define EVERGREEN_GRPH_X_END 0x6834#define EVERGREEN_GRPH_Y_END 0x6838 +#define EVERGREEN_GRPH_UPDATE 0x6844 +# define EVERGREEN_GRPH_SURFACE_UPDATE_PENDING (1 << 2) +# define EVERGREEN_GRPH_UPDATE_LOCK (1 << 16)/* CUR blocks at 0x6998, 0x7598, 0x10198, 0x10d98, 0x11998, 0x12598 */ #define EVERGREEN_CUR_CONTROL 0x6998
drivers/gpu/drm/radeon/evergreend.h +14 -0
@@ -628,6 +628,20 @@#define PACKET3_MEM_SEMAPHORE 0x39#define PACKET3_MPEG_INDEX 0x3A#define PACKET3_WAIT_REG_MEM 0x3C +# define PACKET3_WAIT_REG_MEM_ENGINE (x) ((x) << 8) +# define ENGINE_ME 0 +# define ENGINE_PFP 1 +# define PACKET3_WAIT_REG_MEM_MEM_SPACE (x) ((x) << 4) +# define MEM_SPACE_REG 0 +# define MEM_SPACE_MEM 1 +# define PACKET3_WAIT_REG_MEM_FUNCTION (x) ((x) << 0) +# define FUNCTION_ALWAYS 0 +# define FUNCTION_LT 1 +# define FUNCTION_LTE 2 +# define FUNCTION_E 3 +# define FUNCTION_NE 4 +# define FUNCTION_GTE 5 +# define FUNCTION_GT 6#define PACKET3_MEM_WRITE 0x3D#define PACKET3_INDIRECT_BUFFER 0x32#define PACKET3_SURFACE_SYNC 0x43
drivers/gpu/drm/radeon/r100.c +96 -8
138 lines not on this page · raw message
drivers/gpu/drm/radeon/r500_reg.h +1 -0
@@ -409,6 +409,7 @@#define AVIVO_D1GRPH_X_END 0x6134#define AVIVO_D1GRPH_Y_END 0x6138#define AVIVO_D1GRPH_UPDATE 0x6144 +# define AVIVO_D1GRPH_SURFACE_UPDATE_PENDING (1 << 2)# define AVIVO_D1GRPH_UPDATE_LOCK (1 << 16)#define AVIVO_D1GRPH_FLIP_CONTROL 0x6148
drivers/gpu/drm/radeon/r600.c +23 -0
@@ -92,6 +92,22 @@ void r600_gpu_init(struct radeon_device *rdev);void r600_fini (struct radeon_device *rdev);void r600_irq_disable (struct radeon_device *rdev); +void r600_page_flip (struct drm_crtc *crtc,u64 crtc_base) +{ +struct drm_device *dev = crtc->dev; +struct radeon_device *rdev = dev->dev_private; +struct radeon_crtc *radeon_crtc =to_radeon_crtc (crtc); +#if 0 +radeon_ring_write (rdev, +PACKET0 (D1GRPH_SECONDARY_SURFACE_ADDRESS + radeon_crtc->crtc_offset,0 )); +radeon_ring_write (rdev, (u32 )crtc_base); +#endif +radeon_ring_write (rdev, +PACKET0 (D1GRPH_PRIMARY_SURFACE_ADDRESS + radeon_crtc->crtc_offset,0 )); +radeon_ring_write (rdev, (u32 )crtc_base); + +} +/* get temperature in millidegrees */ u32 rv6xx_get_temp (struct radeon_device *rdev) {
@@ -3274,6 +3290,7 @@ int r600_irq_process(struct radeon_device *rdev)u32 ring_index;unsigned long flags;bool queue_hotplug = false; +bool queue_unpin = false;DRM_DEBUG ("r600_irq_process start: rptr %d, wptr %d\n" , rptr, wptr);if (!rdev->ih.enabled)
@@ -3348,12 +3365,16 @@ restart_ih:break ;case 9 :/* D1 pflip */ if (rdev->irq.stat_regs.r600.d1grph_int & DxGRPH_PFLIP_INT_OCCURRED) { +radeon_crtc_handle_flip (rdev,0 ); + queue_unpin = true; rdev->irq.stat_regs.r600.d1grph_int &= ~DxGRPH_PFLIP_INT_OCCURRED;DRM_DEBUG ("IH: D1 pflip\n" ); }break ;case 11 :/* D2 pflip */ if (rdev->irq.stat_regs.r600.d2grph_int & DxGRPH_PFLIP_INT_OCCURRED) { +radeon_crtc_handle_flip (rdev,1 ); + queue_unpin = true; rdev->irq.stat_regs.r600.d2grph_int &= ~DxGRPH_PFLIP_INT_OCCURRED;DRM_DEBUG ("IH: D2 pflip\n" ); }
@@ -3441,6 +3462,8 @@ restart_ih: goto restart_ih;if (queue_hotplug)queue_work (rdev->wq, &rdev->hotplug_work); +if (queue_unpin) +queue_work (rdev->wq, &rdev->unpin_work); rdev->ih.rptr = rptr;WREG32 (IH_RB_RPTR , rdev->ih.rptr);spin_unlock_irqrestore (&rdev->ih.lock, flags);
drivers/gpu/drm/radeon/r600d.h +20 -0
@@ -731,6 +731,12 @@# define DxGRPH_PFLIP_INT_MASK (1 << 0)# define DxGRPH_PFLIP_INT_TYPE (1 << 8) +#define D1GRPH_PRIMARY_SURFACE_ADDRESS 0x6110 +#define D1GRPH_SECONDARY_SURFACE_ADDRESS 0x6118 +#define D1GRPH_UPDATE 0x6144 +# define D1GRPH_SURFACE_UPDATE_PENDING (1 << 2) +# define D1GRPH_UPDATE_LOCK (1 << 16) +/* * PM4 */
@@ -771,6 +777,20 @@#define PACKET3_MEM_SEMAPHORE 0x39#define PACKET3_MPEG_INDEX 0x3A#define PACKET3_WAIT_REG_MEM 0x3C +# define PACKET3_WAIT_REG_MEM_ENGINE (x) ((x) << 8) +# define ENGINE_ME 0 +# define ENGINE_PFP 1 +# define PACKET3_WAIT_REG_MEM_MEM_SPACE (x) ((x) << 4) +# define MEM_SPACE_REG 0 +# define MEM_SPACE_MEM 1 +# define PACKET3_WAIT_REG_MEM_FUNCTION (x) ((x) << 0) +# define FUNCTION_ALWAYS 0 +# define FUNCTION_LT 1 +# define FUNCTION_LTE 2 +# define FUNCTION_E 3 +# define FUNCTION_NE 4 +# define FUNCTION_GTE 5 +# define FUNCTION_GT 6#define PACKET3_MEM_WRITE 0x3D#define PACKET3_INDIRECT_BUFFER 0x32#define PACKET3_SURFACE_SYNC 0x43
drivers/gpu/drm/radeon/radeon.h +12 -0
@@ -427,12 +427,16 @@ struct radeon_irq {spinlock_t sw_lock;int sw_refcount;union radeon_irq_stat_regs stat_regs; +spinlock_t pflip_lock[6 ]; +int pflip_refcount[6 ]; };int radeon_irq_kms_init (struct radeon_device *rdev);void radeon_irq_kms_fini (struct radeon_device *rdev);void radeon_irq_kms_sw_irq_get (struct radeon_device *rdev);void radeon_irq_kms_sw_irq_put (struct radeon_device *rdev); +void radeon_irq_kms_pflip_irq_get (struct radeon_device *rdev,int crtc); +void radeon_irq_kms_pflip_irq_put (struct radeon_device *rdev,int crtc);/* * CP & ring.
@@ -916,6 +920,10 @@ struct radeon_asic {void (*pm_finish)(struct radeon_device *rdev);void (*pm_init_profile)(struct radeon_device *rdev);void (*pm_get_dynpm_state)(struct radeon_device *rdev); +/* pageflipping */ +void (*pre_page_flip)(struct radeon_device *rdev,int crtc); +void (*page_flip)(struct drm_crtc *crtc,u64 crtc_base); +void (*post_page_flip)(struct radeon_device *rdev,int crtc); };/*
@@ -1132,6 +1140,7 @@ struct radeon_device {struct r600_ih ih;/* r6/700 interrupt ring */ struct workqueue_struct *wq;struct work_struct hotplug_work; +struct work_struct unpin_work;int num_crtc;/* number of crtcs */ struct mutex dc_hw_i2c_mutex;/* display controller hw i2c mutex */ struct mutex vram_mutex;
@@ -1375,6 +1384,9 @@ static inline void radeon_ring_write(struct radeon_device *rdev, uint32_t v)#define radeon_pm_finish (rdev) (rdev)->asic->pm_finish((rdev))#define radeon_pm_init_profile (rdev) (rdev)->asic->pm_init_profile((rdev))#define radeon_pm_get_dynpm_state (rdev) (rdev)->asic->pm_get_dynpm_state((rdev)) +#define radeon_pre_page_flip (rdev, crtc) rdev->asic->pre_page_flip((rdev), (crtc)) +#define radeon_page_flip (crtc, base) rdev->asic->page_flip((crtc), (base)) +#define radeon_post_page_flip (rdev, crtc) rdev->asic->post_page_flip((rdev), (crtc))/* Common functions */ /* AGP */
drivers/gpu/drm/radeon/radeon_asic.c +42 -0
126 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_asic.h +7 -0
@@ -130,6 +130,9 @@ extern void r100_pm_prepare(struct radeon_device *rdev);extern void r100_pm_finish (struct radeon_device *rdev);extern void r100_pm_init_profile (struct radeon_device *rdev);extern void r100_pm_get_dynpm_state (struct radeon_device *rdev); +extern void r100_pre_page_flip (struct radeon_device *rdev,int crtc); +extern void r100_page_flip (struct drm_crtc *crtc,u64 crtc_base); +extern void r100_post_page_flip (struct radeon_device *rdev,int crtc);/* * r200,rv250,rs300,rv280
@@ -205,6 +208,7 @@ void rs600_hpd_set_polarity(struct radeon_device *rdev,extern void rs600_pm_misc (struct radeon_device *rdev);extern void rs600_pm_prepare (struct radeon_device *rdev);extern void rs600_pm_finish (struct radeon_device *rdev); +extern void rs600_page_flip (struct drm_crtc *crtc,u64 crtc_base);/* * rs690,rs740
@@ -278,6 +282,7 @@ extern void r600_pm_misc(struct radeon_device *rdev);extern void r600_pm_init_profile (struct radeon_device *rdev);extern void rs780_pm_init_profile (struct radeon_device *rdev);extern void r600_pm_get_dynpm_state (struct radeon_device *rdev); +extern void r600_page_flip (struct drm_crtc *crtc,u64 crtc_base);/* * rv770,rv730,rv710,rv740
@@ -287,6 +292,7 @@ void rv770_fini(struct radeon_device *rdev);int rv770_suspend (struct radeon_device *rdev);int rv770_resume (struct radeon_device *rdev);extern void rv770_pm_misc (struct radeon_device *rdev); +extern void rv770_page_flip (struct drm_crtc *crtc,u64 crtc_base);/* * evergreen
@@ -314,5 +320,6 @@ extern int evergreen_cs_parse(struct radeon_cs_parser *p);extern void evergreen_pm_misc (struct radeon_device *rdev);extern void evergreen_pm_prepare (struct radeon_device *rdev);extern void evergreen_pm_finish (struct radeon_device *rdev); +extern void evergreen_page_flip (struct drm_crtc *crtc,u64 crtc_base);#endif
drivers/gpu/drm/radeon/radeon_display.c +101 -0
113 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_drv.c +1 -1
@@ -47,7 +47,7 @@* - 2.4.0 - add crtc id query * - 2.5.0 - add get accel 2 to work around ddx breakage for evergreen * - 2.6.0 - add tiling config query (r6xx+), add initial HiZ support (r300->r500) -* 2.7.0 - fixups for r600 2D tiling support. (no external ABI change), add eg dyn gpr regs +* 2.7.0 - fixups for r600 2D tiling support. (no external ABI change), add eg dyn gpr regs, pageflip support */ #define KMS_DRIVER_MAJOR 2#define KMS_DRIVER_MINOR 7
drivers/gpu/drm/radeon/radeon_irq_kms.c +62 -0
77 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_mode.h +7 -0
@@ -278,6 +278,10 @@ struct radeon_crtc {fixed20_12 hsc;struct drm_display_mode native_mode;int pll_id; +/* page flipping */ +struct radeon_bo *flip_old_bo; +struct drm_pending_vblank_event *event; +struct radeon_fence *pflip_fence; };struct radeon_encoder_primary_dac {
@@ -653,4 +657,7 @@ int radeon_fbdev_total_size(struct radeon_device *rdev);bool radeon_fbdev_robj_is_fb (struct radeon_device *rdev,struct radeon_bo *robj);void radeon_fb_output_poll_changed (struct radeon_device *rdev); + +void radeon_crtc_handle_flip (struct radeon_device *rdev,int crtc_id); +#endif
drivers/gpu/drm/radeon/rs600.c +41 -8
83 lines not on this page · raw message
drivers/gpu/drm/radeon/rs600d.h +13 -0
@@ -28,6 +28,19 @@#ifndef __RS600D_H__#define __RS600D_H__ +/* PM4 */ +#define PACKET_TYPE0 0 +#define PACKET_TYPE1 1 +#define PACKET_TYPE2 2 +#define PACKET_TYPE3 3 + +#define PACKET0 (reg, n) ((PACKET_TYPE0 << 30) | \ + (((reg) >> 2) & 0xFFFF) | \ + ((n) & 0x3FFF) << 16) +#define PACKET3 (op, n) ((PACKET_TYPE3 << 30) | \ + (((op) & 0xFF) << 8) | \ + ((n) & 0x3FFF) << 16) +/* Registers */ #define R_000040_GEN_INT_CNTL 0x000040#define S_000040_SCRATCH_INT_MASK (x) (((x) & 0x1) << 18)
drivers/gpu/drm/radeon/rv770.c +34 -0
@@ -42,6 +42,40 @@static void rv770_gpu_init (struct radeon_device *rdev);void rv770_fini (struct radeon_device *rdev); +void rv770_page_flip (struct drm_crtc *crtc,u64 crtc_base) +{ +struct drm_device *dev = crtc->dev; +struct radeon_device *rdev = dev->dev_private; +struct radeon_crtc *radeon_crtc =to_radeon_crtc (crtc); +#if 0 +if (radeon_crtc->crtc_id) { +radeon_ring_write (rdev, +PACKET0 (D2GRPH_SECONDARY_SURFACE_ADDRESS_HIGH ,0 )); +radeon_ring_write (rdev,upper_32_bits (crtc_base)); + }else { +radeon_ring_write (rdev, +PACKET0 (D1GRPH_SECONDARY_SURFACE_ADDRESS_HIGH ,0 )); +radeon_ring_write (rdev,upper_32_bits (crtc_base)); + } +radeon_ring_write (rdev, +PACKET0 (D1GRPH_SECONDARY_SURFACE_ADDRESS + radeon_crtc->crtc_offset,0 )); +radeon_ring_write (rdev, (u32 )crtc_base); +#endif +if (radeon_crtc->crtc_id) { +radeon_ring_write (rdev, +PACKET0 (D2GRPH_PRIMARY_SURFACE_ADDRESS_HIGH ,0 )); +radeon_ring_write (rdev,upper_32_bits (crtc_base)); + }else { +radeon_ring_write (rdev, +PACKET0 (D1GRPH_PRIMARY_SURFACE_ADDRESS_HIGH ,0 )); +radeon_ring_write (rdev,upper_32_bits (crtc_base)); + } +radeon_ring_write (rdev, +PACKET0 (D1GRPH_PRIMARY_SURFACE_ADDRESS + radeon_crtc->crtc_offset,0 )); +radeon_ring_write (rdev, (u32 )crtc_base); + +} +/* get temperature in millidegrees */ u32 rv770_get_temp (struct radeon_device *rdev) {
drivers/gpu/drm/radeon/rv770d.h +39 -0
@@ -351,4 +351,43 @@#define SRBM_STATUS 0x0E50 +#define D1GRPH_PRIMARY_SURFACE_ADDRESS 0x6110 +#define D1GRPH_PRIMARY_SURFACE_ADDRESS_HIGH 0x6914 +#define D2GRPH_PRIMARY_SURFACE_ADDRESS_HIGH 0x6114 +#define D1GRPH_SECONDARY_SURFACE_ADDRESS 0x6118 +#define D1GRPH_SECONDARY_SURFACE_ADDRESS_HIGH 0x691c +#define D2GRPH_SECONDARY_SURFACE_ADDRESS_HIGH 0x611c +#define D1GRPH_UPDATE 0x6144 +# define D1GRPH_SURFACE_UPDATE_PENDING (1 << 2) +# define D1GRPH_UPDATE_LOCK (1 << 16) + +/* PM4 */ +#define PACKET_TYPE0 0 +#define PACKET_TYPE1 1 +#define PACKET_TYPE2 2 +#define PACKET_TYPE3 3 + +#define PACKET0 (reg, n) ((PACKET_TYPE0 << 30) | \ + (((reg) >> 2) & 0xFFFF) | \ + ((n) & 0x3FFF) << 16) +#define PACKET3 (op, n) ((PACKET_TYPE3 << 30) | \ + (((op) & 0xFF) << 8) | \ + ((n) & 0x3FFF) << 16) + +#define PACKET3_WAIT_REG_MEM 0x3C +# define PACKET3_WAIT_REG_MEM_ENGINE (x) ((x) << 8) +# define ENGINE_ME 0 +# define ENGINE_PFP 1 +# define PACKET3_WAIT_REG_MEM_MEM_SPACE (x) ((x) << 4) +# define MEM_SPACE_REG 0 +# define MEM_SPACE_MEM 1 +# define PACKET3_WAIT_REG_MEM_FUNCTION (x) ((x) << 0) +# define FUNCTION_ALWAYS 0 +# define FUNCTION_LT 1 +# define FUNCTION_LTE 2 +# define FUNCTION_E 3 +# define FUNCTION_NE 4 +# define FUNCTION_GTE 5 +# define FUNCTION_GT 6 +#endif
Signature · 1 line
1.7.1.1
PATCH 1/1 radeon/kms: add pageflip support
In reply to Alex Deucherrequires drm 2.7.0 or higher
--- src/drmmode_display.c | 78 ++++++++++++++++++++- src/drmmode_display.h | 4 + src/radeon.h | 2 + src/radeon_dri2.c | 188 ++++++++++++++++++++++++++++++++++++++++++++----- src/radeon_dri2.h | 2 + src/radeon_kms.c | 8 ++ 6 files changed, 264 insertions(+), 18 deletions(-)
src/drmmode_display.c +77 -1
@@ -29,6 +29,7 @@#include "config.h" #endif +#include <errno.h> #ifdef XF86DRM_MODE #include <sys/ioctl.h> #include "micmap.h"
@@ -1195,6 +1196,25 @@ drmmode_vblank_handler(int fd, unsigned int frame, unsigned int tv_sec, }static void +drmmode_flip_handler (int fd,unsigned int frame,unsigned int tv_sec, +unsigned int tv_usec,void *event_data) +{ +drmmode_ptr drmmode = event_data; + + drmmode->flip_count--; +if (drmmode->flip_count >0 ) +return ; + +drmModeRmFB (drmmode->fd, drmmode->old_fb_id); + +if (drmmode->event_data ==NULL ) +return ; + +radeon_dri2_flip_event_handler (frame, tv_sec, tv_usec, drmmode->event_data); +} + + +static void drm_wakeup_handler (pointer data,int err,pointer p) {drmmode_ptr drmmode = data;
@@ -1236,8 +1256,9 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp) drmmode->flip_count =0 ; drmmode->event_context.version =DRM_EVENT_CONTEXT_VERSION ; drmmode->event_context.vblank_handler = drmmode_vblank_handler; - drmmode->event_context.page_flip_handler =NULL ; + drmmode->event_context.page_flip_handler = drmmode_flip_handler;if (info->dri->pKernelDRMVersion->version_minor >=4 ) { + drmmode->flip_count =0 ;AddGeneralSocket (drmmode->fd);RegisterBlockAndWakeupHandlers ((BlockHandlerProcPtr )NoopDDA, drm_wakeup_handler, drmmode);
@@ -1476,4 +1497,59 @@ void drmmode_uevent_fini(ScrnInfoPtr scrn, drmmode_ptr drmmode)#endif } +Bool radeon_do_pageflip (ScrnInfoPtr scrn,struct radeon_bo *new_front,void *data) +{ +RADEONInfoPtr info =RADEONPTR (scrn); +xf86CrtcConfigPtr config =XF86_CRTC_CONFIG_PTR (scrn); +drmmode_crtc_private_ptr drmmode_crtc = config->crtc[0 ]->driver_private; +drmmode_ptr drmmode = drmmode_crtc->drmmode; +unsigned int pitch = scrn->displayWidth * info->CurrentLayout.pixel_bytes; +int i, old_fb_id; + +/* +* Create a new handle for the back buffer +*/ + old_fb_id = drmmode->fb_id; +if (drmModeAddFB (drmmode->fd, scrn->virtualX, scrn->virtualY, + scrn->depth, scrn->bitsPerPixel, pitch, + new_front->handle, &drmmode->fb_id)) + goto error_out; + +/* +* Queue flips on all enabled CRTCs +* Note that if/when we get per-CRTC buffers, we'll have to update this. +* Right now it assumes a single shared fb across all CRTCs, with the +* kernel fixing up the offset of each CRTC as necessary. +* +* Also, flips queued on disabled or incorrectly configured displays +* may never complete; this is a configuration error. +*/ +for (i =0 ; i < config->num_crtc; i++) { +if (!config->crtc[i]->enabled) +continue ; + + drmmode->event_data = data; + drmmode->flip_count++; + drmmode_crtc = config->crtc[i]->driver_private; +if (drmModePageFlip (drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, + drmmode->fb_id,DRM_MODE_PAGE_FLIP_EVENT , drmmode)) { +xf86DrvMsg (scrn->scrnIndex,X_WARNING , +"flip queue failed: %s\n" ,strerror (errno)); + goto error_undo; + } + } + + drmmode->old_fb_id = old_fb_id; +return TRUE; + +error_undo: +drmModeRmFB (drmmode->fd, drmmode->fb_id); + drmmode->fb_id = old_fb_id; + +error_out: +xf86DrvMsg (scrn->scrnIndex,X_WARNING ,"Page flip failed: %s\n" , +strerror (errno)); +return FALSE; +} +#endif
src/drmmode_display.h +4 -0
@@ -39,6 +39,7 @@ typedef struct { int fd; unsigned fb_id; + unsigned old_fb_id; drmModeResPtr mode_res; drmModeFBPtr mode_fb; int cpp;
@@ -50,6 +51,7 @@ typedef struct {#endif drmEventContext event_context;int flip_count; +void *event_data; } drmmode_rec, *drmmode_ptr; typedef struct {
@@ -95,6 +97,8 @@ extern Bool drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn);extern void drmmode_uevent_init (ScrnInfoPtr scrn,drmmode_ptr drmmode);extern void drmmode_uevent_fini (ScrnInfoPtr scrn,drmmode_ptr drmmode); +Bool radeon_do_pageflip (ScrnInfoPtr scrn,struct radeon_bo *new_front,void *data); +#endif #endif
src/radeon.h +2 -0
@@ -1071,6 +1071,8 @@ typedef struct {struct radeon_bo *bicubic_bo;void *bicubic_memory;int bicubic_offset; +/* kms pageflipping */ +Bool allowPageFlip; } RADEONInfoRec, *RADEONInfoPtr;#define RADEONWaitForFifo (pScrn, entries) \
src/radeon_dri2.c +171 -17
243 lines not on this page · raw message
src/radeon_dri2.h +2 -0
@@ -44,5 +44,7 @@ xf86CrtcPtr radeon_covering_crtc(ScrnInfoPtr pScrn, BoxPtr box, xf86CrtcPtr desired, BoxPtr crtc_box_ret);void radeon_dri2_frame_event_handler (unsigned int frame,unsigned int tv_sec,unsigned int tv_usec,void *event_data); +void radeon_dri2_flip_event_handler (unsigned int frame,unsigned int tv_sec, +unsigned int tv_usec,void *event_data);#endif
src/radeon_kms.c +8 -0
@@ -70,6 +70,7 @@ const OptionInfoRec RADEONOptions_KMS[] = { { OPTION_EXA_VSYNC, "EXAVSync", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_EXA_PIXMAPS, "EXAPixmaps", OPTV_BOOLEAN, {0}, FALSE }, { OPTION_ZAPHOD_HEADS, "ZaphodHeads", OPTV_STRING, {0}, FALSE }, + { OPTION_PAGE_FLIP, "EnablePageFlip", OPTV_BOOLEAN, {0}, FALSE }, { -1, NULL, OPTV_NONE, {0}, FALSE } };
@@ -616,6 +617,13 @@ Bool RADEONPreInit_KMS(ScrnInfoPtr pScrn, int flags)xf86DrvMsg (pScrn->scrnIndex,X_INFO ,"KMS Color Tiling: %sabled\n" , info->allowColorTiling ?"en" :"dis" ); +if (info->dri->pKernelDRMVersion->version_minor >=7 ) { + info->allowPageFlip =xf86ReturnOptValBool (info->Options, +OPTION_PAGE_FLIP , TRUE); +xf86DrvMsg (pScrn->scrnIndex,X_INFO , +"KMS Pageflipping: %sabled\n" , info->allowPageFlip ?"en" :"dis" ); + } +if (drmmode_pre_init (pScrn, &info->drmmode, pScrn->bitsPerPixel /8 ) == FALSE) {xf86DrvMsg (pScrn->scrnIndex,X_ERROR ,"Kernel modesetting setup failed\n" ); goto fail;
Signature · 1 line
1.7.1.1
Quoted 6 lines · Alex Deucher
This set of patches adds pageflipping support for radeon. There are two drm patches and one ddx patch required. The drm patches are against Dave's drm-next branch and the ddx patch is against git master. So far it's been lightly tested with openarena on a variety of radeons. Feedback appreciated.
Just a heads up, this doesn't work with tiling enabled on 6xx/7xx/evergreen yet.
Quoted 2 lines
Alex
Quoted 9 lines · Alex Deucher
Quoted 6 lines · Alex Deucher
This set of patches adds pageflipping support for radeon. There are two drm patches and one ddx patch required. The drm patches are against Dave's drm-next branch and the ddx patch is against git master. So far it's been lightly tested with openarena on a variety of radeons. Feedback appreciated.
Just a heads up, this doesn't work with tiling enabled on 6xx/7xx/evergreen yet.
Fixed now with this additional patch:
http://people.freedesktop.org/~agd5f/pflip/0002-radeon-kms-allow-tiled-front-buffer-on-6xx-7xx.patch
Alex
Quoted 4 lines
Quoted 3 lines
Alex