← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to drivers/gpu/drm/radeon/radeon_asic.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/gpu/drm/radeon/radeon_asic.c
134
134
        .suspend = &r100_suspend,
135
135
        .resume = &r100_resume,
136
136
        .vga_set_state = &r100_vga_set_state,
137
 
        .gpu_is_lockup = &r100_gpu_is_lockup,
138
137
        .asic_reset = &r100_asic_reset,
139
138
        .ioctl_wait_idle = NULL,
140
139
        .gui_idle = &r100_gui_idle,
152
151
                        .ring_start = &r100_ring_start,
153
152
                        .ring_test = &r100_ring_test,
154
153
                        .ib_test = &r100_ib_test,
 
154
                        .is_lockup = &r100_gpu_is_lockup,
155
155
                }
156
156
        },
157
157
        .irq = {
208
208
        .suspend = &r100_suspend,
209
209
        .resume = &r100_resume,
210
210
        .vga_set_state = &r100_vga_set_state,
211
 
        .gpu_is_lockup = &r100_gpu_is_lockup,
212
211
        .asic_reset = &r100_asic_reset,
213
212
        .ioctl_wait_idle = NULL,
214
213
        .gui_idle = &r100_gui_idle,
226
225
                        .ring_start = &r100_ring_start,
227
226
                        .ring_test = &r100_ring_test,
228
227
                        .ib_test = &r100_ib_test,
 
228
                        .is_lockup = &r100_gpu_is_lockup,
229
229
                }
230
230
        },
231
231
        .irq = {
282
282
        .suspend = &r300_suspend,
283
283
        .resume = &r300_resume,
284
284
        .vga_set_state = &r100_vga_set_state,
285
 
        .gpu_is_lockup = &r300_gpu_is_lockup,
286
285
        .asic_reset = &r300_asic_reset,
287
286
        .ioctl_wait_idle = NULL,
288
287
        .gui_idle = &r100_gui_idle,
300
299
                        .ring_start = &r300_ring_start,
301
300
                        .ring_test = &r100_ring_test,
302
301
                        .ib_test = &r100_ib_test,
 
302
                        .is_lockup = &r100_gpu_is_lockup,
303
303
                }
304
304
        },
305
305
        .irq = {
356
356
        .suspend = &r300_suspend,
357
357
        .resume = &r300_resume,
358
358
        .vga_set_state = &r100_vga_set_state,
359
 
        .gpu_is_lockup = &r300_gpu_is_lockup,
360
359
        .asic_reset = &r300_asic_reset,
361
360
        .ioctl_wait_idle = NULL,
362
361
        .gui_idle = &r100_gui_idle,
374
373
                        .ring_start = &r300_ring_start,
375
374
                        .ring_test = &r100_ring_test,
376
375
                        .ib_test = &r100_ib_test,
 
376
                        .is_lockup = &r100_gpu_is_lockup,
377
377
                }
378
378
        },
379
379
        .irq = {
430
430
        .suspend = &r420_suspend,
431
431
        .resume = &r420_resume,
432
432
        .vga_set_state = &r100_vga_set_state,
433
 
        .gpu_is_lockup = &r300_gpu_is_lockup,
434
433
        .asic_reset = &r300_asic_reset,
435
434
        .ioctl_wait_idle = NULL,
436
435
        .gui_idle = &r100_gui_idle,
448
447
                        .ring_start = &r300_ring_start,
449
448
                        .ring_test = &r100_ring_test,
450
449
                        .ib_test = &r100_ib_test,
 
450
                        .is_lockup = &r100_gpu_is_lockup,
451
451
                }
452
452
        },
453
453
        .irq = {
504
504
        .suspend = &rs400_suspend,
505
505
        .resume = &rs400_resume,
506
506
        .vga_set_state = &r100_vga_set_state,
507
 
        .gpu_is_lockup = &r300_gpu_is_lockup,
508
507
        .asic_reset = &r300_asic_reset,
509
508
        .ioctl_wait_idle = NULL,
510
509
        .gui_idle = &r100_gui_idle,
522
521
                        .ring_start = &r300_ring_start,
523
522
                        .ring_test = &r100_ring_test,
524
523
                        .ib_test = &r100_ib_test,
 
524
                        .is_lockup = &r100_gpu_is_lockup,
525
525
                }
526
526
        },
527
527
        .irq = {
578
578
        .suspend = &rs600_suspend,
579
579
        .resume = &rs600_resume,
580
580
        .vga_set_state = &r100_vga_set_state,
581
 
        .gpu_is_lockup = &r300_gpu_is_lockup,
582
581
        .asic_reset = &rs600_asic_reset,
583
582
        .ioctl_wait_idle = NULL,
584
583
        .gui_idle = &r100_gui_idle,
596
595
                        .ring_start = &r300_ring_start,
597
596
                        .ring_test = &r100_ring_test,
598
597
                        .ib_test = &r100_ib_test,
 
598
                        .is_lockup = &r100_gpu_is_lockup,
599
599
                }
600
600
        },
601
601
        .irq = {
652
652
        .suspend = &rs690_suspend,
653
653
        .resume = &rs690_resume,
654
654
        .vga_set_state = &r100_vga_set_state,
655
 
        .gpu_is_lockup = &r300_gpu_is_lockup,
656
655
        .asic_reset = &rs600_asic_reset,
657
656
        .ioctl_wait_idle = NULL,
658
657
        .gui_idle = &r100_gui_idle,
670
669
                        .ring_start = &r300_ring_start,
671
670
                        .ring_test = &r100_ring_test,
672
671
                        .ib_test = &r100_ib_test,
 
672
                        .is_lockup = &r100_gpu_is_lockup,
673
673
                }
674
674
        },
675
675
        .irq = {
726
726
        .suspend = &rv515_suspend,
727
727
        .resume = &rv515_resume,
728
728
        .vga_set_state = &r100_vga_set_state,
729
 
        .gpu_is_lockup = &r300_gpu_is_lockup,
730
729
        .asic_reset = &rs600_asic_reset,
731
730
        .ioctl_wait_idle = NULL,
732
731
        .gui_idle = &r100_gui_idle,
744
743
                        .ring_start = &rv515_ring_start,
745
744
                        .ring_test = &r100_ring_test,
746
745
                        .ib_test = &r100_ib_test,
 
746
                        .is_lockup = &r100_gpu_is_lockup,
747
747
                }
748
748
        },
749
749
        .irq = {
800
800
        .suspend = &rv515_suspend,
801
801
        .resume = &r520_resume,
802
802
        .vga_set_state = &r100_vga_set_state,
803
 
        .gpu_is_lockup = &r300_gpu_is_lockup,
804
803
        .asic_reset = &rs600_asic_reset,
805
804
        .ioctl_wait_idle = NULL,
806
805
        .gui_idle = &r100_gui_idle,
818
817
                        .ring_start = &rv515_ring_start,
819
818
                        .ring_test = &r100_ring_test,
820
819
                        .ib_test = &r100_ib_test,
 
820
                        .is_lockup = &r100_gpu_is_lockup,
821
821
                }
822
822
        },
823
823
        .irq = {
874
874
        .suspend = &r600_suspend,
875
875
        .resume = &r600_resume,
876
876
        .vga_set_state = &r600_vga_set_state,
877
 
        .gpu_is_lockup = &r600_gpu_is_lockup,
878
877
        .asic_reset = &r600_asic_reset,
879
878
        .ioctl_wait_idle = r600_ioctl_wait_idle,
880
879
        .gui_idle = &r600_gui_idle,
891
890
                        .cs_parse = &r600_cs_parse,
892
891
                        .ring_test = &r600_ring_test,
893
892
                        .ib_test = &r600_ib_test,
 
893
                        .is_lockup = &r600_gpu_is_lockup,
894
894
                }
895
895
        },
896
896
        .irq = {
946
946
        .fini = &r600_fini,
947
947
        .suspend = &r600_suspend,
948
948
        .resume = &r600_resume,
949
 
        .gpu_is_lockup = &r600_gpu_is_lockup,
950
949
        .vga_set_state = &r600_vga_set_state,
951
950
        .asic_reset = &r600_asic_reset,
952
951
        .ioctl_wait_idle = r600_ioctl_wait_idle,
964
963
                        .cs_parse = &r600_cs_parse,
965
964
                        .ring_test = &r600_ring_test,
966
965
                        .ib_test = &r600_ib_test,
 
966
                        .is_lockup = &r600_gpu_is_lockup,
967
967
                }
968
968
        },
969
969
        .irq = {
1020
1020
        .suspend = &rv770_suspend,
1021
1021
        .resume = &rv770_resume,
1022
1022
        .asic_reset = &r600_asic_reset,
1023
 
        .gpu_is_lockup = &r600_gpu_is_lockup,
1024
1023
        .vga_set_state = &r600_vga_set_state,
1025
1024
        .ioctl_wait_idle = r600_ioctl_wait_idle,
1026
1025
        .gui_idle = &r600_gui_idle,
1037
1036
                        .cs_parse = &r600_cs_parse,
1038
1037
                        .ring_test = &r600_ring_test,
1039
1038
                        .ib_test = &r600_ib_test,
 
1039
                        .is_lockup = &r600_gpu_is_lockup,
1040
1040
                }
1041
1041
        },
1042
1042
        .irq = {
1092
1092
        .fini = &evergreen_fini,
1093
1093
        .suspend = &evergreen_suspend,
1094
1094
        .resume = &evergreen_resume,
1095
 
        .gpu_is_lockup = &evergreen_gpu_is_lockup,
1096
1095
        .asic_reset = &evergreen_asic_reset,
1097
1096
        .vga_set_state = &r600_vga_set_state,
1098
1097
        .ioctl_wait_idle = r600_ioctl_wait_idle,
1110
1109
                        .cs_parse = &evergreen_cs_parse,
1111
1110
                        .ring_test = &r600_ring_test,
1112
1111
                        .ib_test = &r600_ib_test,
 
1112
                        .is_lockup = &evergreen_gpu_is_lockup,
1113
1113
                }
1114
1114
        },
1115
1115
        .irq = {
1165
1165
        .fini = &evergreen_fini,
1166
1166
        .suspend = &evergreen_suspend,
1167
1167
        .resume = &evergreen_resume,
1168
 
        .gpu_is_lockup = &evergreen_gpu_is_lockup,
1169
1168
        .asic_reset = &evergreen_asic_reset,
1170
1169
        .vga_set_state = &r600_vga_set_state,
1171
1170
        .ioctl_wait_idle = r600_ioctl_wait_idle,
1183
1182
                        .cs_parse = &evergreen_cs_parse,
1184
1183
                        .ring_test = &r600_ring_test,
1185
1184
                        .ib_test = &r600_ib_test,
 
1185
                        .is_lockup = &evergreen_gpu_is_lockup,
1186
1186
                },
1187
1187
        },
1188
1188
        .irq = {
1238
1238
        .fini = &evergreen_fini,
1239
1239
        .suspend = &evergreen_suspend,
1240
1240
        .resume = &evergreen_resume,
1241
 
        .gpu_is_lockup = &evergreen_gpu_is_lockup,
1242
1241
        .asic_reset = &evergreen_asic_reset,
1243
1242
        .vga_set_state = &r600_vga_set_state,
1244
1243
        .ioctl_wait_idle = r600_ioctl_wait_idle,
1256
1255
                        .cs_parse = &evergreen_cs_parse,
1257
1256
                        .ring_test = &r600_ring_test,
1258
1257
                        .ib_test = &r600_ib_test,
 
1258
                        .is_lockup = &evergreen_gpu_is_lockup,
1259
1259
                }
1260
1260
        },
1261
1261
        .irq = {
1321
1321
        .fini = &cayman_fini,
1322
1322
        .suspend = &cayman_suspend,
1323
1323
        .resume = &cayman_resume,
1324
 
        .gpu_is_lockup = &cayman_gpu_is_lockup,
1325
1324
        .asic_reset = &cayman_asic_reset,
1326
1325
        .vga_set_state = &r600_vga_set_state,
1327
1326
        .ioctl_wait_idle = r600_ioctl_wait_idle,
1340
1339
                        .cs_parse = &evergreen_cs_parse,
1341
1340
                        .ring_test = &r600_ring_test,
1342
1341
                        .ib_test = &r600_ib_test,
 
1342
                        .is_lockup = &evergreen_gpu_is_lockup,
1343
1343
                },
1344
1344
                [CAYMAN_RING_TYPE_CP1_INDEX] = {
1345
1345
                        .ib_execute = &cayman_ring_ib_execute,
1349
1349
                        .cs_parse = &evergreen_cs_parse,
1350
1350
                        .ring_test = &r600_ring_test,
1351
1351
                        .ib_test = &r600_ib_test,
 
1352
                        .is_lockup = &evergreen_gpu_is_lockup,
1352
1353
                },
1353
1354
                [CAYMAN_RING_TYPE_CP2_INDEX] = {
1354
1355
                        .ib_execute = &cayman_ring_ib_execute,
1358
1359
                        .cs_parse = &evergreen_cs_parse,
1359
1360
                        .ring_test = &r600_ring_test,
1360
1361
                        .ib_test = &r600_ib_test,
 
1362
                        .is_lockup = &evergreen_gpu_is_lockup,
1361
1363
                }
1362
1364
        },
1363
1365
        .irq = {
1413
1415
        .fini = &cayman_fini,
1414
1416
        .suspend = &cayman_suspend,
1415
1417
        .resume = &cayman_resume,
1416
 
        .gpu_is_lockup = &cayman_gpu_is_lockup,
1417
1418
        .asic_reset = &cayman_asic_reset,
1418
1419
        .vga_set_state = &r600_vga_set_state,
1419
1420
        .ioctl_wait_idle = r600_ioctl_wait_idle,
1432
1433
                        .cs_parse = &evergreen_cs_parse,
1433
1434
                        .ring_test = &r600_ring_test,
1434
1435
                        .ib_test = &r600_ib_test,
 
1436
                        .is_lockup = &evergreen_gpu_is_lockup,
1435
1437
                },
1436
1438
                [CAYMAN_RING_TYPE_CP1_INDEX] = {
1437
1439
                        .ib_execute = &cayman_ring_ib_execute,
1441
1443
                        .cs_parse = &evergreen_cs_parse,
1442
1444
                        .ring_test = &r600_ring_test,
1443
1445
                        .ib_test = &r600_ib_test,
 
1446
                        .is_lockup = &evergreen_gpu_is_lockup,
1444
1447
                },
1445
1448
                [CAYMAN_RING_TYPE_CP2_INDEX] = {
1446
1449
                        .ib_execute = &cayman_ring_ib_execute,
1450
1453
                        .cs_parse = &evergreen_cs_parse,
1451
1454
                        .ring_test = &r600_ring_test,
1452
1455
                        .ib_test = &r600_ib_test,
 
1456
                        .is_lockup = &evergreen_gpu_is_lockup,
1453
1457
                }
1454
1458
        },
1455
1459
        .irq = {
1515
1519
        .fini = &si_fini,
1516
1520
        .suspend = &si_suspend,
1517
1521
        .resume = &si_resume,
1518
 
        .gpu_is_lockup = &si_gpu_is_lockup,
1519
1522
        .asic_reset = &si_asic_reset,
1520
1523
        .vga_set_state = &r600_vga_set_state,
1521
1524
        .ioctl_wait_idle = r600_ioctl_wait_idle,
1534
1537
                        .cs_parse = NULL,
1535
1538
                        .ring_test = &r600_ring_test,
1536
1539
                        .ib_test = &r600_ib_test,
 
1540
                        .is_lockup = &si_gpu_is_lockup,
1537
1541
                },
1538
1542
                [CAYMAN_RING_TYPE_CP1_INDEX] = {
1539
1543
                        .ib_execute = &si_ring_ib_execute,
1543
1547
                        .cs_parse = NULL,
1544
1548
                        .ring_test = &r600_ring_test,
1545
1549
                        .ib_test = &r600_ib_test,
 
1550
                        .is_lockup = &si_gpu_is_lockup,
1546
1551
                },
1547
1552
                [CAYMAN_RING_TYPE_CP2_INDEX] = {
1548
1553
                        .ib_execute = &si_ring_ib_execute,
1552
1557
                        .cs_parse = NULL,
1553
1558
                        .ring_test = &r600_ring_test,
1554
1559
                        .ib_test = &r600_ib_test,
 
1560
                        .is_lockup = &si_gpu_is_lockup,
1555
1561
                }
1556
1562
        },
1557
1563
        .irq = {