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
7ff51f82
Commit
7ff51f82
authored
Jul 09, 2016
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/fb/gp100: initial support
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
0cbe26f0
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
226 additions
and
1 deletion
+226
-1
drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.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/fb/Kbuild
drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild
+2
-0
drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c
drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c
+2
-0
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c
+69
-0
drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
+3
-0
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h
+1
-0
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c
+146
-0
No files found.
drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h
View file @
7ff51f82
...
...
@@ -93,6 +93,7 @@ int gk104_fb_new(struct nvkm_device *, int, struct nvkm_fb **);
int
gk20a_fb_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_fb
**
);
int
gm107_fb_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_fb
**
);
int
gm200_fb_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_fb
**
);
int
gp100_fb_new
(
struct
nvkm_device
*
,
int
,
struct
nvkm_fb
**
);
#include <subdev/bios.h>
#include <subdev/bios/ramcfg.h>
...
...
drivers/gpu/drm/nouveau/nvkm/engine/device/base.c
View file @
7ff51f82
...
...
@@ -2153,6 +2153,7 @@ nv130_chipset = {
.
name
=
"GP100"
,
.
bios
=
nvkm_bios_new
,
.
devinit
=
gm200_devinit_new
,
.
fb
=
gp100_fb_new
,
.
imem
=
nv50_instmem_new
,
.
mc
=
gp100_mc_new
,
.
pci
=
gp100_pci_new
,
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild
View file @
7ff51f82
...
...
@@ -24,6 +24,7 @@ nvkm-y += nvkm/subdev/fb/gk104.o
nvkm-y += nvkm/subdev/fb/gk20a.o
nvkm-y += nvkm/subdev/fb/gm107.o
nvkm-y += nvkm/subdev/fb/gm200.o
nvkm-y += nvkm/subdev/fb/gp100.o
nvkm-y += nvkm/subdev/fb/ram.o
nvkm-y += nvkm/subdev/fb/ramnv04.o
...
...
@@ -41,6 +42,7 @@ nvkm-y += nvkm/subdev/fb/rammcp77.o
nvkm-y += nvkm/subdev/fb/ramgf100.o
nvkm-y += nvkm/subdev/fb/ramgk104.o
nvkm-y += nvkm/subdev/fb/ramgm107.o
nvkm-y += nvkm/subdev/fb/ramgp100.o
nvkm-y += nvkm/subdev/fb/sddr2.o
nvkm-y += nvkm/subdev/fb/sddr3.o
nvkm-y += nvkm/subdev/fb/gddr3.o
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c
View file @
7ff51f82
...
...
@@ -137,6 +137,8 @@ nvkm_fb_init(struct nvkm_subdev *subdev)
fb
->
func
->
init
(
fb
);
if
(
fb
->
func
->
init_page
)
fb
->
func
->
init_page
(
fb
);
if
(
fb
->
func
->
init_unkn
)
fb
->
func
->
init_unkn
(
fb
);
return
0
;
}
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c
View file @
7ff51f82
...
...
@@ -26,7 +26,7 @@
#include <core/memory.h>
static
void
void
gm200_fb_init_page
(
struct
nvkm_fb
*
fb
)
{
struct
nvkm_device
*
device
=
fb
->
subdev
.
device
;
...
...
drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c
0 → 100644
View file @
7ff51f82
/*
* Copyright 2016 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.
*
* Authors: Ben Skeggs <bskeggs@redhat.com>
*/
#include "gf100.h"
#include "ram.h"
#include <core/memory.h>
static
void
gp100_fb_init_unkn
(
struct
nvkm_fb
*
base
)
{
struct
nvkm_device
*
device
=
gf100_fb
(
base
)
->
base
.
subdev
.
device
;
nvkm_wr32
(
device
,
0x1fac80
,
nvkm_rd32
(
device
,
0x100c80
));
nvkm_wr32
(
device
,
0x1facc4
,
nvkm_rd32
(
device
,
0x100cc4
));
nvkm_wr32
(
device
,
0x1facc8
,
nvkm_rd32
(
device
,
0x100cc8
));
nvkm_wr32
(
device
,
0x1faccc
,
nvkm_rd32
(
device
,
0x100ccc
));
}
static
void
gp100_fb_init
(
struct
nvkm_fb
*
base
)
{
struct
gf100_fb
*
fb
=
gf100_fb
(
base
);
struct
nvkm_device
*
device
=
fb
->
base
.
subdev
.
device
;
if
(
fb
->
r100c10_page
)
nvkm_wr32
(
device
,
0x100c10
,
fb
->
r100c10
>>
8
);
nvkm_wr32
(
device
,
0x100cc8
,
nvkm_memory_addr
(
fb
->
base
.
mmu_wr
)
>>
8
);
nvkm_wr32
(
device
,
0x100ccc
,
nvkm_memory_addr
(
fb
->
base
.
mmu_rd
)
>>
8
);
nvkm_mask
(
device
,
0x100cc4
,
0x00060000
,
max
(
nvkm_memory_size
(
fb
->
base
.
mmu_rd
)
>>
16
,
(
u64
)
2
)
<<
17
);
}
static
const
struct
nvkm_fb_func
gp100_fb
=
{
.
dtor
=
gf100_fb_dtor
,
.
oneinit
=
gf100_fb_oneinit
,
.
init
=
gp100_fb_init
,
.
init_page
=
gm200_fb_init_page
,
.
init_unkn
=
gp100_fb_init_unkn
,
.
ram_new
=
gp100_ram_new
,
.
memtype_valid
=
gf100_fb_memtype_valid
,
};
int
gp100_fb_new
(
struct
nvkm_device
*
device
,
int
index
,
struct
nvkm_fb
**
pfb
)
{
return
gf100_fb_new_
(
&
gp100_fb
,
device
,
index
,
pfb
);
}
drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h
View file @
7ff51f82
...
...
@@ -9,6 +9,7 @@ struct nvkm_fb_func {
int
(
*
oneinit
)(
struct
nvkm_fb
*
);
void
(
*
init
)(
struct
nvkm_fb
*
);
void
(
*
init_page
)(
struct
nvkm_fb
*
);
void
(
*
init_unkn
)(
struct
nvkm_fb
*
);
void
(
*
intr
)(
struct
nvkm_fb
*
);
struct
{
...
...
@@ -63,4 +64,6 @@ void nv46_fb_tile_init(struct nvkm_fb *, int i, u32 addr, u32 size,
int
gf100_fb_oneinit
(
struct
nvkm_fb
*
);
void
gf100_fb_init_page
(
struct
nvkm_fb
*
);
bool
gf100_fb_memtype_valid
(
struct
nvkm_fb
*
,
u32
);
void
gm200_fb_init_page
(
struct
nvkm_fb
*
);
#endif
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h
View file @
7ff51f82
...
...
@@ -47,4 +47,5 @@ int mcp77_ram_new(struct nvkm_fb *, struct nvkm_ram **);
int
gf100_ram_new
(
struct
nvkm_fb
*
,
struct
nvkm_ram
**
);
int
gk104_ram_new
(
struct
nvkm_fb
*
,
struct
nvkm_ram
**
);
int
gm107_ram_new
(
struct
nvkm_fb
*
,
struct
nvkm_ram
**
);
int
gp100_ram_new
(
struct
nvkm_fb
*
,
struct
nvkm_ram
**
);
#endif
drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c
0 → 100644
View file @
7ff51f82
/*
* Copyright 2013 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.
*
* Authors: Ben Skeggs
*/
#include "ram.h"
#include <subdev/bios.h>
#include <subdev/bios/init.h>
#include <subdev/bios/rammap.h>
static
int
gp100_ram_init
(
struct
nvkm_ram
*
ram
)
{
struct
nvkm_subdev
*
subdev
=
&
ram
->
fb
->
subdev
;
struct
nvkm_device
*
device
=
subdev
->
device
;
struct
nvkm_bios
*
bios
=
device
->
bios
;
u8
ver
,
hdr
,
cnt
,
len
,
snr
,
ssz
;
u32
data
;
int
i
;
/* run a bunch of tables from rammap table. there's actually
* individual pointers for each rammap entry too, but, nvidia
* seem to just run the last two entries' scripts early on in
* their init, and never again.. we'll just run 'em all once
* for now.
*
* i strongly suspect that each script is for a separate mode
* (likely selected by 0x9a065c's lower bits?), and the
* binary driver skips the one that's already been setup by
* the init tables.
*/
data
=
nvbios_rammapTe
(
bios
,
&
ver
,
&
hdr
,
&
cnt
,
&
len
,
&
snr
,
&
ssz
);
if
(
!
data
||
hdr
<
0x15
)
return
-
EINVAL
;
cnt
=
nvbios_rd08
(
bios
,
data
+
0x14
);
/* guess at count */
data
=
nvbios_rd32
(
bios
,
data
+
0x10
);
/* guess u32... */
if
(
cnt
)
{
u32
save
=
nvkm_rd32
(
device
,
0x9a065c
)
&
0x000000f0
;
for
(
i
=
0
;
i
<
cnt
;
i
++
,
data
+=
4
)
{
if
(
i
!=
save
>>
4
)
{
nvkm_mask
(
device
,
0x9a065c
,
0x000000f0
,
i
<<
4
);
nvbios_exec
(
&
(
struct
nvbios_init
)
{
.
subdev
=
subdev
,
.
bios
=
bios
,
.
offset
=
nvbios_rd32
(
bios
,
data
),
.
execute
=
1
,
});
}
}
nvkm_mask
(
device
,
0x9a065c
,
0x000000f0
,
save
);
}
nvkm_mask
(
device
,
0x9a0584
,
0x11000000
,
0x00000000
);
nvkm_wr32
(
device
,
0x10ecc0
,
0xffffffff
);
nvkm_mask
(
device
,
0x9a0160
,
0x00000010
,
0x00000010
);
return
0
;
}
static
const
struct
nvkm_ram_func
gp100_ram_func
=
{
.
init
=
gp100_ram_init
,
.
get
=
gf100_ram_get
,
.
put
=
gf100_ram_put
,
};
int
gp100_ram_new
(
struct
nvkm_fb
*
fb
,
struct
nvkm_ram
**
pram
)
{
struct
nvkm_ram
*
ram
;
struct
nvkm_subdev
*
subdev
=
&
fb
->
subdev
;
struct
nvkm_device
*
device
=
subdev
->
device
;
enum
nvkm_ram_type
type
=
nvkm_fb_bios_memtype
(
device
->
bios
);
const
u32
rsvd_head
=
(
256
*
1024
);
/* vga memory */
const
u32
rsvd_tail
=
(
1024
*
1024
);
/* vbios etc */
u32
fbpa_num
=
nvkm_rd32
(
device
,
0x022438
),
fbpa
;
u32
fbio_opt
=
nvkm_rd32
(
device
,
0x021c14
);
u64
part
,
size
=
0
,
comm
=
~
0ULL
;
bool
mixed
=
false
;
int
ret
;
nvkm_debug
(
subdev
,
"022438: %08x
\n
"
,
fbpa_num
);
nvkm_debug
(
subdev
,
"021c14: %08x
\n
"
,
fbio_opt
);
for
(
fbpa
=
0
;
fbpa
<
fbpa_num
;
fbpa
++
)
{
if
(
!
(
fbio_opt
&
(
1
<<
fbpa
)))
{
part
=
nvkm_rd32
(
device
,
0x90020c
+
(
fbpa
*
0x4000
));
nvkm_debug
(
subdev
,
"fbpa %02x: %lld MiB
\n
"
,
fbpa
,
part
);
part
=
part
<<
20
;
if
(
part
!=
comm
)
{
if
(
comm
!=
~
0ULL
)
mixed
=
true
;
comm
=
min
(
comm
,
part
);
}
size
=
size
+
part
;
}
}
ret
=
nvkm_ram_new_
(
&
gp100_ram_func
,
fb
,
type
,
size
,
0
,
&
ram
);
*
pram
=
ram
;
if
(
ret
)
return
ret
;
nvkm_mm_fini
(
&
ram
->
vram
);
if
(
mixed
)
{
ret
=
nvkm_mm_init
(
&
ram
->
vram
,
rsvd_head
>>
NVKM_RAM_MM_SHIFT
,
((
comm
*
fbpa_num
)
-
rsvd_head
)
>>
NVKM_RAM_MM_SHIFT
,
1
);
if
(
ret
)
return
ret
;
ret
=
nvkm_mm_init
(
&
ram
->
vram
,
(
0x1000000000ULL
+
comm
)
>>
NVKM_RAM_MM_SHIFT
,
(
size
-
(
comm
*
fbpa_num
)
-
rsvd_tail
)
>>
NVKM_RAM_MM_SHIFT
,
1
);
if
(
ret
)
return
ret
;
}
else
{
ret
=
nvkm_mm_init
(
&
ram
->
vram
,
rsvd_head
>>
NVKM_RAM_MM_SHIFT
,
(
size
-
rsvd_head
-
rsvd_tail
)
>>
NVKM_RAM_MM_SHIFT
,
1
);
if
(
ret
)
return
ret
;
}
return
0
;
}
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