diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_drv.h')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_drv.h | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h index 099381693175..d7e9c6cc6a1a 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h | |||
@@ -378,17 +378,17 @@ extern void radeon_mem_release(struct drm_file *file_priv, | |||
378 | struct mem_block *heap); | 378 | struct mem_block *heap); |
379 | 379 | ||
380 | /* radeon_irq.c */ | 380 | /* radeon_irq.c */ |
381 | extern void radeon_irq_set_state(struct drm_device *dev, u32 mask, int state); | ||
381 | extern int radeon_irq_emit(struct drm_device *dev, void *data, struct drm_file *file_priv); | 382 | extern int radeon_irq_emit(struct drm_device *dev, void *data, struct drm_file *file_priv); |
382 | extern int radeon_irq_wait(struct drm_device *dev, void *data, struct drm_file *file_priv); | 383 | extern int radeon_irq_wait(struct drm_device *dev, void *data, struct drm_file *file_priv); |
383 | 384 | ||
384 | extern void radeon_do_release(struct drm_device * dev); | 385 | extern void radeon_do_release(struct drm_device * dev); |
385 | extern int radeon_driver_vblank_wait(struct drm_device * dev, | 386 | extern u32 radeon_get_vblank_counter(struct drm_device *dev, int crtc); |
386 | unsigned int *sequence); | 387 | extern int radeon_enable_vblank(struct drm_device *dev, int crtc); |
387 | extern int radeon_driver_vblank_wait2(struct drm_device * dev, | 388 | extern void radeon_disable_vblank(struct drm_device *dev, int crtc); |
388 | unsigned int *sequence); | ||
389 | extern irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS); | 389 | extern irqreturn_t radeon_driver_irq_handler(DRM_IRQ_ARGS); |
390 | extern void radeon_driver_irq_preinstall(struct drm_device * dev); | 390 | extern void radeon_driver_irq_preinstall(struct drm_device * dev); |
391 | extern void radeon_driver_irq_postinstall(struct drm_device * dev); | 391 | extern int radeon_driver_irq_postinstall(struct drm_device *dev); |
392 | extern void radeon_driver_irq_uninstall(struct drm_device * dev); | 392 | extern void radeon_driver_irq_uninstall(struct drm_device * dev); |
393 | extern void radeon_enable_interrupt(struct drm_device *dev); | 393 | extern void radeon_enable_interrupt(struct drm_device *dev); |
394 | extern int radeon_vblank_crtc_get(struct drm_device *dev); | 394 | extern int radeon_vblank_crtc_get(struct drm_device *dev); |
@@ -397,19 +397,22 @@ extern int radeon_vblank_crtc_set(struct drm_device *dev, int64_t value); | |||
397 | extern int radeon_driver_load(struct drm_device *dev, unsigned long flags); | 397 | extern int radeon_driver_load(struct drm_device *dev, unsigned long flags); |
398 | extern int radeon_driver_unload(struct drm_device *dev); | 398 | extern int radeon_driver_unload(struct drm_device *dev); |
399 | extern int radeon_driver_firstopen(struct drm_device *dev); | 399 | extern int radeon_driver_firstopen(struct drm_device *dev); |
400 | extern void radeon_driver_preclose(struct drm_device * dev, struct drm_file *file_priv); | 400 | extern void radeon_driver_preclose(struct drm_device *dev, |
401 | extern void radeon_driver_postclose(struct drm_device * dev, struct drm_file * filp); | 401 | struct drm_file *file_priv); |
402 | extern void radeon_driver_postclose(struct drm_device *dev, | ||
403 | struct drm_file *file_priv); | ||
402 | extern void radeon_driver_lastclose(struct drm_device * dev); | 404 | extern void radeon_driver_lastclose(struct drm_device * dev); |
403 | extern int radeon_driver_open(struct drm_device * dev, struct drm_file * filp_priv); | 405 | extern int radeon_driver_open(struct drm_device *dev, |
406 | struct drm_file *file_priv); | ||
404 | extern long radeon_compat_ioctl(struct file *filp, unsigned int cmd, | 407 | extern long radeon_compat_ioctl(struct file *filp, unsigned int cmd, |
405 | unsigned long arg); | 408 | unsigned long arg); |
406 | 409 | ||
407 | /* r300_cmdbuf.c */ | 410 | /* r300_cmdbuf.c */ |
408 | extern void r300_init_reg_flags(struct drm_device *dev); | 411 | extern void r300_init_reg_flags(struct drm_device *dev); |
409 | 412 | ||
410 | extern int r300_do_cp_cmdbuf(struct drm_device * dev, | 413 | extern int r300_do_cp_cmdbuf(struct drm_device *dev, |
411 | struct drm_file *file_priv, | 414 | struct drm_file *file_priv, |
412 | drm_radeon_kcmd_buffer_t * cmdbuf); | 415 | drm_radeon_kcmd_buffer_t *cmdbuf); |
413 | 416 | ||
414 | /* Flags for stats.boxes | 417 | /* Flags for stats.boxes |
415 | */ | 418 | */ |
@@ -623,6 +626,7 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev, | |||
623 | # define RADEON_SW_INT_TEST (1 << 25) | 626 | # define RADEON_SW_INT_TEST (1 << 25) |
624 | # define RADEON_SW_INT_TEST_ACK (1 << 25) | 627 | # define RADEON_SW_INT_TEST_ACK (1 << 25) |
625 | # define RADEON_SW_INT_FIRE (1 << 26) | 628 | # define RADEON_SW_INT_FIRE (1 << 26) |
629 | # define R500_DISPLAY_INT_STATUS (1 << 0) | ||
626 | 630 | ||
627 | #define RADEON_HOST_PATH_CNTL 0x0130 | 631 | #define RADEON_HOST_PATH_CNTL 0x0130 |
628 | # define RADEON_HDP_SOFT_RESET (1 << 26) | 632 | # define RADEON_HDP_SOFT_RESET (1 << 26) |
@@ -1116,6 +1120,9 @@ extern int r300_do_cp_cmdbuf(struct drm_device * dev, | |||
1116 | 1120 | ||
1117 | #define R200_VAP_PVS_CNTL_1 0x22D0 | 1121 | #define R200_VAP_PVS_CNTL_1 0x22D0 |
1118 | 1122 | ||
1123 | #define RADEON_CRTC_CRNT_FRAME 0x0214 | ||
1124 | #define RADEON_CRTC2_CRNT_FRAME 0x0314 | ||
1125 | |||
1119 | #define R500_D1CRTC_STATUS 0x609c | 1126 | #define R500_D1CRTC_STATUS 0x609c |
1120 | #define R500_D2CRTC_STATUS 0x689c | 1127 | #define R500_D2CRTC_STATUS 0x689c |
1121 | #define R500_CRTC_V_BLANK (1<<0) | 1128 | #define R500_CRTC_V_BLANK (1<<0) |