diff options
| author | Michel Daenzer <michel@daenzer.net> | 2002-09-25 19:48:51 +0000 |
|---|---|---|
| committer | Michel Daenzer <michel@daenzer.net> | 2002-09-25 19:48:51 +0000 |
| commit | f40674ea9f3e3c17d632de90d7e35da5640a55b2 (patch) | |
| tree | 13cbf16dae58d8c11a9c19394292060f96e28916 | |
| parent | 55acd0d5a64a2ee6b0cecc75872fbf8c4bb42a0c (diff) | |
| download | drm-f40674ea9f3e3c17d632de90d7e35da5640a55b2.tar.gz | |
change RADEON_PARAM_IRQ_ACTIVE to RADEON_PARAM_IRQ_NR
| -rw-r--r-- | shared-core/radeon_drm.h | 2 | ||||
| -rw-r--r-- | shared-core/radeon_state.c | 5 | ||||
| -rw-r--r-- | shared/radeon_drm.h | 2 | ||||
| -rw-r--r-- | shared/radeon_state.c | 5 |
4 files changed, 6 insertions, 8 deletions
diff --git a/shared-core/radeon_drm.h b/shared-core/radeon_drm.h index 9a747e04..7c45898a 100644 --- a/shared-core/radeon_drm.h +++ b/shared-core/radeon_drm.h @@ -517,7 +517,7 @@ typedef struct drm_radeon_indirect { #define RADEON_PARAM_LAST_FRAME 2 #define RADEON_PARAM_LAST_DISPATCH 3 #define RADEON_PARAM_LAST_CLEAR 4 -#define RADEON_PARAM_IRQ_ACTIVE 5 +#define RADEON_PARAM_IRQ_NR 5 #define RADEON_PARAM_AGP_BASE 6 /* card offset of agp base */ typedef struct drm_radeon_getparam { diff --git a/shared-core/radeon_state.c b/shared-core/radeon_state.c index 0172128b..179a2202 100644 --- a/shared-core/radeon_state.c +++ b/shared-core/radeon_state.c @@ -1283,7 +1283,6 @@ int radeon_cp_clear( DRM_IOCTL_ARGS ) } - /* Not sure why this isn't set all the time: */ static int radeon_do_init_pageflip( drm_device_t *dev ) @@ -2172,8 +2171,8 @@ int radeon_cp_getparam( DRM_IOCTL_ARGS ) dev_priv->stats.last_clear_reads++; value = GET_SCRATCH( 2 ); break; - case RADEON_PARAM_IRQ_ACTIVE: - value = dev->irq ? 1 : 0; + case RADEON_PARAM_IRQ_NR: + value = dev->irq; break; case RADEON_PARAM_AGP_BASE: value = dev_priv->agp_vm_start; diff --git a/shared/radeon_drm.h b/shared/radeon_drm.h index 9a747e04..7c45898a 100644 --- a/shared/radeon_drm.h +++ b/shared/radeon_drm.h @@ -517,7 +517,7 @@ typedef struct drm_radeon_indirect { #define RADEON_PARAM_LAST_FRAME 2 #define RADEON_PARAM_LAST_DISPATCH 3 #define RADEON_PARAM_LAST_CLEAR 4 -#define RADEON_PARAM_IRQ_ACTIVE 5 +#define RADEON_PARAM_IRQ_NR 5 #define RADEON_PARAM_AGP_BASE 6 /* card offset of agp base */ typedef struct drm_radeon_getparam { diff --git a/shared/radeon_state.c b/shared/radeon_state.c index 0172128b..179a2202 100644 --- a/shared/radeon_state.c +++ b/shared/radeon_state.c @@ -1283,7 +1283,6 @@ int radeon_cp_clear( DRM_IOCTL_ARGS ) } - /* Not sure why this isn't set all the time: */ static int radeon_do_init_pageflip( drm_device_t *dev ) @@ -2172,8 +2171,8 @@ int radeon_cp_getparam( DRM_IOCTL_ARGS ) dev_priv->stats.last_clear_reads++; value = GET_SCRATCH( 2 ); break; - case RADEON_PARAM_IRQ_ACTIVE: - value = dev->irq ? 1 : 0; + case RADEON_PARAM_IRQ_NR: + value = dev->irq; break; case RADEON_PARAM_AGP_BASE: value = dev_priv->agp_vm_start; |