change RADEON_PARAM_IRQ_ACTIVE to RADEON_PARAM_IRQ_NR

diff --git a/shared-core/radeon_drm.h b/shared-core/radeon_drm.h
index 9a747e0..7c45898 100644 (file)
--- 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 0172128..179a220 100644 (file)
--- 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 9a747e0..7c45898 100644 (file)
--- 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 0172128..179a220 100644 (file)
--- 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;