Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
a5537f98
Commit
a5537f98
authored
May 08, 2018
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/gr/gf100-: update r408840 where required
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
8d56fc48
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
127 additions
and
2 deletions
+127
-2
drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h
drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h
+1
-0
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+2
-2
drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild
drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild
+2
-0
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
+2
-0
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
+3
-0
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c
+8
-0
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp104.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp104.c
+47
-0
drivers/gpu/drm/nouveau/nvkm/engine/gr/gp104.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/gp104.c
+62
-0
No files found.
drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h
View file @
a5537f98
...
@@ -45,6 +45,7 @@ int gm200_gr_new(struct nvkm_device *, int, struct nvkm_gr **);
...
@@ -45,6 +45,7 @@ int gm200_gr_new(struct nvkm_device *, int, struct nvkm_gr **);
int
gm20b_gr_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_gr
**
);
int
gm20b_gr_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_gr
**
);
int
gp100_gr_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_gr
**
);
int
gp100_gr_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_gr
**
);
int
gp102_gr_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_gr
**
);
int
gp102_gr_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_gr
**
);
int
gp104_gr_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_gr
**
);
int
gp107_gr_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_gr
**
);
int
gp107_gr_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_gr
**
);
int
gp10b_gr_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_gr
**
);
int
gp10b_gr_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_gr
**
);
#endif
#endif
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
View file @
a5537f98
...
@@ -2256,7 +2256,7 @@ nv134_chipset = {
...
@@ -2256,7 +2256,7 @@ nv134_chipset = {
.
disp
=
gp102_disp_new
,
.
disp
=
gp102_disp_new
,
.
dma
=
gf119_dma_new
,
.
dma
=
gf119_dma_new
,
.
fifo
=
gp100_fifo_new
,
.
fifo
=
gp100_fifo_new
,
.
gr
=
gp10
2
_gr_new
,
.
gr
=
gp10
4
_gr_new
,
.
nvdec
=
gp102_nvdec_new
,
.
nvdec
=
gp102_nvdec_new
,
.
sec2
=
gp102_sec2_new
,
.
sec2
=
gp102_sec2_new
,
.
sw
=
gf100_sw_new
,
.
sw
=
gf100_sw_new
,
...
@@ -2292,7 +2292,7 @@ nv136_chipset = {
...
@@ -2292,7 +2292,7 @@ nv136_chipset = {
.
disp
=
gp102_disp_new
,
.
disp
=
gp102_disp_new
,
.
dma
=
gf119_dma_new
,
.
dma
=
gf119_dma_new
,
.
fifo
=
gp100_fifo_new
,
.
fifo
=
gp100_fifo_new
,
.
gr
=
gp10
2
_gr_new
,
.
gr
=
gp10
4
_gr_new
,
.
nvdec
=
gp102_nvdec_new
,
.
nvdec
=
gp102_nvdec_new
,
.
sec2
=
gp102_sec2_new
,
.
sec2
=
gp102_sec2_new
,
.
sw
=
gf100_sw_new
,
.
sw
=
gf100_sw_new
,
...
...
drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild
View file @
a5537f98
...
@@ -33,6 +33,7 @@ nvkm-y += nvkm/engine/gr/gm200.o
...
@@ -33,6 +33,7 @@ nvkm-y += nvkm/engine/gr/gm200.o
nvkm-y += nvkm/engine/gr/gm20b.o
nvkm-y += nvkm/engine/gr/gm20b.o
nvkm-y += nvkm/engine/gr/gp100.o
nvkm-y += nvkm/engine/gr/gp100.o
nvkm-y += nvkm/engine/gr/gp102.o
nvkm-y += nvkm/engine/gr/gp102.o
nvkm-y += nvkm/engine/gr/gp104.o
nvkm-y += nvkm/engine/gr/gp107.o
nvkm-y += nvkm/engine/gr/gp107.o
nvkm-y += nvkm/engine/gr/gp10b.o
nvkm-y += nvkm/engine/gr/gp10b.o
...
@@ -54,4 +55,5 @@ nvkm-y += nvkm/engine/gr/ctxgm200.o
...
@@ -54,4 +55,5 @@ nvkm-y += nvkm/engine/gr/ctxgm200.o
nvkm-y += nvkm/engine/gr/ctxgm20b.o
nvkm-y += nvkm/engine/gr/ctxgm20b.o
nvkm-y += nvkm/engine/gr/ctxgp100.o
nvkm-y += nvkm/engine/gr/ctxgp100.o
nvkm-y += nvkm/engine/gr/ctxgp102.o
nvkm-y += nvkm/engine/gr/ctxgp102.o
nvkm-y += nvkm/engine/gr/ctxgp104.o
nvkm-y += nvkm/engine/gr/ctxgp107.o
nvkm-y += nvkm/engine/gr/ctxgp107.o
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c
View file @
a5537f98
...
@@ -1436,6 +1436,8 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
...
@@ -1436,6 +1436,8 @@ gf100_grctx_generate_main(struct gf100_gr *gr, struct gf100_grctx *info)
grctx
->
r418e94
(
gr
);
grctx
->
r418e94
(
gr
);
if
(
grctx
->
r419a3c
)
if
(
grctx
->
r419a3c
)
grctx
->
r419a3c
(
gr
);
grctx
->
r419a3c
(
gr
);
if
(
grctx
->
r408840
)
grctx
->
r408840
(
gr
);
}
}
#define CB_RESERVED 0x80000
#define CB_RESERVED 0x80000
...
...
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h
View file @
a5537f98
...
@@ -70,6 +70,7 @@ struct gf100_grctx_func {
...
@@ -70,6 +70,7 @@ struct gf100_grctx_func {
void
(
*
r419e00
)(
struct
gf100_gr
*
);
void
(
*
r419e00
)(
struct
gf100_gr
*
);
void
(
*
r418e94
)(
struct
gf100_gr
*
);
void
(
*
r418e94
)(
struct
gf100_gr
*
);
void
(
*
r419a3c
)(
struct
gf100_gr
*
);
void
(
*
r419a3c
)(
struct
gf100_gr
*
);
void
(
*
r408840
)(
struct
gf100_gr
*
);
};
};
extern
const
struct
gf100_grctx_func
gf100_grctx
;
extern
const
struct
gf100_grctx_func
gf100_grctx
;
...
@@ -143,6 +144,8 @@ void gp100_grctx_generate_smid_config(struct gf100_gr *);
...
@@ -143,6 +144,8 @@ void gp100_grctx_generate_smid_config(struct gf100_gr *);
extern
const
struct
gf100_grctx_func
gp102_grctx
;
extern
const
struct
gf100_grctx_func
gp102_grctx
;
void
gp102_grctx_generate_attrib
(
struct
gf100_grctx
*
);
void
gp102_grctx_generate_attrib
(
struct
gf100_grctx
*
);
extern
const
struct
gf100_grctx_func
gp104_grctx
;
extern
const
struct
gf100_grctx_func
gp107_grctx
;
extern
const
struct
gf100_grctx_func
gp107_grctx
;
/* context init value lists */
/* context init value lists */
...
...
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c
View file @
a5537f98
...
@@ -29,6 +29,13 @@
...
@@ -29,6 +29,13 @@
* PGRAPH context implementation
* PGRAPH context implementation
******************************************************************************/
******************************************************************************/
static
void
gp102_grctx_generate_r408840
(
struct
gf100_gr
*
gr
)
{
struct
nvkm_device
*
device
=
gr
->
base
.
engine
.
subdev
.
device
;
nvkm_mask
(
device
,
0x408840
,
0x00000003
,
0x00000000
);
}
void
void
gp102_grctx_generate_attrib
(
struct
gf100_grctx
*
info
)
gp102_grctx_generate_attrib
(
struct
gf100_grctx
*
info
)
{
{
...
@@ -102,4 +109,5 @@ gp102_grctx = {
...
@@ -102,4 +109,5 @@ gp102_grctx = {
.
tpc_mask
=
gm200_grctx_generate_tpc_mask
,
.
tpc_mask
=
gm200_grctx_generate_tpc_mask
,
.
smid_config
=
gp100_grctx_generate_smid_config
,
.
smid_config
=
gp100_grctx_generate_smid_config
,
.
r419a3c
=
gm200_grctx_generate_r419a3c
,
.
r419a3c
=
gm200_grctx_generate_r419a3c
,
.
r408840
=
gp102_grctx_generate_r408840
,
};
};
drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp104.c
0 → 100644
View file @
a5537f98
/*
* Copyright 2018 Red Hat Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
#include "ctxgf100.h"
const
struct
gf100_grctx_func
gp104_grctx
=
{
.
main
=
gp100_grctx_generate_main
,
.
unkn
=
gk104_grctx_generate_unkn
,
.
bundle
=
gm107_grctx_generate_bundle
,
.
bundle_size
=
0x3000
,
.
bundle_min_gpm_fifo_depth
=
0x180
,
.
bundle_token_limit
=
0x900
,
.
pagepool
=
gp100_grctx_generate_pagepool
,
.
pagepool_size
=
0x20000
,
.
attrib
=
gp102_grctx_generate_attrib
,
.
attrib_nr_max
=
0x5d4
,
.
attrib_nr
=
0x320
,
.
alpha_nr_max
=
0xc00
,
.
alpha_nr
=
0x800
,
.
sm_id
=
gm107_grctx_generate_sm_id
,
.
rop_mapping
=
gf117_grctx_generate_rop_mapping
,
.
dist_skip_table
=
gm200_grctx_generate_dist_skip_table
,
.
r406500
=
gm200_grctx_generate_r406500
,
.
gpc_tpc_nr
=
gk104_grctx_generate_gpc_tpc_nr
,
.
tpc_mask
=
gm200_grctx_generate_tpc_mask
,
.
smid_config
=
gp100_grctx_generate_smid_config
,
.
r419a3c
=
gm200_grctx_generate_r419a3c
,
};
drivers/gpu/drm/nouveau/nvkm/engine/gr/gp104.c
0 → 100644
View file @
a5537f98
/*
* Copyright 2018 Red Hat Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
#include "gf100.h"
#include "ctxgf100.h"
#include <nvif/class.h>
static
const
struct
gf100_gr_func
gp104_gr
=
{
.
init
=
gf100_gr_init
,
.
init_gpc_mmu
=
gm200_gr_init_gpc_mmu
,
.
init_vsc_stream_master
=
gk104_gr_init_vsc_stream_master
,
.
init_zcull
=
gf117_gr_init_zcull
,
.
init_num_active_ltcs
=
gm200_gr_init_num_active_ltcs
,
.
init_rop_active_fbps
=
gp100_gr_init_rop_active_fbps
,
.
init_swdx_pes_mask
=
gp102_gr_init_swdx_pes_mask
,
.
init_fecs_exceptions
=
gp100_gr_init_fecs_exceptions
,
.
init_ds_hww_esr_2
=
gm200_gr_init_ds_hww_esr_2
,
.
init_sked_hww_esr
=
gk104_gr_init_sked_hww_esr
,
.
init_419cc0
=
gf100_gr_init_419cc0
,
.
init_ppc_exceptions
=
gk104_gr_init_ppc_exceptions
,
.
init_tex_hww_esr
=
gf100_gr_init_tex_hww_esr
,
.
init_504430
=
gm107_gr_init_504430
,
.
init_shader_exceptions
=
gp100_gr_init_shader_exceptions
,
.
rops
=
gm200_gr_rops
,
.
gpc_nr
=
6
,
.
tpc_nr
=
5
,
.
ppc_nr
=
3
,
.
grctx
=
&
gp104_grctx
,
.
sclass
=
{
{
-
1
,
-
1
,
FERMI_TWOD_A
},
{
-
1
,
-
1
,
KEPLER_INLINE_TO_MEMORY_B
},
{
-
1
,
-
1
,
PASCAL_B
,
&
gf100_fermi
},
{
-
1
,
-
1
,
PASCAL_COMPUTE_B
},
{}
}
};
int
gp104_gr_new
(
struct
nvkm_device
*
device
,
int
index
,
struct
nvkm_gr
**
pgr
)
{
return
gm200_gr_new_
(
&
gp104_gr
,
device
,
index
,
pgr
);
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment