2 files changed, 77 insertions, 38 deletions

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index b4dea5c79847..e72672f99c47 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1151,8 +1151,12 @@ struct radeon_asic {
         } ring[RADEON_NUM_RINGS];
 
         int (*ring_test)(struct radeon_device *rdev, struct radeon_ring *cp);
-        int (*irq_set)(struct radeon_device *rdev);
-        int (*irq_process)(struct radeon_device *rdev);
+
+        struct {
+                int (*set)(struct radeon_device *rdev);
+                int (*process)(struct radeon_device *rdev);
+        } irq;
+
         u32 (*get_vblank_counter)(struct radeon_device *rdev, int crtc);
 
         struct {
@@ -1205,6 +1209,7 @@ struct radeon_asic {
          * through ring.
          */
         void (*ioctl_wait_idle)(struct radeon_device *rdev, struct radeon_bo *bo);
+        /* check if 3D engine is idle */
         bool (*gui_idle)(struct radeon_device *rdev);
         /* power management */
         struct {
@@ -1679,8 +1684,8 @@ void radeon_ring_write(struct radeon_ring *ring, uint32_t v);
 #define radeon_ring_test(rdev, cp) (rdev)->asic->ring_test((rdev), (cp))
 #define radeon_ring_ib_execute(rdev, r, ib) (rdev)->asic->ring[(r)].ib_execute((rdev), (ib))
 #define radeon_ring_ib_parse(rdev, r, ib) (rdev)->asic->ring[(r)].ib_parse((rdev), (ib))
-#define radeon_irq_set(rdev) (rdev)->asic->irq_set((rdev))
-#define radeon_irq_process(rdev) (rdev)->asic->irq_process((rdev))
+#define radeon_irq_set(rdev) (rdev)->asic->irq.set((rdev))
+#define radeon_irq_process(rdev) (rdev)->asic->irq.process((rdev))
 #define radeon_get_vblank_counter(rdev, crtc) (rdev)->asic->get_vblank_counter((rdev), (crtc))
 #define radeon_fence_ring_emit(rdev, r, fence) (rdev)->asic->ring[(r)].emit_fence((rdev), (fence))
 #define radeon_semaphore_ring_emit(rdev, r, cp, semaphore, emit_wait) (rdev)->asic->ring[(r)].emit_semaphore((rdev), (cp), (semaphore), (emit_wait))
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index 6bd15254f643..a7b6c37d8fa4 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -148,8 +148,10 @@ static struct radeon_asic r100_asic = {
                         .cs_parse = &r100_cs_parse,
                 }
         },
-        .irq_set = &r100_irq_set,
-        .irq_process = &r100_irq_process,
+        .irq = {
+                .set = &r100_irq_set,
+                .process = &r100_irq_process,
+        },
         .get_vblank_counter = &r100_get_vblank_counter,
         .copy = {
                 .blit = &r100_copy_blit,
@@ -213,8 +215,10 @@ static struct radeon_asic r200_asic = {
                         .cs_parse = &r100_cs_parse,
                 }
         },
-        .irq_set = &r100_irq_set,
-        .irq_process = &r100_irq_process,
+        .irq = {
+                .set = &r100_irq_set,
+                .process = &r100_irq_process,
+        },
         .get_vblank_counter = &r100_get_vblank_counter,
         .copy = {
                 .blit = &r100_copy_blit,
@@ -277,8 +281,10 @@ static struct radeon_asic r300_asic = {
                         .cs_parse = &r300_cs_parse,
                 }
         },
-        .irq_set = &r100_irq_set,
-        .irq_process = &r100_irq_process,
+        .irq = {
+                .set = &r100_irq_set,
+                .process = &r100_irq_process,
+        },
         .get_vblank_counter = &r100_get_vblank_counter,
         .copy = {
                 .blit = &r100_copy_blit,
@@ -342,8 +348,10 @@ static struct radeon_asic r300_asic_pcie = {
                         .cs_parse = &r300_cs_parse,
                 }
         },
-        .irq_set = &r100_irq_set,
-        .irq_process = &r100_irq_process,
+        .irq = {
+                .set = &r100_irq_set,
+                .process = &r100_irq_process,
+        },
         .get_vblank_counter = &r100_get_vblank_counter,
         .copy = {
                 .blit = &r100_copy_blit,
@@ -406,8 +414,10 @@ static struct radeon_asic r420_asic = {
                         .cs_parse = &r300_cs_parse,
                 }
         },
-        .irq_set = &r100_irq_set,
-        .irq_process = &r100_irq_process,
+        .irq = {
+                .set = &r100_irq_set,
+                .process = &r100_irq_process,
+        },
         .get_vblank_counter = &r100_get_vblank_counter,
         .copy = {
                 .blit = &r100_copy_blit,
@@ -471,8 +481,10 @@ static struct radeon_asic rs400_asic = {
                         .cs_parse = &r300_cs_parse,
                 }
         },
-        .irq_set = &r100_irq_set,
-        .irq_process = &r100_irq_process,
+        .irq = {
+                .set = &r100_irq_set,
+                .process = &r100_irq_process,
+        },
         .get_vblank_counter = &r100_get_vblank_counter,
         .copy = {
                 .blit = &r100_copy_blit,
@@ -536,8 +548,10 @@ static struct radeon_asic rs600_asic = {
                         .cs_parse = &r300_cs_parse,
                 }
         },
-        .irq_set = &rs600_irq_set,
-        .irq_process = &rs600_irq_process,
+        .irq = {
+                .set = &rs600_irq_set,
+                .process = &rs600_irq_process,
+        },
         .get_vblank_counter = &rs600_get_vblank_counter,
         .copy = {
                 .blit = &r100_copy_blit,
@@ -601,8 +615,10 @@ static struct radeon_asic rs690_asic = {
                         .cs_parse = &r300_cs_parse,
                 }
         },
-        .irq_set = &rs600_irq_set,
-        .irq_process = &rs600_irq_process,
+        .irq = {
+                .set = &rs600_irq_set,
+                .process = &rs600_irq_process,
+        },
         .get_vblank_counter = &rs600_get_vblank_counter,
         .copy = {
                 .blit = &r100_copy_blit,
@@ -666,8 +682,10 @@ static struct radeon_asic rv515_asic = {
                         .cs_parse = &r300_cs_parse,
                 }
         },
-        .irq_set = &rs600_irq_set,
-        .irq_process = &rs600_irq_process,
+        .irq = {
+                .set = &rs600_irq_set,
+                .process = &rs600_irq_process,
+        },
         .get_vblank_counter = &rs600_get_vblank_counter,
         .copy = {
                 .blit = &r100_copy_blit,
@@ -731,8 +749,10 @@ static struct radeon_asic r520_asic = {
                         .cs_parse = &r300_cs_parse,
                 }
         },
-        .irq_set = &rs600_irq_set,
-        .irq_process = &rs600_irq_process,
+        .irq = {
+                .set = &rs600_irq_set,
+                .process = &rs600_irq_process,
+        },
         .get_vblank_counter = &rs600_get_vblank_counter,
         .copy = {
                 .blit = &r100_copy_blit,
@@ -795,8 +815,10 @@ static struct radeon_asic r600_asic = {
                         .cs_parse = &r600_cs_parse,
                 }
         },
-        .irq_set = &r600_irq_set,
-        .irq_process = &r600_irq_process,
+        .irq = {
+                .set = &r600_irq_set,
+                .process = &r600_irq_process,
+        },
         .get_vblank_counter = &rs600_get_vblank_counter,
         .copy = {
                 .blit = &r600_copy_blit,
@@ -859,8 +881,10 @@ static struct radeon_asic rs780_asic = {
                         .cs_parse = &r600_cs_parse,
                 }
         },
-        .irq_set = &r600_irq_set,
-        .irq_process = &r600_irq_process,
+        .irq = {
+                .set = &r600_irq_set,
+                .process = &r600_irq_process,
+        },
         .get_vblank_counter = &rs600_get_vblank_counter,
         .copy = {
                 .blit = &r600_copy_blit,
@@ -923,8 +947,10 @@ static struct radeon_asic rv770_asic = {
                         .cs_parse = &r600_cs_parse,
                 }
         },
-        .irq_set = &r600_irq_set,
-        .irq_process = &r600_irq_process,
+        .irq = {
+                .set = &r600_irq_set,
+                .process = &r600_irq_process,
+        },
         .get_vblank_counter = &rs600_get_vblank_counter,
         .copy = {
                 .blit = &r600_copy_blit,
@@ -987,8 +1013,10 @@ static struct radeon_asic evergreen_asic = {
                         .cs_parse = &evergreen_cs_parse,
                 }
         },
-        .irq_set = &evergreen_irq_set,
-        .irq_process = &evergreen_irq_process,
+        .irq = {
+                .set = &evergreen_irq_set,
+                .process = &evergreen_irq_process,
+        },
         .get_vblank_counter = &evergreen_get_vblank_counter,
         .copy = {
                 .blit = &r600_copy_blit,
@@ -1051,8 +1079,10 @@ static struct radeon_asic sumo_asic = {
                         .cs_parse = &evergreen_cs_parse,
                 },
         },
-        .irq_set = &evergreen_irq_set,
-        .irq_process = &evergreen_irq_process,
+        .irq = {
+                .set = &evergreen_irq_set,
+                .process = &evergreen_irq_process,
+        },
         .get_vblank_counter = &evergreen_get_vblank_counter,
         .copy = {
                 .blit = &r600_copy_blit,
@@ -1115,8 +1145,10 @@ static struct radeon_asic btc_asic = {
                         .cs_parse = &evergreen_cs_parse,
                 }
         },
-        .irq_set = &evergreen_irq_set,
-        .irq_process = &evergreen_irq_process,
+        .irq = {
+                .set = &evergreen_irq_set,
+                .process = &evergreen_irq_process,
+        },
         .get_vblank_counter = &evergreen_get_vblank_counter,
         .copy = {
                 .blit = &r600_copy_blit,
@@ -1204,8 +1236,10 @@ static struct radeon_asic cayman_asic = {
                         .cs_parse = &evergreen_cs_parse,
                 }
         },
-        .irq_set = &evergreen_irq_set,
-        .irq_process = &evergreen_irq_process,
+        .irq = {
+                .set = &evergreen_irq_set,
+                .process = &evergreen_irq_process,
+        },
         .get_vblank_counter = &evergreen_get_vblank_counter,
         .copy = {
                 .blit = &r600_copy_blit,