aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_asic.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2012-08-03 11:39:43 -0400
committerAlex Deucher <alexander.deucher@amd.com>2012-09-20 13:10:37 -0400
commit37e9b6a62fb775276f8edb5bd2b9f13a3102b9dd (patch)
tree558e7267ff977b1851613102f8de01aa9c6b994e /drivers/gpu/drm/radeon/radeon_asic.c
parente3a1592085988c60a2207eb492b89493573a0303 (diff)
drm/radeon: rework the backlight control to be an asic callback
This cleans up the interface a bit as well. Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_asic.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_asic.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c
index 973417c4b014..29834a2be3ea 100644
--- a/drivers/gpu/drm/radeon/radeon_asic.c
+++ b/drivers/gpu/drm/radeon/radeon_asic.c
@@ -198,6 +198,7 @@ static struct radeon_asic r100_asic = {
198 .bandwidth_update = &r100_bandwidth_update, 198 .bandwidth_update = &r100_bandwidth_update,
199 .get_vblank_counter = &r100_get_vblank_counter, 199 .get_vblank_counter = &r100_get_vblank_counter,
200 .wait_for_vblank = &r100_wait_for_vblank, 200 .wait_for_vblank = &r100_wait_for_vblank,
201 .set_backlight_level = &radeon_legacy_set_backlight_level,
201 }, 202 },
202 .copy = { 203 .copy = {
203 .blit = &r100_copy_blit, 204 .blit = &r100_copy_blit,
@@ -272,6 +273,7 @@ static struct radeon_asic r200_asic = {
272 .bandwidth_update = &r100_bandwidth_update, 273 .bandwidth_update = &r100_bandwidth_update,
273 .get_vblank_counter = &r100_get_vblank_counter, 274 .get_vblank_counter = &r100_get_vblank_counter,
274 .wait_for_vblank = &r100_wait_for_vblank, 275 .wait_for_vblank = &r100_wait_for_vblank,
276 .set_backlight_level = &radeon_legacy_set_backlight_level,
275 }, 277 },
276 .copy = { 278 .copy = {
277 .blit = &r100_copy_blit, 279 .blit = &r100_copy_blit,
@@ -346,6 +348,7 @@ static struct radeon_asic r300_asic = {
346 .bandwidth_update = &r100_bandwidth_update, 348 .bandwidth_update = &r100_bandwidth_update,
347 .get_vblank_counter = &r100_get_vblank_counter, 349 .get_vblank_counter = &r100_get_vblank_counter,
348 .wait_for_vblank = &r100_wait_for_vblank, 350 .wait_for_vblank = &r100_wait_for_vblank,
351 .set_backlight_level = &radeon_legacy_set_backlight_level,
349 }, 352 },
350 .copy = { 353 .copy = {
351 .blit = &r100_copy_blit, 354 .blit = &r100_copy_blit,
@@ -420,6 +423,7 @@ static struct radeon_asic r300_asic_pcie = {
420 .bandwidth_update = &r100_bandwidth_update, 423 .bandwidth_update = &r100_bandwidth_update,
421 .get_vblank_counter = &r100_get_vblank_counter, 424 .get_vblank_counter = &r100_get_vblank_counter,
422 .wait_for_vblank = &r100_wait_for_vblank, 425 .wait_for_vblank = &r100_wait_for_vblank,
426 .set_backlight_level = &radeon_legacy_set_backlight_level,
423 }, 427 },
424 .copy = { 428 .copy = {
425 .blit = &r100_copy_blit, 429 .blit = &r100_copy_blit,
@@ -494,6 +498,7 @@ static struct radeon_asic r420_asic = {
494 .bandwidth_update = &r100_bandwidth_update, 498 .bandwidth_update = &r100_bandwidth_update,
495 .get_vblank_counter = &r100_get_vblank_counter, 499 .get_vblank_counter = &r100_get_vblank_counter,
496 .wait_for_vblank = &r100_wait_for_vblank, 500 .wait_for_vblank = &r100_wait_for_vblank,
501 .set_backlight_level = &atombios_set_backlight_level,
497 }, 502 },
498 .copy = { 503 .copy = {
499 .blit = &r100_copy_blit, 504 .blit = &r100_copy_blit,
@@ -568,6 +573,7 @@ static struct radeon_asic rs400_asic = {
568 .bandwidth_update = &r100_bandwidth_update, 573 .bandwidth_update = &r100_bandwidth_update,
569 .get_vblank_counter = &r100_get_vblank_counter, 574 .get_vblank_counter = &r100_get_vblank_counter,
570 .wait_for_vblank = &r100_wait_for_vblank, 575 .wait_for_vblank = &r100_wait_for_vblank,
576 .set_backlight_level = &radeon_legacy_set_backlight_level,
571 }, 577 },
572 .copy = { 578 .copy = {
573 .blit = &r100_copy_blit, 579 .blit = &r100_copy_blit,
@@ -642,6 +648,7 @@ static struct radeon_asic rs600_asic = {
642 .bandwidth_update = &rs600_bandwidth_update, 648 .bandwidth_update = &rs600_bandwidth_update,
643 .get_vblank_counter = &rs600_get_vblank_counter, 649 .get_vblank_counter = &rs600_get_vblank_counter,
644 .wait_for_vblank = &avivo_wait_for_vblank, 650 .wait_for_vblank = &avivo_wait_for_vblank,
651 .set_backlight_level = &atombios_set_backlight_level,
645 }, 652 },
646 .copy = { 653 .copy = {
647 .blit = &r100_copy_blit, 654 .blit = &r100_copy_blit,
@@ -716,6 +723,7 @@ static struct radeon_asic rs690_asic = {
716 .get_vblank_counter = &rs600_get_vblank_counter, 723 .get_vblank_counter = &rs600_get_vblank_counter,
717 .bandwidth_update = &rs690_bandwidth_update, 724 .bandwidth_update = &rs690_bandwidth_update,
718 .wait_for_vblank = &avivo_wait_for_vblank, 725 .wait_for_vblank = &avivo_wait_for_vblank,
726 .set_backlight_level = &atombios_set_backlight_level,
719 }, 727 },
720 .copy = { 728 .copy = {
721 .blit = &r100_copy_blit, 729 .blit = &r100_copy_blit,
@@ -790,6 +798,7 @@ static struct radeon_asic rv515_asic = {
790 .get_vblank_counter = &rs600_get_vblank_counter, 798 .get_vblank_counter = &rs600_get_vblank_counter,
791 .bandwidth_update = &rv515_bandwidth_update, 799 .bandwidth_update = &rv515_bandwidth_update,
792 .wait_for_vblank = &avivo_wait_for_vblank, 800 .wait_for_vblank = &avivo_wait_for_vblank,
801 .set_backlight_level = &atombios_set_backlight_level,
793 }, 802 },
794 .copy = { 803 .copy = {
795 .blit = &r100_copy_blit, 804 .blit = &r100_copy_blit,
@@ -864,6 +873,7 @@ static struct radeon_asic r520_asic = {
864 .bandwidth_update = &rv515_bandwidth_update, 873 .bandwidth_update = &rv515_bandwidth_update,
865 .get_vblank_counter = &rs600_get_vblank_counter, 874 .get_vblank_counter = &rs600_get_vblank_counter,
866 .wait_for_vblank = &avivo_wait_for_vblank, 875 .wait_for_vblank = &avivo_wait_for_vblank,
876 .set_backlight_level = &atombios_set_backlight_level,
867 }, 877 },
868 .copy = { 878 .copy = {
869 .blit = &r100_copy_blit, 879 .blit = &r100_copy_blit,
@@ -937,6 +947,7 @@ static struct radeon_asic r600_asic = {
937 .bandwidth_update = &rv515_bandwidth_update, 947 .bandwidth_update = &rv515_bandwidth_update,
938 .get_vblank_counter = &rs600_get_vblank_counter, 948 .get_vblank_counter = &rs600_get_vblank_counter,
939 .wait_for_vblank = &avivo_wait_for_vblank, 949 .wait_for_vblank = &avivo_wait_for_vblank,
950 .set_backlight_level = &atombios_set_backlight_level,
940 }, 951 },
941 .copy = { 952 .copy = {
942 .blit = &r600_copy_blit, 953 .blit = &r600_copy_blit,
@@ -1010,6 +1021,7 @@ static struct radeon_asic rs780_asic = {
1010 .bandwidth_update = &rs690_bandwidth_update, 1021 .bandwidth_update = &rs690_bandwidth_update,
1011 .get_vblank_counter = &rs600_get_vblank_counter, 1022 .get_vblank_counter = &rs600_get_vblank_counter,
1012 .wait_for_vblank = &avivo_wait_for_vblank, 1023 .wait_for_vblank = &avivo_wait_for_vblank,
1024 .set_backlight_level = &atombios_set_backlight_level,
1013 }, 1025 },
1014 .copy = { 1026 .copy = {
1015 .blit = &r600_copy_blit, 1027 .blit = &r600_copy_blit,
@@ -1083,6 +1095,7 @@ static struct radeon_asic rv770_asic = {
1083 .bandwidth_update = &rv515_bandwidth_update, 1095 .bandwidth_update = &rv515_bandwidth_update,
1084 .get_vblank_counter = &rs600_get_vblank_counter, 1096 .get_vblank_counter = &rs600_get_vblank_counter,
1085 .wait_for_vblank = &avivo_wait_for_vblank, 1097 .wait_for_vblank = &avivo_wait_for_vblank,
1098 .set_backlight_level = &atombios_set_backlight_level,
1086 }, 1099 },
1087 .copy = { 1100 .copy = {
1088 .blit = &r600_copy_blit, 1101 .blit = &r600_copy_blit,
@@ -1156,6 +1169,7 @@ static struct radeon_asic evergreen_asic = {
1156 .bandwidth_update = &evergreen_bandwidth_update, 1169 .bandwidth_update = &evergreen_bandwidth_update,
1157 .get_vblank_counter = &evergreen_get_vblank_counter, 1170 .get_vblank_counter = &evergreen_get_vblank_counter,
1158 .wait_for_vblank = &dce4_wait_for_vblank, 1171 .wait_for_vblank = &dce4_wait_for_vblank,
1172 .set_backlight_level = &atombios_set_backlight_level,
1159 }, 1173 },
1160 .copy = { 1174 .copy = {
1161 .blit = &r600_copy_blit, 1175 .blit = &r600_copy_blit,
@@ -1229,6 +1243,7 @@ static struct radeon_asic sumo_asic = {
1229 .bandwidth_update = &evergreen_bandwidth_update, 1243 .bandwidth_update = &evergreen_bandwidth_update,
1230 .get_vblank_counter = &evergreen_get_vblank_counter, 1244 .get_vblank_counter = &evergreen_get_vblank_counter,
1231 .wait_for_vblank = &dce4_wait_for_vblank, 1245 .wait_for_vblank = &dce4_wait_for_vblank,
1246 .set_backlight_level = &atombios_set_backlight_level,
1232 }, 1247 },
1233 .copy = { 1248 .copy = {
1234 .blit = &r600_copy_blit, 1249 .blit = &r600_copy_blit,
@@ -1302,6 +1317,7 @@ static struct radeon_asic btc_asic = {
1302 .bandwidth_update = &evergreen_bandwidth_update, 1317 .bandwidth_update = &evergreen_bandwidth_update,
1303 .get_vblank_counter = &evergreen_get_vblank_counter, 1318 .get_vblank_counter = &evergreen_get_vblank_counter,
1304 .wait_for_vblank = &dce4_wait_for_vblank, 1319 .wait_for_vblank = &dce4_wait_for_vblank,
1320 .set_backlight_level = &atombios_set_backlight_level,
1305 }, 1321 },
1306 .copy = { 1322 .copy = {
1307 .blit = &r600_copy_blit, 1323 .blit = &r600_copy_blit,
@@ -1406,6 +1422,7 @@ static struct radeon_asic cayman_asic = {
1406 .bandwidth_update = &evergreen_bandwidth_update, 1422 .bandwidth_update = &evergreen_bandwidth_update,
1407 .get_vblank_counter = &evergreen_get_vblank_counter, 1423 .get_vblank_counter = &evergreen_get_vblank_counter,
1408 .wait_for_vblank = &dce4_wait_for_vblank, 1424 .wait_for_vblank = &dce4_wait_for_vblank,
1425 .set_backlight_level = &atombios_set_backlight_level,
1409 }, 1426 },
1410 .copy = { 1427 .copy = {
1411 .blit = &r600_copy_blit, 1428 .blit = &r600_copy_blit,
@@ -1500,6 +1517,7 @@ static struct radeon_asic trinity_asic = {
1500 .bandwidth_update = &dce6_bandwidth_update, 1517 .bandwidth_update = &dce6_bandwidth_update,
1501 .get_vblank_counter = &evergreen_get_vblank_counter, 1518 .get_vblank_counter = &evergreen_get_vblank_counter,
1502 .wait_for_vblank = &dce4_wait_for_vblank, 1519 .wait_for_vblank = &dce4_wait_for_vblank,
1520 .set_backlight_level = &atombios_set_backlight_level,
1503 }, 1521 },
1504 .copy = { 1522 .copy = {
1505 .blit = &r600_copy_blit, 1523 .blit = &r600_copy_blit,
@@ -1604,6 +1622,7 @@ static struct radeon_asic si_asic = {
1604 .bandwidth_update = &dce6_bandwidth_update, 1622 .bandwidth_update = &dce6_bandwidth_update,
1605 .get_vblank_counter = &evergreen_get_vblank_counter, 1623 .get_vblank_counter = &evergreen_get_vblank_counter,
1606 .wait_for_vblank = &dce4_wait_for_vblank, 1624 .wait_for_vblank = &dce4_wait_for_vblank,
1625 .set_backlight_level = &atombios_set_backlight_level,
1607 }, 1626 },
1608 .copy = { 1627 .copy = {
1609 .blit = NULL, 1628 .blit = NULL,
@@ -1697,6 +1716,7 @@ int radeon_asic_init(struct radeon_device *rdev)
1697 rdev->asic->pm.set_engine_clock = &radeon_legacy_set_engine_clock; 1716 rdev->asic->pm.set_engine_clock = &radeon_legacy_set_engine_clock;
1698 rdev->asic->pm.get_memory_clock = &radeon_legacy_get_memory_clock; 1717 rdev->asic->pm.get_memory_clock = &radeon_legacy_get_memory_clock;
1699 rdev->asic->pm.set_memory_clock = NULL; 1718 rdev->asic->pm.set_memory_clock = NULL;
1719 rdev->asic->display.set_backlight_level = &radeon_legacy_set_backlight_level;
1700 } 1720 }
1701 break; 1721 break;
1702 case CHIP_RS400: 1722 case CHIP_RS400: