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
dff30dbd
Commit
dff30dbd
authored
May 08, 2018
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/gr/gf100-: virtualise init_swdx_pes_mask
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
0f78acc8
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
5 deletions
+7
-5
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+2
-0
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
+3
-3
drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c
drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c
+1
-1
No files found.
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
View file @
dff30dbd
...
@@ -2001,6 +2001,8 @@ gf100_gr_init(struct gf100_gr *gr)
...
@@ -2001,6 +2001,8 @@ gf100_gr_init(struct gf100_gr *gr)
gr
->
func
->
init_rop_active_fbps
(
gr
);
gr
->
func
->
init_rop_active_fbps
(
gr
);
if
(
gr
->
func
->
init_bios_2
)
if
(
gr
->
func
->
init_bios_2
)
gr
->
func
->
init_bios_2
(
gr
);
gr
->
func
->
init_bios_2
(
gr
);
if
(
gr
->
func
->
init_swdx_pes_mask
)
gr
->
func
->
init_swdx_pes_mask
(
gr
);
nvkm_wr32
(
device
,
0x400500
,
0x00010001
);
nvkm_wr32
(
device
,
0x400500
,
0x00010001
);
...
...
drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h
View file @
dff30dbd
...
@@ -129,8 +129,8 @@ struct gf100_gr_func {
...
@@ -129,8 +129,8 @@ struct gf100_gr_func {
void
(
*
init_num_active_ltcs
)(
struct
gf100_gr
*
);
void
(
*
init_num_active_ltcs
)(
struct
gf100_gr
*
);
void
(
*
init_rop_active_fbps
)(
struct
gf100_gr
*
);
void
(
*
init_rop_active_fbps
)(
struct
gf100_gr
*
);
void
(
*
init_bios_2
)(
struct
gf100_gr
*
);
void
(
*
init_bios_2
)(
struct
gf100_gr
*
);
void
(
*
init_ppc_exceptions
)(
struct
gf100_gr
*
);
void
(
*
init_swdx_pes_mask
)(
struct
gf100_gr
*
);
void
(
*
init_swdx_pes_mask
)(
struct
gf100_gr
*
);
void
(
*
init_ppc_exceptions
)(
struct
gf100_gr
*
);
void
(
*
set_hww_esr_report_mask
)(
struct
gf100_gr
*
);
void
(
*
set_hww_esr_report_mask
)(
struct
gf100_gr
*
);
const
struct
gf100_gr_pack
*
mmio
;
const
struct
gf100_gr_pack
*
mmio
;
struct
{
struct
{
...
@@ -167,6 +167,8 @@ void gm200_gr_init_num_active_ltcs(struct gf100_gr *);
...
@@ -167,6 +167,8 @@ void gm200_gr_init_num_active_ltcs(struct gf100_gr *);
int
gp100_gr_init
(
struct
gf100_gr
*
);
int
gp100_gr_init
(
struct
gf100_gr
*
);
void
gp100_gr_init_rop_active_fbps
(
struct
gf100_gr
*
);
void
gp100_gr_init_rop_active_fbps
(
struct
gf100_gr
*
);
void
gp102_gr_init_swdx_pes_mask
(
struct
gf100_gr
*
);
#define gf100_gr_chan(p) container_of((p), struct gf100_gr_chan, object)
#define gf100_gr_chan(p) container_of((p), struct gf100_gr_chan, object)
#include <core/object.h>
#include <core/object.h>
...
@@ -317,6 +319,4 @@ extern const struct gf100_gr_init gm107_gr_init_cbm_0[];
...
@@ -317,6 +319,4 @@ extern const struct gf100_gr_init gm107_gr_init_cbm_0[];
void
gm107_gr_init_bios
(
struct
gf100_gr
*
);
void
gm107_gr_init_bios
(
struct
gf100_gr
*
);
void
gm200_gr_init_gpc_mmu
(
struct
gf100_gr
*
);
void
gm200_gr_init_gpc_mmu
(
struct
gf100_gr
*
);
void
gp102_gr_init_swdx_pes_mask
(
struct
gf100_gr
*
);
#endif
#endif
drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c
View file @
dff30dbd
...
@@ -48,8 +48,8 @@ gp102_gr = {
...
@@ -48,8 +48,8 @@ gp102_gr = {
.
init_zcull
=
gf117_gr_init_zcull
,
.
init_zcull
=
gf117_gr_init_zcull
,
.
init_num_active_ltcs
=
gm200_gr_init_num_active_ltcs
,
.
init_num_active_ltcs
=
gm200_gr_init_num_active_ltcs
,
.
init_rop_active_fbps
=
gp100_gr_init_rop_active_fbps
,
.
init_rop_active_fbps
=
gp100_gr_init_rop_active_fbps
,
.
init_ppc_exceptions
=
gk104_gr_init_ppc_exceptions
,
.
init_swdx_pes_mask
=
gp102_gr_init_swdx_pes_mask
,
.
init_swdx_pes_mask
=
gp102_gr_init_swdx_pes_mask
,
.
init_ppc_exceptions
=
gk104_gr_init_ppc_exceptions
,
.
rops
=
gm200_gr_rops
,
.
rops
=
gm200_gr_rops
,
.
ppc_nr
=
3
,
.
ppc_nr
=
3
,
.
grctx
=
&
gp102_grctx
,
.
grctx
=
&
gp102_grctx
,
...
...
drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c
View file @
dff30dbd
...
@@ -34,8 +34,8 @@ gp107_gr = {
...
@@ -34,8 +34,8 @@ gp107_gr = {
.
init_zcull
=
gf117_gr_init_zcull
,
.
init_zcull
=
gf117_gr_init_zcull
,
.
init_num_active_ltcs
=
gm200_gr_init_num_active_ltcs
,
.
init_num_active_ltcs
=
gm200_gr_init_num_active_ltcs
,
.
init_rop_active_fbps
=
gp100_gr_init_rop_active_fbps
,
.
init_rop_active_fbps
=
gp100_gr_init_rop_active_fbps
,
.
init_ppc_exceptions
=
gk104_gr_init_ppc_exceptions
,
.
init_swdx_pes_mask
=
gp102_gr_init_swdx_pes_mask
,
.
init_swdx_pes_mask
=
gp102_gr_init_swdx_pes_mask
,
.
init_ppc_exceptions
=
gk104_gr_init_ppc_exceptions
,
.
rops
=
gm200_gr_rops
,
.
rops
=
gm200_gr_rops
,
.
ppc_nr
=
1
,
.
ppc_nr
=
1
,
.
grctx
=
&
gp107_grctx
,
.
grctx
=
&
gp107_grctx
,
...
...
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