nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-25 02:52:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: gp106: Skip resetting FB

Browse Source 
FB is enabled in devinit. Skip resetting it in GPU boot.

Bug 1799537

Change-Id: I0748127f0962e7d6d2bf0ecece6773fdf9c35bc8
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/1208715
(cherry picked from commit ceafac52f5711bd987b746686f11b22807f74698)
Reviewed-on: http://git-master/r/1227265
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Terje Bergstrom
2016-08-26 10:18:16 -07:00
committed by Deepak Nibade
parent d2b67f1ad6
commit 3bccca16b8
4 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/nvgpu/Makefile.nvgpu-t18x
View File

@@ -28,6 +28,7 @@ nvgpu-y += \
$(nvgpu-t18x)/gp106/sec2_gp106.o \
$(nvgpu-t18x)/gp106/fifo_gp106.o \
$(nvgpu-t18x)/gp106/ltc_gp106.o \
$(nvgpu-t18x)/gp106/fb_gp106.o \
$(nvgpu-t18x)/clk/clk_mclk.o \
$(nvgpu-t18x)/pstate/pstate.o \
$(nvgpu-t18x)/clk/clk_vin.o \

25
drivers/gpu/nvgpu/gp106/fb_gp106.c Normal file
View File

@@ -0,0 +1,25 @@
/*
* Copyright (c) 2016, 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,
* version 2, as published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*/
#include <linux/types.h>
#include "gk20a/gk20a.h"
#include "gp10b/fb_gp10b.h"
void gp106_init_fb(struct gpu_ops *gops)
{
gp10b_init_fb(gops);
gops->fb.init_fs_state = NULL;
gops->fb.reset = NULL;
}

19
drivers/gpu/nvgpu/gp106/fb_gp106.h Normal file
View File

@@ -0,0 +1,19 @@
/*
* Copyright (c) 2016, 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,
* version 2, as published by the Free Software Foundation.
*
* This program is distributed in the hope it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*/
#ifndef FB_GP106_H
#define FB_GP106_H
struct gpu_ops;
void gp106_init_fb(struct gpu_ops *gops);
#endif

4
drivers/gpu/nvgpu/gp106/hal_gp106.c
View File

@@ -25,7 +25,6 @@
#include "gp106/ltc_gp106.h"
#include "gp10b/mm_gp10b.h"
#include "gp10b/ce_gp10b.h"
#include "gp10b/fb_gp10b.h"
#include "gp106/fifo_gp106.h"
#include "gp10b/gp10b_gating_reglist.h"
#include "gp10b/regops_gp10b.h"
@@ -43,6 +42,7 @@
#include "gp106/pmu_gp106.h"
#include "gp106/gr_ctx_gp106.h"
#include "gp106/gr_gp106.h"
#include "gp106/fb_gp106.h"
#include "nvgpu_gpuid_t18x.h"
#include "hw_proj_gp106.h"
#include "gk20a/dbg_gpu_gk20a.h"
@@ -148,7 +148,7 @@ int gp106_init_hal(struct gk20a *g)
gp10b_init_mc(gops);
gp106_init_gr(gops);
gp106_init_ltc(gops);
gp10b_init_fb(gops);
gp106_init_fb(gops);
gp106_init_fifo(gops);
gp10b_init_ce(gops);
gp106_init_gr_ctx(gops);