From 36c07aaf5da4d0e739c5143ed00d4ca8a2263ce1 Mon Sep 17 00:00:00 2001 From: Sunny He Date: Fri, 11 Aug 2017 14:43:28 -0700 Subject: Revert "gpu: nvgpu: Reorg fb HAL initialization" Conflicts with gv100 changes This reverts commit 63b74d4b768e0c96367d4983fdd8f1db1d317d01. Change-Id: I5e6a1c93ff613daaa100dee436f4941af74f0ac4 Signed-off-by: Sunny He Reviewed-on: https://git-master.nvidia.com/r/1537671 Reviewed-by: Shu Zhong Tested-by: Shu Zhong --- drivers/gpu/nvgpu/gm20b/fb_gm20b.h | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'drivers/gpu/nvgpu/gm20b/fb_gm20b.h') diff --git a/drivers/gpu/nvgpu/gm20b/fb_gm20b.h b/drivers/gpu/nvgpu/gm20b/fb_gm20b.h index 42e86407..22b848d6 100644 --- a/drivers/gpu/nvgpu/gm20b/fb_gm20b.h +++ b/drivers/gpu/nvgpu/gm20b/fb_gm20b.h @@ -1,7 +1,7 @@ /* * GM20B FB * - * Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -17,16 +17,7 @@ #define _NVHOST_GM20B_FB struct gk20a; -void fb_gm20b_init_fs_state(struct gk20a *g); -void gm20b_fb_set_mmu_page_size(struct gk20a *g); -bool gm20b_fb_set_use_full_comp_tag_line(struct gk20a *g); -unsigned int gm20b_fb_compression_page_size(struct gk20a *g); -unsigned int gm20b_fb_compressible_page_size(struct gk20a *g); -void gm20b_fb_dump_vpr_wpr_info(struct gk20a *g); -int gm20b_fb_vpr_info_fetch(struct gk20a *g); -bool gm20b_fb_debug_mode_enabled(struct gk20a *g); -void gm20b_fb_set_debug_mode(struct gk20a *g, bool enable); - +void gm20b_init_fb(struct gpu_ops *gops); void gm20b_init_uncompressed_kind_map(void); void gm20b_init_kind_attr(void); #endif -- cgit v1.2.2