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
Kirill Smelkov
linux
Commits
8769dc98
Commit
8769dc98
authored
May 08, 2018
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/devinit/gv100: initial support
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
6827c9a8
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
85 additions
and
1 deletion
+85
-1
drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h
drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h
+1
-0
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
+1
-0
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/Kbuild
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/Kbuild
+1
-0
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gv100.c
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gv100.c
+79
-0
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h
+2
-0
No files found.
drivers/gpu/drm/nouveau/include/nvkm/subdev/devinit.h
View file @
8769dc98
...
@@ -30,4 +30,5 @@ int mcp89_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);
...
@@ -30,4 +30,5 @@ int mcp89_devinit_new(struct nvkm_device *, int, struct nvkm_devinit **);
int
gf100_devinit_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_devinit
**
);
int
gf100_devinit_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_devinit
**
);
int
gm107_devinit_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_devinit
**
);
int
gm107_devinit_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_devinit
**
);
int
gm200_devinit_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_devinit
**
);
int
gm200_devinit_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_devinit
**
);
int
gv100_devinit_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_devinit
**
);
#endif
#endif
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
View file @
8769dc98
...
@@ -2398,6 +2398,7 @@ static const struct nvkm_device_chip
...
@@ -2398,6 +2398,7 @@ static const struct nvkm_device_chip
nv140_chipset
=
{
nv140_chipset
=
{
.
name
=
"GV100"
,
.
name
=
"GV100"
,
.
bios
=
nvkm_bios_new
,
.
bios
=
nvkm_bios_new
,
.
devinit
=
gv100_devinit_new
,
.
pci
=
gp100_pci_new
,
.
pci
=
gp100_pci_new
,
};
};
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/Kbuild
View file @
8769dc98
...
@@ -12,3 +12,4 @@ nvkm-y += nvkm/subdev/devinit/mcp89.o
...
@@ -12,3 +12,4 @@ nvkm-y += nvkm/subdev/devinit/mcp89.o
nvkm-y += nvkm/subdev/devinit/gf100.o
nvkm-y += nvkm/subdev/devinit/gf100.o
nvkm-y += nvkm/subdev/devinit/gm107.o
nvkm-y += nvkm/subdev/devinit/gm107.o
nvkm-y += nvkm/subdev/devinit/gm200.o
nvkm-y += nvkm/subdev/devinit/gm200.o
nvkm-y += nvkm/subdev/devinit/gv100.o
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c
View file @
8769dc98
...
@@ -107,7 +107,7 @@ pmu_load(struct nv50_devinit *init, u8 type, bool post,
...
@@ -107,7 +107,7 @@ pmu_load(struct nv50_devinit *init, u8 type, bool post,
return
pmu_exec
(
init
,
pmu
.
init_addr_pmu
),
0
;
return
pmu_exec
(
init
,
pmu
.
init_addr_pmu
),
0
;
}
}
static
int
int
gm200_devinit_post
(
struct
nvkm_devinit
*
base
,
bool
post
)
gm200_devinit_post
(
struct
nvkm_devinit
*
base
,
bool
post
)
{
{
struct
nv50_devinit
*
init
=
nv50_devinit
(
base
);
struct
nv50_devinit
*
init
=
nv50_devinit
(
base
);
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gv100.c
0 → 100644
View file @
8769dc98
/*
* 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 "nv50.h"
#include <subdev/bios.h>
#include <subdev/bios/pll.h>
#include <subdev/clk/pll.h>
static
int
gv100_devinit_pll_set
(
struct
nvkm_devinit
*
init
,
u32
type
,
u32
freq
)
{
struct
nvkm_subdev
*
subdev
=
&
init
->
subdev
;
struct
nvkm_device
*
device
=
subdev
->
device
;
struct
nvbios_pll
info
;
int
head
=
type
-
PLL_VPLL0
;
int
N
,
fN
,
M
,
P
;
int
ret
;
ret
=
nvbios_pll_parse
(
device
->
bios
,
type
,
&
info
);
if
(
ret
)
return
ret
;
ret
=
gt215_pll_calc
(
subdev
,
&
info
,
freq
,
&
N
,
&
fN
,
&
M
,
&
P
);
if
(
ret
<
0
)
return
ret
;
switch
(
info
.
type
)
{
case
PLL_VPLL0
:
case
PLL_VPLL1
:
case
PLL_VPLL2
:
case
PLL_VPLL3
:
nvkm_wr32
(
device
,
0x00ef10
+
(
head
*
0x40
),
fN
<<
16
);
nvkm_wr32
(
device
,
0x00ef04
+
(
head
*
0x40
),
(
P
<<
16
)
|
(
N
<<
8
)
|
(
M
<<
0
));
break
;
default:
nvkm_warn
(
subdev
,
"%08x/%dKhz unimplemented
\n
"
,
type
,
freq
);
ret
=
-
EINVAL
;
break
;
}
return
ret
;
}
static
const
struct
nvkm_devinit_func
gv100_devinit
=
{
.
preinit
=
gf100_devinit_preinit
,
.
init
=
nv50_devinit_init
,
.
post
=
gm200_devinit_post
,
.
pll_set
=
gv100_devinit_pll_set
,
.
disable
=
gm107_devinit_disable
,
};
int
gv100_devinit_new
(
struct
nvkm_device
*
device
,
int
index
,
struct
nvkm_devinit
**
pinit
)
{
return
nv50_devinit_new_
(
&
gv100_devinit
,
device
,
index
,
pinit
);
}
drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h
View file @
8769dc98
...
@@ -24,4 +24,6 @@ int gf100_devinit_pll_set(struct nvkm_devinit *, u32, u32);
...
@@ -24,4 +24,6 @@ int gf100_devinit_pll_set(struct nvkm_devinit *, u32, u32);
void
gf100_devinit_preinit
(
struct
nvkm_devinit
*
);
void
gf100_devinit_preinit
(
struct
nvkm_devinit
*
);
u64
gm107_devinit_disable
(
struct
nvkm_devinit
*
);
u64
gm107_devinit_disable
(
struct
nvkm_devinit
*
);
int
gm200_devinit_post
(
struct
nvkm_devinit
*
,
bool
);
#endif
#endif
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