diff options
author | Sunny He <suhe@nvidia.com> | 2017-07-31 17:43:11 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-08-11 17:16:46 -0400 |
commit | 63b74d4b768e0c96367d4983fdd8f1db1d317d01 (patch) | |
tree | 3966af83cf9abdf687667afe120cc6648a9ed360 /drivers/gpu/nvgpu/gm20b/fb_gm20b.c | |
parent | 83e49b39181a86d32f6350c65659b5892f8f7670 (diff) |
gpu: nvgpu: Reorg fb HAL initialization
Reorganize HAL initialization to remove inheritance and construct
the gpu_ops struct at compile time. This patch only covers the
fb sub-module of the gpu_ops struct.
Perform HAL function assignments in hal_gxxxx.c through the
population of a chip-specific copy of gpu_ops.
Jira NVGPU-74
Change-Id: Ib746798b849810401c12abf5e9cce42d827c6fb1
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1533350
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b/fb_gm20b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gm20b/fb_gm20b.c | 36 |
1 files changed, 9 insertions, 27 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c index 47b4313b..31947ad0 100644 --- a/drivers/gpu/nvgpu/gm20b/fb_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/fb_gm20b.c | |||
@@ -25,7 +25,7 @@ | |||
25 | 25 | ||
26 | #define VPR_INFO_FETCH_WAIT (5) | 26 | #define VPR_INFO_FETCH_WAIT (5) |
27 | 27 | ||
28 | static void fb_gm20b_init_fs_state(struct gk20a *g) | 28 | void fb_gm20b_init_fs_state(struct gk20a *g) |
29 | { | 29 | { |
30 | gk20a_dbg_info("initialize gm20b fb"); | 30 | gk20a_dbg_info("initialize gm20b fb"); |
31 | 31 | ||
@@ -434,7 +434,7 @@ void gm20b_init_kind_attr(void) | |||
434 | } | 434 | } |
435 | } | 435 | } |
436 | 436 | ||
437 | static void gm20b_fb_set_mmu_page_size(struct gk20a *g) | 437 | void gm20b_fb_set_mmu_page_size(struct gk20a *g) |
438 | { | 438 | { |
439 | /* set large page size in fb */ | 439 | /* set large page size in fb */ |
440 | u32 fb_mmu_ctrl = gk20a_readl(g, fb_mmu_ctrl_r()); | 440 | u32 fb_mmu_ctrl = gk20a_readl(g, fb_mmu_ctrl_r()); |
@@ -442,7 +442,7 @@ static void gm20b_fb_set_mmu_page_size(struct gk20a *g) | |||
442 | gk20a_writel(g, fb_mmu_ctrl_r(), fb_mmu_ctrl); | 442 | gk20a_writel(g, fb_mmu_ctrl_r(), fb_mmu_ctrl); |
443 | } | 443 | } |
444 | 444 | ||
445 | static bool gm20b_fb_set_use_full_comp_tag_line(struct gk20a *g) | 445 | bool gm20b_fb_set_use_full_comp_tag_line(struct gk20a *g) |
446 | { | 446 | { |
447 | /* set large page size in fb */ | 447 | /* set large page size in fb */ |
448 | u32 fb_mmu_ctrl = gk20a_readl(g, fb_mmu_ctrl_r()); | 448 | u32 fb_mmu_ctrl = gk20a_readl(g, fb_mmu_ctrl_r()); |
@@ -452,17 +452,17 @@ static bool gm20b_fb_set_use_full_comp_tag_line(struct gk20a *g) | |||
452 | return true; | 452 | return true; |
453 | } | 453 | } |
454 | 454 | ||
455 | static unsigned int gm20b_fb_compression_page_size(struct gk20a *g) | 455 | unsigned int gm20b_fb_compression_page_size(struct gk20a *g) |
456 | { | 456 | { |
457 | return SZ_128K; | 457 | return SZ_128K; |
458 | } | 458 | } |
459 | 459 | ||
460 | static unsigned int gm20b_fb_compressible_page_size(struct gk20a *g) | 460 | unsigned int gm20b_fb_compressible_page_size(struct gk20a *g) |
461 | { | 461 | { |
462 | return SZ_64K; | 462 | return SZ_64K; |
463 | } | 463 | } |
464 | 464 | ||
465 | static void gm20b_fb_dump_vpr_wpr_info(struct gk20a *g) | 465 | void gm20b_fb_dump_vpr_wpr_info(struct gk20a *g) |
466 | { | 466 | { |
467 | u32 val; | 467 | u32 val; |
468 | 468 | ||
@@ -511,7 +511,7 @@ static int gm20b_fb_vpr_info_fetch_wait(struct gk20a *g, | |||
511 | return -ETIMEDOUT; | 511 | return -ETIMEDOUT; |
512 | } | 512 | } |
513 | 513 | ||
514 | static int gm20b_fb_vpr_info_fetch(struct gk20a *g) | 514 | int gm20b_fb_vpr_info_fetch(struct gk20a *g) |
515 | { | 515 | { |
516 | if (gm20b_fb_vpr_info_fetch_wait(g, VPR_INFO_FETCH_WAIT)) { | 516 | if (gm20b_fb_vpr_info_fetch_wait(g, VPR_INFO_FETCH_WAIT)) { |
517 | return -ETIME; | 517 | return -ETIME; |
@@ -523,14 +523,14 @@ static int gm20b_fb_vpr_info_fetch(struct gk20a *g) | |||
523 | return gm20b_fb_vpr_info_fetch_wait(g, VPR_INFO_FETCH_WAIT); | 523 | return gm20b_fb_vpr_info_fetch_wait(g, VPR_INFO_FETCH_WAIT); |
524 | } | 524 | } |
525 | 525 | ||
526 | static bool gm20b_fb_debug_mode_enabled(struct gk20a *g) | 526 | bool gm20b_fb_debug_mode_enabled(struct gk20a *g) |
527 | { | 527 | { |
528 | u32 debug_ctrl = gk20a_readl(g, gr_gpcs_pri_mmu_debug_ctrl_r()); | 528 | u32 debug_ctrl = gk20a_readl(g, gr_gpcs_pri_mmu_debug_ctrl_r()); |
529 | return gr_gpcs_pri_mmu_debug_ctrl_debug_v(debug_ctrl) == | 529 | return gr_gpcs_pri_mmu_debug_ctrl_debug_v(debug_ctrl) == |
530 | gr_gpcs_pri_mmu_debug_ctrl_debug_enabled_v(); | 530 | gr_gpcs_pri_mmu_debug_ctrl_debug_enabled_v(); |
531 | } | 531 | } |
532 | 532 | ||
533 | static void gm20b_fb_set_debug_mode(struct gk20a *g, bool enable) | 533 | void gm20b_fb_set_debug_mode(struct gk20a *g, bool enable) |
534 | { | 534 | { |
535 | u32 reg_val, fb_debug_ctrl, gpc_debug_ctrl; | 535 | u32 reg_val, fb_debug_ctrl, gpc_debug_ctrl; |
536 | 536 | ||
@@ -554,21 +554,3 @@ static void gm20b_fb_set_debug_mode(struct gk20a *g, bool enable) | |||
554 | gr_gpcs_pri_mmu_debug_ctrl_debug_m(), gpc_debug_ctrl); | 554 | gr_gpcs_pri_mmu_debug_ctrl_debug_m(), gpc_debug_ctrl); |
555 | gk20a_writel(g, gr_gpcs_pri_mmu_debug_ctrl_r(), reg_val); | 555 | gk20a_writel(g, gr_gpcs_pri_mmu_debug_ctrl_r(), reg_val); |
556 | } | 556 | } |
557 | |||
558 | void gm20b_init_fb(struct gpu_ops *gops) | ||
559 | { | ||
560 | gops->fb.reset = fb_gk20a_reset; | ||
561 | gops->fb.init_hw = gk20a_fb_init_hw; | ||
562 | gops->fb.init_fs_state = fb_gm20b_init_fs_state; | ||
563 | gops->fb.set_mmu_page_size = gm20b_fb_set_mmu_page_size; | ||
564 | gops->fb.set_use_full_comp_tag_line = gm20b_fb_set_use_full_comp_tag_line; | ||
565 | gops->fb.compression_page_size = gm20b_fb_compression_page_size; | ||
566 | gops->fb.compressible_page_size = gm20b_fb_compressible_page_size; | ||
567 | gops->fb.vpr_info_fetch = gm20b_fb_vpr_info_fetch; | ||
568 | gops->fb.dump_vpr_wpr_info = gm20b_fb_dump_vpr_wpr_info; | ||
569 | gops->fb.is_debug_mode_enabled = gm20b_fb_debug_mode_enabled; | ||
570 | gops->fb.set_debug_mode = gm20b_fb_set_debug_mode; | ||
571 | gops->fb.tlb_invalidate = gk20a_fb_tlb_invalidate; | ||
572 | gm20b_init_uncompressed_kind_map(); | ||
573 | gm20b_init_kind_attr(); | ||
574 | } | ||