diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c index 82648ca3..5301b13d 100644 --- a/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c +++ b/drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c | |||
@@ -551,6 +551,7 @@ static void gk20a_tegra_scale_init(struct device *dev) | |||
551 | struct gk20a_platform *platform = gk20a_get_platform(dev); | 551 | struct gk20a_platform *platform = gk20a_get_platform(dev); |
552 | struct gk20a_scale_profile *profile = platform->g->scale_profile; | 552 | struct gk20a_scale_profile *profile = platform->g->scale_profile; |
553 | struct gk20a_emc_params *emc_params; | 553 | struct gk20a_emc_params *emc_params; |
554 | struct gk20a *g = platform->g; | ||
554 | 555 | ||
555 | if (!profile) | 556 | if (!profile) |
556 | return; | 557 | return; |
@@ -568,7 +569,7 @@ static void gk20a_tegra_scale_init(struct device *dev) | |||
568 | #ifdef CONFIG_TEGRA_BWMGR | 569 | #ifdef CONFIG_TEGRA_BWMGR |
569 | emc_params->bwmgr_cl = tegra_bwmgr_register(TEGRA_BWMGR_CLIENT_GPU); | 570 | emc_params->bwmgr_cl = tegra_bwmgr_register(TEGRA_BWMGR_CLIENT_GPU); |
570 | if (!emc_params->bwmgr_cl) { | 571 | if (!emc_params->bwmgr_cl) { |
571 | gk20a_dbg_info("%s Missing GPU BWMGR client\n", __func__); | 572 | nvgpu_log_info(g, "%s Missing GPU BWMGR client\n", __func__); |
572 | return; | 573 | return; |
573 | } | 574 | } |
574 | #endif | 575 | #endif |
@@ -767,6 +768,7 @@ static int gk20a_tegra_probe(struct device *dev) | |||
767 | struct device_node *np = dev->of_node; | 768 | struct device_node *np = dev->of_node; |
768 | bool joint_xpu_rail = false; | 769 | bool joint_xpu_rail = false; |
769 | int ret; | 770 | int ret; |
771 | struct gk20a *g = platform->g; | ||
770 | 772 | ||
771 | #ifdef CONFIG_COMMON_CLK | 773 | #ifdef CONFIG_COMMON_CLK |
772 | /* DVFS is not guaranteed to be initialized at the time of probe on | 774 | /* DVFS is not guaranteed to be initialized at the time of probe on |
@@ -775,13 +777,13 @@ static int gk20a_tegra_probe(struct device *dev) | |||
775 | if (!platform->gpu_rail) { | 777 | if (!platform->gpu_rail) { |
776 | platform->gpu_rail = tegra_dvfs_get_rail_by_name(GPU_RAIL_NAME); | 778 | platform->gpu_rail = tegra_dvfs_get_rail_by_name(GPU_RAIL_NAME); |
777 | if (!platform->gpu_rail) { | 779 | if (!platform->gpu_rail) { |
778 | gk20a_dbg_info("deferring probe no gpu_rail\n"); | 780 | nvgpu_log_info(g, "deferring probe no gpu_rail"); |
779 | return -EPROBE_DEFER; | 781 | return -EPROBE_DEFER; |
780 | } | 782 | } |
781 | } | 783 | } |
782 | 784 | ||
783 | if (!tegra_dvfs_is_rail_ready(platform->gpu_rail)) { | 785 | if (!tegra_dvfs_is_rail_ready(platform->gpu_rail)) { |
784 | gk20a_dbg_info("deferring probe gpu_rail not ready\n"); | 786 | nvgpu_log_info(g, "deferring probe gpu_rail not ready"); |
785 | return -EPROBE_DEFER; | 787 | return -EPROBE_DEFER; |
786 | } | 788 | } |
787 | #endif | 789 | #endif |
@@ -798,7 +800,7 @@ static int gk20a_tegra_probe(struct device *dev) | |||
798 | #endif | 800 | #endif |
799 | 801 | ||
800 | if (joint_xpu_rail) { | 802 | if (joint_xpu_rail) { |
801 | gk20a_dbg_info("XPU rails are joint\n"); | 803 | nvgpu_log_info(g, "XPU rails are joint\n"); |
802 | platform->g->can_railgate = false; | 804 | platform->g->can_railgate = false; |
803 | } | 805 | } |
804 | 806 | ||