nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: fix cbc base calculation for dGPU

Browse Source 
JIRA DNVGPU-9

Change-Id: I22667acfadfcabf79af841ca5389e41d2ac34860
Signed-off-by: David Nieto <dmartineznie@nvidia.com>
Reviewed-on: http://git-master/r/1206478
(cherry picked from commit 098b932f7633a903c915b1257beb9304735b4113)
Reviewed-on: http://git-master/r/1210288
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
This commit is contained in:
David Nieto
2016-08-23 10:47:10 -07:00
committed by Deepak Nibade
parent 6d4851e248
commit 5e486b5182
4 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,8 @@ nvgpu-y += \
$(nvgpu-t18x)/gp106/gr_ctx_gp106.o \ $(nvgpu-t18x)/gp106/gr_ctx_gp106.o \
$(nvgpu-t18x)/gp106/acr_gp106.o \ $(nvgpu-t18x)/gp106/acr_gp106.o \
$(nvgpu-t18x)/gp106/sec2_gp106.o \ $(nvgpu-t18x)/gp106/sec2_gp106.o \
$(nvgpu-t18x)/gp106/fifo_gp106.o $(nvgpu-t18x)/gp106/fifo_gp106.o \
$(nvgpu-t18x)/gp106/ltc_gp106.o
nvgpu-$(CONFIG_TEGRA_GK20A) += $(nvgpu-t18x)/gp10b/platform_gp10b_tegra.o nvgpu-$(CONFIG_TEGRA_GK20A) += $(nvgpu-t18x)/gp10b/platform_gp10b_tegra.o

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

@@ -22,7 +22,7 @@
#include "gp10b/gr_gp10b.h" #include "gp10b/gr_gp10b.h"
#include "gp10b/mc_gp10b.h" #include "gp10b/mc_gp10b.h"
#include "gp10b/ltc_gp10b.h" #include "gp106/ltc_gp106.h"
#include "gp10b/mm_gp10b.h" #include "gp10b/mm_gp10b.h"
#include "gp10b/ce_gp10b.h" #include "gp10b/ce_gp10b.h"
#include "gp10b/fb_gp10b.h" #include "gp10b/fb_gp10b.h"
@@ -147,7 +147,7 @@ int gp106_init_hal(struct gk20a *g)
gp10b_init_mc(gops); gp10b_init_mc(gops);
gp106_init_gr(gops); gp106_init_gr(gops);
gp10b_init_ltc(gops); gp106_init_ltc(gops);
gp10b_init_fb(gops); gp10b_init_fb(gops);
gp106_init_fifo(gops); gp106_init_fifo(gops);
gp10b_init_ce(gops); gp10b_init_ce(gops);

25
drivers/gpu/nvgpu/gp106/ltc_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/ltc_gp10b.h"
void gp106_init_ltc(struct gpu_ops *gops)
{
gp10b_init_ltc(gops);
/* dGPU does not need the LTC hack */
gops->ltc.cbc_fix_config = NULL;
}

19
drivers/gpu/nvgpu/gp106/ltc_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 LTC_GP106_H
#define LTC_GP106_H
struct gpu_ops;
void gp106_init_ltc(struct gpu_ops *gops);
#endif