diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ltc_gk20a.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c index 4c6543bb..4359f282 100644 --- a/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ltc_gk20a.c | |||
@@ -217,7 +217,7 @@ static void gk20a_mm_g_elpg_flush_locked(struct gk20a *g) | |||
217 | break; | 217 | break; |
218 | } while (retry >= 0 || !tegra_platform_is_silicon()); | 218 | } while (retry >= 0 || !tegra_platform_is_silicon()); |
219 | 219 | ||
220 | if (retry < 0) | 220 | if (tegra_platform_is_silicon() && retry < 0) |
221 | gk20a_warn(dev_from_gk20a(g), | 221 | gk20a_warn(dev_from_gk20a(g), |
222 | "g_elpg_flush too many retries"); | 222 | "g_elpg_flush too many retries"); |
223 | 223 | ||
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index 10bdc076..8d9488fd 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c | |||
@@ -2787,7 +2787,7 @@ int gk20a_mm_fb_flush(struct gk20a *g) | |||
2787 | break; | 2787 | break; |
2788 | } while (retry >= 0 || !tegra_platform_is_silicon()); | 2788 | } while (retry >= 0 || !tegra_platform_is_silicon()); |
2789 | 2789 | ||
2790 | if (retry < 0) { | 2790 | if (tegra_platform_is_silicon() && retry < 0) { |
2791 | gk20a_warn(dev_from_gk20a(g), | 2791 | gk20a_warn(dev_from_gk20a(g), |
2792 | "fb_flush too many retries"); | 2792 | "fb_flush too many retries"); |
2793 | ret = -EBUSY; | 2793 | ret = -EBUSY; |
@@ -2827,7 +2827,7 @@ static void gk20a_mm_l2_invalidate_locked(struct gk20a *g) | |||
2827 | break; | 2827 | break; |
2828 | } while (retry >= 0 || !tegra_platform_is_silicon()); | 2828 | } while (retry >= 0 || !tegra_platform_is_silicon()); |
2829 | 2829 | ||
2830 | if (retry < 0) | 2830 | if (tegra_platform_is_silicon() && retry < 0) |
2831 | gk20a_warn(dev_from_gk20a(g), | 2831 | gk20a_warn(dev_from_gk20a(g), |
2832 | "l2_system_invalidate too many retries"); | 2832 | "l2_system_invalidate too many retries"); |
2833 | 2833 | ||
@@ -2881,7 +2881,7 @@ void gk20a_mm_l2_flush(struct gk20a *g, bool invalidate) | |||
2881 | break; | 2881 | break; |
2882 | } while (retry >= 0 || !tegra_platform_is_silicon()); | 2882 | } while (retry >= 0 || !tegra_platform_is_silicon()); |
2883 | 2883 | ||
2884 | if (retry < 0) | 2884 | if (tegra_platform_is_silicon() && retry < 0) |
2885 | gk20a_warn(dev_from_gk20a(g), | 2885 | gk20a_warn(dev_from_gk20a(g), |
2886 | "l2_flush_dirty too many retries"); | 2886 | "l2_flush_dirty too many retries"); |
2887 | 2887 | ||
@@ -2954,7 +2954,7 @@ void gk20a_mm_tlb_invalidate(struct vm_gk20a *vm) | |||
2954 | retry--; | 2954 | retry--; |
2955 | } while (retry >= 0 || !tegra_platform_is_silicon()); | 2955 | } while (retry >= 0 || !tegra_platform_is_silicon()); |
2956 | 2956 | ||
2957 | if (retry < 0) { | 2957 | if (tegra_platform_is_silicon() && retry < 0) { |
2958 | gk20a_warn(dev_from_gk20a(g), | 2958 | gk20a_warn(dev_from_gk20a(g), |
2959 | "wait mmu fifo space too many retries"); | 2959 | "wait mmu fifo space too many retries"); |
2960 | goto out; | 2960 | goto out; |
@@ -2977,7 +2977,7 @@ void gk20a_mm_tlb_invalidate(struct vm_gk20a *vm) | |||
2977 | udelay(2); | 2977 | udelay(2); |
2978 | } while (retry >= 0 || !tegra_platform_is_silicon()); | 2978 | } while (retry >= 0 || !tegra_platform_is_silicon()); |
2979 | 2979 | ||
2980 | if (retry < 0) | 2980 | if (tegra_platform_is_silicon() && retry < 0) |
2981 | gk20a_warn(dev_from_gk20a(g), | 2981 | gk20a_warn(dev_from_gk20a(g), |
2982 | "mmu invalidate too many retries"); | 2982 | "mmu invalidate too many retries"); |
2983 | 2983 | ||