diff options
Diffstat (limited to 'drivers/gpu/nvgpu/clk/clk_vin.c')
-rw-r--r-- | drivers/gpu/nvgpu/clk/clk_vin.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c index 74bcd247..66efefef 100644 --- a/drivers/gpu/nvgpu/clk/clk_vin.c +++ b/drivers/gpu/nvgpu/clk/clk_vin.c | |||
@@ -323,13 +323,13 @@ static u32 _clk_vin_devgrp_pmudatainit_super(struct gk20a *g, | |||
323 | struct avfsvinobjs *pvin_obbj = (struct avfsvinobjs *)pboardobjgrp; | 323 | struct avfsvinobjs *pvin_obbj = (struct avfsvinobjs *)pboardobjgrp; |
324 | u32 status = 0; | 324 | u32 status = 0; |
325 | 325 | ||
326 | gk20a_dbg_info(""); | 326 | nvgpu_log_info(g, " "); |
327 | 327 | ||
328 | status = boardobjgrp_pmudatainit_e32(g, pboardobjgrp, pboardobjgrppmu); | 328 | status = boardobjgrp_pmudatainit_e32(g, pboardobjgrp, pboardobjgrppmu); |
329 | 329 | ||
330 | pset->b_vin_is_disable_allowed = pvin_obbj->vin_is_disable_allowed; | 330 | pset->b_vin_is_disable_allowed = pvin_obbj->vin_is_disable_allowed; |
331 | 331 | ||
332 | gk20a_dbg_info(" Done"); | 332 | nvgpu_log_info(g, " Done"); |
333 | return status; | 333 | return status; |
334 | } | 334 | } |
335 | 335 | ||
@@ -342,7 +342,7 @@ static u32 _clk_vin_devgrp_pmudata_instget(struct gk20a *g, | |||
342 | (struct nv_pmu_clk_clk_vin_device_boardobj_grp_set *) | 342 | (struct nv_pmu_clk_clk_vin_device_boardobj_grp_set *) |
343 | pmuboardobjgrp; | 343 | pmuboardobjgrp; |
344 | 344 | ||
345 | gk20a_dbg_info(""); | 345 | nvgpu_log_info(g, " "); |
346 | 346 | ||
347 | /*check whether pmuboardobjgrp has a valid boardobj in index*/ | 347 | /*check whether pmuboardobjgrp has a valid boardobj in index*/ |
348 | if (((u32)BIT(idx) & | 348 | if (((u32)BIT(idx) & |
@@ -351,7 +351,7 @@ static u32 _clk_vin_devgrp_pmudata_instget(struct gk20a *g, | |||
351 | 351 | ||
352 | *ppboardobjpmudata = (struct nv_pmu_boardobj *) | 352 | *ppboardobjpmudata = (struct nv_pmu_boardobj *) |
353 | &pgrp_set->objects[idx].data.board_obj; | 353 | &pgrp_set->objects[idx].data.board_obj; |
354 | gk20a_dbg_info(" Done"); | 354 | nvgpu_log_info(g, " Done"); |
355 | return 0; | 355 | return 0; |
356 | } | 356 | } |
357 | 357 | ||
@@ -381,7 +381,7 @@ u32 clk_vin_sw_setup(struct gk20a *g) | |||
381 | struct vin_device_v20 *pvindev = NULL; | 381 | struct vin_device_v20 *pvindev = NULL; |
382 | struct avfsvinobjs *pvinobjs; | 382 | struct avfsvinobjs *pvinobjs; |
383 | 383 | ||
384 | gk20a_dbg_info(""); | 384 | nvgpu_log_info(g, " "); |
385 | 385 | ||
386 | status = boardobjgrpconstruct_e32(g, &g->clk_pmu.avfs_vinobjs.super); | 386 | status = boardobjgrpconstruct_e32(g, &g->clk_pmu.avfs_vinobjs.super); |
387 | if (status) { | 387 | if (status) { |
@@ -427,7 +427,7 @@ u32 clk_vin_sw_setup(struct gk20a *g) | |||
427 | } | 427 | } |
428 | 428 | ||
429 | done: | 429 | done: |
430 | gk20a_dbg_info(" done status %x", status); | 430 | nvgpu_log_info(g, " done status %x", status); |
431 | return status; | 431 | return status; |
432 | } | 432 | } |
433 | 433 | ||
@@ -436,7 +436,7 @@ u32 clk_vin_pmu_setup(struct gk20a *g) | |||
436 | u32 status; | 436 | u32 status; |
437 | struct boardobjgrp *pboardobjgrp = NULL; | 437 | struct boardobjgrp *pboardobjgrp = NULL; |
438 | 438 | ||
439 | gk20a_dbg_info(""); | 439 | nvgpu_log_info(g, " "); |
440 | 440 | ||
441 | pboardobjgrp = &g->clk_pmu.avfs_vinobjs.super.super; | 441 | pboardobjgrp = &g->clk_pmu.avfs_vinobjs.super.super; |
442 | 442 | ||
@@ -445,7 +445,7 @@ u32 clk_vin_pmu_setup(struct gk20a *g) | |||
445 | 445 | ||
446 | status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); | 446 | status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); |
447 | 447 | ||
448 | gk20a_dbg_info("Done"); | 448 | nvgpu_log_info(g, "Done"); |
449 | return status; | 449 | return status; |
450 | } | 450 | } |
451 | 451 | ||
@@ -470,7 +470,7 @@ static u32 devinit_get_vin_device_table(struct gk20a *g, | |||
470 | struct vin_device_v20 vin_device_v20; | 470 | struct vin_device_v20 vin_device_v20; |
471 | } vin_device_data; | 471 | } vin_device_data; |
472 | 472 | ||
473 | gk20a_dbg_info(""); | 473 | nvgpu_log_info(g, " "); |
474 | 474 | ||
475 | vin_table_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, | 475 | vin_table_ptr = (u8 *)nvgpu_bios_get_perf_table_ptrs(g, |
476 | g->bios.clock_token, VIN_TABLE); | 476 | g->bios.clock_token, VIN_TABLE); |
@@ -557,7 +557,7 @@ static u32 devinit_get_vin_device_table(struct gk20a *g, | |||
557 | } | 557 | } |
558 | 558 | ||
559 | done: | 559 | done: |
560 | gk20a_dbg_info(" done status %x", status); | 560 | nvgpu_log_info(g, " done status %x", status); |
561 | return status; | 561 | return status; |
562 | } | 562 | } |
563 | 563 | ||
@@ -645,7 +645,7 @@ static struct vin_device *construct_vin_device(struct gk20a *g, void *pargs) | |||
645 | struct boardobj *board_obj_ptr = NULL; | 645 | struct boardobj *board_obj_ptr = NULL; |
646 | u32 status; | 646 | u32 status; |
647 | 647 | ||
648 | gk20a_dbg_info(" %d", BOARDOBJ_GET_TYPE(pargs)); | 648 | nvgpu_log_info(g, " %d", BOARDOBJ_GET_TYPE(pargs)); |
649 | switch (BOARDOBJ_GET_TYPE(pargs)) { | 649 | switch (BOARDOBJ_GET_TYPE(pargs)) { |
650 | case CTRL_CLK_VIN_TYPE_V10: | 650 | case CTRL_CLK_VIN_TYPE_V10: |
651 | status = vin_device_construct_v10(g, &board_obj_ptr, | 651 | status = vin_device_construct_v10(g, &board_obj_ptr, |
@@ -664,7 +664,7 @@ static struct vin_device *construct_vin_device(struct gk20a *g, void *pargs) | |||
664 | if (status) | 664 | if (status) |
665 | return NULL; | 665 | return NULL; |
666 | 666 | ||
667 | gk20a_dbg_info(" Done"); | 667 | nvgpu_log_info(g, " Done"); |
668 | 668 | ||
669 | return (struct vin_device *)board_obj_ptr; | 669 | return (struct vin_device *)board_obj_ptr; |
670 | } | 670 | } |
@@ -679,7 +679,7 @@ static u32 vin_device_init_pmudata_v10(struct gk20a *g, | |||
679 | struct vin_device_v20 *pvin_dev_v20; | 679 | struct vin_device_v20 *pvin_dev_v20; |
680 | struct nv_pmu_clk_clk_vin_device_v10_boardobj_set *perf_pmu_data; | 680 | struct nv_pmu_clk_clk_vin_device_v10_boardobj_set *perf_pmu_data; |
681 | 681 | ||
682 | gk20a_dbg_info(""); | 682 | nvgpu_log_info(g, " "); |
683 | 683 | ||
684 | status = vin_device_init_pmudata_super(g, board_obj_ptr, ppmudata); | 684 | status = vin_device_init_pmudata_super(g, board_obj_ptr, ppmudata); |
685 | if (status != 0) | 685 | if (status != 0) |
@@ -692,7 +692,7 @@ static u32 vin_device_init_pmudata_v10(struct gk20a *g, | |||
692 | perf_pmu_data->data.vin_cal.intercept = pvin_dev_v20->data.vin_cal.cal_v10.intercept; | 692 | perf_pmu_data->data.vin_cal.intercept = pvin_dev_v20->data.vin_cal.cal_v10.intercept; |
693 | perf_pmu_data->data.vin_cal.slope = pvin_dev_v20->data.vin_cal.cal_v10.slope; | 693 | perf_pmu_data->data.vin_cal.slope = pvin_dev_v20->data.vin_cal.cal_v10.slope; |
694 | 694 | ||
695 | gk20a_dbg_info(" Done"); | 695 | nvgpu_log_info(g, " Done"); |
696 | 696 | ||
697 | return status; | 697 | return status; |
698 | } | 698 | } |
@@ -705,7 +705,7 @@ static u32 vin_device_init_pmudata_v20(struct gk20a *g, | |||
705 | struct vin_device_v20 *pvin_dev_v20; | 705 | struct vin_device_v20 *pvin_dev_v20; |
706 | struct nv_pmu_clk_clk_vin_device_v20_boardobj_set *perf_pmu_data; | 706 | struct nv_pmu_clk_clk_vin_device_v20_boardobj_set *perf_pmu_data; |
707 | 707 | ||
708 | gk20a_dbg_info(""); | 708 | nvgpu_log_info(g, " "); |
709 | 709 | ||
710 | status = vin_device_init_pmudata_super(g, board_obj_ptr, ppmudata); | 710 | status = vin_device_init_pmudata_super(g, board_obj_ptr, ppmudata); |
711 | if (status != 0) | 711 | if (status != 0) |
@@ -718,7 +718,7 @@ static u32 vin_device_init_pmudata_v20(struct gk20a *g, | |||
718 | perf_pmu_data->data.vin_cal.cal_v20.offset = pvin_dev_v20->data.vin_cal.cal_v20.offset; | 718 | perf_pmu_data->data.vin_cal.cal_v20.offset = pvin_dev_v20->data.vin_cal.cal_v20.offset; |
719 | perf_pmu_data->data.vin_cal.cal_v20.gain = pvin_dev_v20->data.vin_cal.cal_v20.gain; | 719 | perf_pmu_data->data.vin_cal.cal_v20.gain = pvin_dev_v20->data.vin_cal.cal_v20.gain; |
720 | 720 | ||
721 | gk20a_dbg_info(" Done"); | 721 | nvgpu_log_info(g, " Done"); |
722 | 722 | ||
723 | return status; | 723 | return status; |
724 | } | 724 | } |
@@ -731,7 +731,7 @@ static u32 vin_device_init_pmudata_super(struct gk20a *g, | |||
731 | struct vin_device *pvin_dev; | 731 | struct vin_device *pvin_dev; |
732 | struct nv_pmu_clk_clk_vin_device_boardobj_set *perf_pmu_data; | 732 | struct nv_pmu_clk_clk_vin_device_boardobj_set *perf_pmu_data; |
733 | 733 | ||
734 | gk20a_dbg_info(""); | 734 | nvgpu_log_info(g, " "); |
735 | 735 | ||
736 | status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); | 736 | status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); |
737 | if (status != 0) | 737 | if (status != 0) |
@@ -745,7 +745,7 @@ static u32 vin_device_init_pmudata_super(struct gk20a *g, | |||
745 | perf_pmu_data->volt_domain = pvin_dev->volt_domain; | 745 | perf_pmu_data->volt_domain = pvin_dev->volt_domain; |
746 | perf_pmu_data->flls_shared_mask = pvin_dev->flls_shared_mask; | 746 | perf_pmu_data->flls_shared_mask = pvin_dev->flls_shared_mask; |
747 | 747 | ||
748 | gk20a_dbg_info(" Done"); | 748 | nvgpu_log_info(g, " Done"); |
749 | 749 | ||
750 | return status; | 750 | return status; |
751 | } | 751 | } |