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
f6bad8ab
Commit
f6bad8ab
authored
Feb 24, 2014
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/gm107/ltcg: initial implementation
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
6bd9293e
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
231 additions
and
75 deletions
+231
-75
drivers/gpu/drm/nouveau/Makefile
drivers/gpu/drm/nouveau/Makefile
+2
-1
drivers/gpu/drm/nouveau/core/engine/device/nvc0.c
drivers/gpu/drm/nouveau/core/engine/device/nvc0.c
+9
-9
drivers/gpu/drm/nouveau/core/engine/device/nve0.c
drivers/gpu/drm/nouveau/core/engine/device/nve0.c
+5
-5
drivers/gpu/drm/nouveau/core/include/subdev/ltcg.h
drivers/gpu/drm/nouveau/core/include/subdev/ltcg.h
+2
-1
drivers/gpu/drm/nouveau/core/subdev/ltcg/gf100.c
drivers/gpu/drm/nouveau/core/subdev/ltcg/gf100.c
+50
-59
drivers/gpu/drm/nouveau/core/subdev/ltcg/gf100.h
drivers/gpu/drm/nouveau/core/subdev/ltcg/gf100.h
+21
-0
drivers/gpu/drm/nouveau/core/subdev/ltcg/gm107.c
drivers/gpu/drm/nouveau/core/subdev/ltcg/gm107.c
+142
-0
No files found.
drivers/gpu/drm/nouveau/Makefile
View file @
f6bad8ab
...
...
@@ -139,7 +139,8 @@ nouveau-y += core/subdev/instmem/base.o
nouveau-y
+=
core/subdev/instmem/nv04.o
nouveau-y
+=
core/subdev/instmem/nv40.o
nouveau-y
+=
core/subdev/instmem/nv50.o
nouveau-y
+=
core/subdev/ltcg/nvc0.o
nouveau-y
+=
core/subdev/ltcg/gf100.o
nouveau-y
+=
core/subdev/ltcg/gm107.o
nouveau-y
+=
core/subdev/mc/base.o
nouveau-y
+=
core/subdev/mc/nv04.o
nouveau-y
+=
core/subdev/mc/nv40.o
...
...
drivers/gpu/drm/nouveau/core/engine/device/nvc0.c
View file @
f6bad8ab
...
...
@@ -70,7 +70,7 @@ nvc0_identify(struct nouveau_device *device)
device
->
oclass
[
NVDEV_SUBDEV_BUS
]
=
nvc0_bus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_TIMER
]
=
&
nv04_timer_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_FB
]
=
nvc0_fb_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
&
nvc
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
gf10
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_IBUS
]
=
&
nvc0_ibus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_INSTMEM
]
=
nv50_instmem_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_VM
]
=
&
nvc0_vmmgr_oclass
;
...
...
@@ -102,7 +102,7 @@ nvc0_identify(struct nouveau_device *device)
device
->
oclass
[
NVDEV_SUBDEV_BUS
]
=
nvc0_bus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_TIMER
]
=
&
nv04_timer_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_FB
]
=
nvc0_fb_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
&
nvc
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
gf10
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_IBUS
]
=
&
nvc0_ibus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_INSTMEM
]
=
nv50_instmem_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_VM
]
=
&
nvc0_vmmgr_oclass
;
...
...
@@ -134,7 +134,7 @@ nvc0_identify(struct nouveau_device *device)
device
->
oclass
[
NVDEV_SUBDEV_BUS
]
=
nvc0_bus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_TIMER
]
=
&
nv04_timer_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_FB
]
=
nvc0_fb_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
&
nvc
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
gf10
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_IBUS
]
=
&
nvc0_ibus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_INSTMEM
]
=
nv50_instmem_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_VM
]
=
&
nvc0_vmmgr_oclass
;
...
...
@@ -165,7 +165,7 @@ nvc0_identify(struct nouveau_device *device)
device
->
oclass
[
NVDEV_SUBDEV_BUS
]
=
nvc0_bus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_TIMER
]
=
&
nv04_timer_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_FB
]
=
nvc0_fb_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
&
nvc
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
gf10
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_IBUS
]
=
&
nvc0_ibus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_INSTMEM
]
=
nv50_instmem_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_VM
]
=
&
nvc0_vmmgr_oclass
;
...
...
@@ -197,7 +197,7 @@ nvc0_identify(struct nouveau_device *device)
device
->
oclass
[
NVDEV_SUBDEV_BUS
]
=
nvc0_bus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_TIMER
]
=
&
nv04_timer_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_FB
]
=
nvc0_fb_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
&
nvc
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
gf10
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_IBUS
]
=
&
nvc0_ibus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_INSTMEM
]
=
nv50_instmem_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_VM
]
=
&
nvc0_vmmgr_oclass
;
...
...
@@ -229,7 +229,7 @@ nvc0_identify(struct nouveau_device *device)
device
->
oclass
[
NVDEV_SUBDEV_BUS
]
=
nvc0_bus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_TIMER
]
=
&
nv04_timer_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_FB
]
=
nvc0_fb_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
&
nvc
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
gf10
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_IBUS
]
=
&
nvc0_ibus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_INSTMEM
]
=
nv50_instmem_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_VM
]
=
&
nvc0_vmmgr_oclass
;
...
...
@@ -260,7 +260,7 @@ nvc0_identify(struct nouveau_device *device)
device
->
oclass
[
NVDEV_SUBDEV_BUS
]
=
nvc0_bus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_TIMER
]
=
&
nv04_timer_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_FB
]
=
nvc0_fb_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
&
nvc
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
gf10
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_IBUS
]
=
&
nvc0_ibus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_INSTMEM
]
=
nv50_instmem_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_VM
]
=
&
nvc0_vmmgr_oclass
;
...
...
@@ -292,7 +292,7 @@ nvc0_identify(struct nouveau_device *device)
device
->
oclass
[
NVDEV_SUBDEV_BUS
]
=
nvc0_bus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_TIMER
]
=
&
nv04_timer_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_FB
]
=
nvc0_fb_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
&
nvc
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
gf10
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_IBUS
]
=
&
nvc0_ibus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_INSTMEM
]
=
nv50_instmem_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_VM
]
=
&
nvc0_vmmgr_oclass
;
...
...
@@ -323,7 +323,7 @@ nvc0_identify(struct nouveau_device *device)
device
->
oclass
[
NVDEV_SUBDEV_BUS
]
=
nvc0_bus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_TIMER
]
=
&
nv04_timer_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_FB
]
=
nvc0_fb_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
&
nvc
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
gf10
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_IBUS
]
=
&
nvc0_ibus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_INSTMEM
]
=
nv50_instmem_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_VM
]
=
&
nvc0_vmmgr_oclass
;
...
...
drivers/gpu/drm/nouveau/core/engine/device/nve0.c
View file @
f6bad8ab
...
...
@@ -70,7 +70,7 @@ nve0_identify(struct nouveau_device *device)
device
->
oclass
[
NVDEV_SUBDEV_BUS
]
=
nvc0_bus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_TIMER
]
=
&
nv04_timer_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_FB
]
=
nve0_fb_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
&
nvc
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
gf10
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_IBUS
]
=
&
nve0_ibus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_INSTMEM
]
=
nv50_instmem_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_VM
]
=
&
nvc0_vmmgr_oclass
;
...
...
@@ -103,7 +103,7 @@ nve0_identify(struct nouveau_device *device)
device
->
oclass
[
NVDEV_SUBDEV_BUS
]
=
nvc0_bus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_TIMER
]
=
&
nv04_timer_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_FB
]
=
nve0_fb_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
&
nvc
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
gf10
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_IBUS
]
=
&
nve0_ibus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_INSTMEM
]
=
nv50_instmem_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_VM
]
=
&
nvc0_vmmgr_oclass
;
...
...
@@ -136,7 +136,7 @@ nve0_identify(struct nouveau_device *device)
device
->
oclass
[
NVDEV_SUBDEV_BUS
]
=
nvc0_bus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_TIMER
]
=
&
nv04_timer_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_FB
]
=
nve0_fb_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
&
nvc
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
gf10
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_IBUS
]
=
&
nve0_ibus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_INSTMEM
]
=
nv50_instmem_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_VM
]
=
&
nvc0_vmmgr_oclass
;
...
...
@@ -169,7 +169,7 @@ nve0_identify(struct nouveau_device *device)
device
->
oclass
[
NVDEV_SUBDEV_BUS
]
=
nvc0_bus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_TIMER
]
=
&
nv04_timer_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_FB
]
=
nve0_fb_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
&
nvc
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
gf10
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_IBUS
]
=
&
nve0_ibus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_INSTMEM
]
=
nv50_instmem_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_VM
]
=
&
nvc0_vmmgr_oclass
;
...
...
@@ -204,7 +204,7 @@ nve0_identify(struct nouveau_device *device)
device
->
oclass
[
NVDEV_SUBDEV_BUS
]
=
nvc0_bus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_TIMER
]
=
&
nv04_timer_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_FB
]
=
nve0_fb_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
&
nvc
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_LTCG
]
=
gf10
0_ltcg_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_IBUS
]
=
&
nve0_ibus_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_INSTMEM
]
=
nv50_instmem_oclass
;
device
->
oclass
[
NVDEV_SUBDEV_VM
]
=
&
nvc0_vmmgr_oclass
;
...
...
drivers/gpu/drm/nouveau/core/include/subdev/ltcg.h
View file @
f6bad8ab
...
...
@@ -35,6 +35,7 @@ nouveau_ltcg(void *obj)
#define _nouveau_ltcg_init _nouveau_subdev_init
#define _nouveau_ltcg_fini _nouveau_subdev_fini
extern
struct
nouveau_oclass
nvc0_ltcg_oclass
;
extern
struct
nouveau_oclass
*
gf100_ltcg_oclass
;
extern
struct
nouveau_oclass
*
gm107_ltcg_oclass
;
#endif
drivers/gpu/drm/nouveau/core/subdev/ltcg/
nvc
0.c
→
drivers/gpu/drm/nouveau/core/subdev/ltcg/
gf10
0.c
View file @
f6bad8ab
...
...
@@ -22,44 +22,35 @@
* Authors: Ben Skeggs
*/
#include <subdev/ltcg.h>
#include <subdev/fb.h>
#include <subdev/timer.h>
struct
nvc0_ltcg_priv
{
struct
nouveau_ltcg
base
;
u32
part_nr
;
u32
subp_nr
;
u32
num_tags
;
u32
tag_base
;
struct
nouveau_mm
tags
;
struct
nouveau_mm_node
*
tag_ram
;
};
#include "gf100.h"
static
void
nvc0_ltcg_subp_isr
(
struct
nvc0_ltcg_priv
*
priv
,
int
unit
,
int
subp
)
gf100_ltcg_lts_isr
(
struct
gf100_ltcg_priv
*
priv
,
int
ltc
,
int
lts
)
{
u32
subp_base
=
0x141000
+
(
unit
*
0x2000
)
+
(
subp
*
0x400
);
u32
stat
=
nv_rd32
(
priv
,
subp_
base
+
0x020
);
u32
base
=
0x141000
+
(
ltc
*
0x2000
)
+
(
lts
*
0x400
);
u32
stat
=
nv_rd32
(
priv
,
base
+
0x020
);
if
(
stat
)
{
nv_info
(
priv
,
"LTC%d_LTS%d: 0x%08x
\n
"
,
unit
,
subp
,
stat
);
nv_wr32
(
priv
,
subp_
base
+
0x020
,
stat
);
nv_info
(
priv
,
"LTC%d_LTS%d: 0x%08x
\n
"
,
ltc
,
lts
,
stat
);
nv_wr32
(
priv
,
base
+
0x020
,
stat
);
}
}
static
void
nvc
0_ltcg_intr
(
struct
nouveau_subdev
*
subdev
)
gf10
0_ltcg_intr
(
struct
nouveau_subdev
*
subdev
)
{
struct
nvc
0_ltcg_priv
*
priv
=
(
void
*
)
subdev
;
u32
units
;
units
=
nv_rd32
(
priv
,
0x00017c
);
while
(
units
)
{
u32
subp
,
unit
=
ffs
(
units
)
-
1
;
for
(
subp
=
0
;
subp
<
priv
->
subp_nr
;
subp
++
)
nvc0_ltcg_subp_isr
(
priv
,
unit
,
subp
);
units
&=
~
(
1
<<
unit
);
struct
gf10
0_ltcg_priv
*
priv
=
(
void
*
)
subdev
;
u32
mask
;
mask
=
nv_rd32
(
priv
,
0x00017c
);
while
(
mask
)
{
u32
lts
,
ltc
=
__ffs
(
mask
)
;
for
(
lts
=
0
;
lts
<
priv
->
lts_nr
;
lts
++
)
gf100_ltcg_lts_isr
(
priv
,
ltc
,
lts
);
mask
&=
~
(
1
<<
ltc
);
}
/* we do something horribly wrong and upset PMFB a lot, so mask off
...
...
@@ -68,11 +59,11 @@ nvc0_ltcg_intr(struct nouveau_subdev *subdev)
nv_mask
(
priv
,
0x000640
,
0x02000000
,
0x00000000
);
}
static
int
nvc
0_ltcg_tags_alloc
(
struct
nouveau_ltcg
*
ltcg
,
u32
n
,
int
gf10
0_ltcg_tags_alloc
(
struct
nouveau_ltcg
*
ltcg
,
u32
n
,
struct
nouveau_mm_node
**
pnode
)
{
struct
nvc0_ltcg_priv
*
priv
=
(
struct
nvc
0_ltcg_priv
*
)
ltcg
;
struct
gf100_ltcg_priv
*
priv
=
(
struct
gf10
0_ltcg_priv
*
)
ltcg
;
int
ret
;
ret
=
nouveau_mm_head
(
&
priv
->
tags
,
1
,
n
,
n
,
1
,
pnode
);
...
...
@@ -82,18 +73,18 @@ nvc0_ltcg_tags_alloc(struct nouveau_ltcg *ltcg, u32 n,
return
ret
;
}
static
void
nvc
0_ltcg_tags_free
(
struct
nouveau_ltcg
*
ltcg
,
struct
nouveau_mm_node
**
pnode
)
void
gf10
0_ltcg_tags_free
(
struct
nouveau_ltcg
*
ltcg
,
struct
nouveau_mm_node
**
pnode
)
{
struct
nvc0_ltcg_priv
*
priv
=
(
struct
nvc
0_ltcg_priv
*
)
ltcg
;
struct
gf100_ltcg_priv
*
priv
=
(
struct
gf10
0_ltcg_priv
*
)
ltcg
;
nouveau_mm_free
(
&
priv
->
tags
,
pnode
);
}
static
void
nvc
0_ltcg_tags_clear
(
struct
nouveau_ltcg
*
ltcg
,
u32
first
,
u32
count
)
gf10
0_ltcg_tags_clear
(
struct
nouveau_ltcg
*
ltcg
,
u32
first
,
u32
count
)
{
struct
nvc0_ltcg_priv
*
priv
=
(
struct
nvc
0_ltcg_priv
*
)
ltcg
;
struct
gf100_ltcg_priv
*
priv
=
(
struct
gf10
0_ltcg_priv
*
)
ltcg
;
u32
last
=
first
+
count
-
1
;
int
p
,
i
;
...
...
@@ -104,16 +95,16 @@ nvc0_ltcg_tags_clear(struct nouveau_ltcg *ltcg, u32 first, u32 count)
nv_wr32
(
priv
,
0x17e8c8
,
0x4
);
/* trigger clear */
/* wait until it's finished with clearing */
for
(
p
=
0
;
p
<
priv
->
part
_nr
;
++
p
)
{
for
(
i
=
0
;
i
<
priv
->
subp
_nr
;
++
i
)
for
(
p
=
0
;
p
<
priv
->
ltc
_nr
;
++
p
)
{
for
(
i
=
0
;
i
<
priv
->
lts
_nr
;
++
i
)
nv_wait
(
priv
,
0x1410c8
+
p
*
0x2000
+
i
*
0x400
,
~
0
,
0
);
}
}
/* TODO: Figure out tag memory details and drop the over-cautious allocation.
*/
static
int
nvc0_ltcg_init_tag_ram
(
struct
nouveau_fb
*
pfb
,
struct
nvc
0_ltcg_priv
*
priv
)
int
gf100_ltcg_init_tag_ram
(
struct
nouveau_fb
*
pfb
,
struct
gf10
0_ltcg_priv
*
priv
)
{
u32
tag_size
,
tag_margin
,
tag_align
;
int
ret
;
...
...
@@ -124,7 +115,7 @@ nvc0_ltcg_init_tag_ram(struct nouveau_fb *pfb, struct nvc0_ltcg_priv *priv)
priv
->
num_tags
=
1
<<
17
;
/* we have 17 bits in PTE */
priv
->
num_tags
=
(
priv
->
num_tags
+
63
)
&
~
63
;
/* round up to 64 */
tag_align
=
priv
->
part
_nr
*
0x800
;
tag_align
=
priv
->
ltc
_nr
*
0x800
;
tag_margin
=
(
tag_align
<
0x6000
)
?
0x6000
:
tag_align
;
/* 4 part 4 sub: 0x2000 bytes for 56 tags */
...
...
@@ -157,11 +148,11 @@ nvc0_ltcg_init_tag_ram(struct nouveau_fb *pfb, struct nvc0_ltcg_priv *priv)
}
static
int
nvc
0_ltcg_ctor
(
struct
nouveau_object
*
parent
,
struct
nouveau_object
*
engine
,
gf10
0_ltcg_ctor
(
struct
nouveau_object
*
parent
,
struct
nouveau_object
*
engine
,
struct
nouveau_oclass
*
oclass
,
void
*
data
,
u32
size
,
struct
nouveau_object
**
pobject
)
{
struct
nvc
0_ltcg_priv
*
priv
;
struct
gf10
0_ltcg_priv
*
priv
;
struct
nouveau_fb
*
pfb
=
nouveau_fb
(
parent
);
u32
parts
,
mask
;
int
ret
,
i
;
...
...
@@ -175,27 +166,27 @@ nvc0_ltcg_ctor(struct nouveau_object *parent, struct nouveau_object *engine,
mask
=
nv_rd32
(
priv
,
0x022554
);
for
(
i
=
0
;
i
<
parts
;
i
++
)
{
if
(
!
(
mask
&
(
1
<<
i
)))
priv
->
part
_nr
++
;
priv
->
ltc
_nr
++
;
}
priv
->
subp
_nr
=
nv_rd32
(
priv
,
0x17e8dc
)
>>
28
;
priv
->
lts
_nr
=
nv_rd32
(
priv
,
0x17e8dc
)
>>
28
;
ret
=
nvc
0_ltcg_init_tag_ram
(
pfb
,
priv
);
ret
=
gf10
0_ltcg_init_tag_ram
(
pfb
,
priv
);
if
(
ret
)
return
ret
;
priv
->
base
.
tags_alloc
=
nvc
0_ltcg_tags_alloc
;
priv
->
base
.
tags_free
=
nvc
0_ltcg_tags_free
;
priv
->
base
.
tags_clear
=
nvc
0_ltcg_tags_clear
;
priv
->
base
.
tags_alloc
=
gf10
0_ltcg_tags_alloc
;
priv
->
base
.
tags_free
=
gf10
0_ltcg_tags_free
;
priv
->
base
.
tags_clear
=
gf10
0_ltcg_tags_clear
;
nv_subdev
(
priv
)
->
intr
=
nvc
0_ltcg_intr
;
nv_subdev
(
priv
)
->
intr
=
gf10
0_ltcg_intr
;
return
0
;
}
static
void
nvc
0_ltcg_dtor
(
struct
nouveau_object
*
object
)
void
gf10
0_ltcg_dtor
(
struct
nouveau_object
*
object
)
{
struct
nouveau_ltcg
*
ltcg
=
(
struct
nouveau_ltcg
*
)
object
;
struct
nvc0_ltcg_priv
*
priv
=
(
struct
nvc
0_ltcg_priv
*
)
ltcg
;
struct
gf100_ltcg_priv
*
priv
=
(
struct
gf10
0_ltcg_priv
*
)
ltcg
;
struct
nouveau_fb
*
pfb
=
nouveau_fb
(
ltcg
->
base
.
base
.
parent
);
nouveau_mm_fini
(
&
priv
->
tags
);
...
...
@@ -205,10 +196,10 @@ nvc0_ltcg_dtor(struct nouveau_object *object)
}
static
int
nvc
0_ltcg_init
(
struct
nouveau_object
*
object
)
gf10
0_ltcg_init
(
struct
nouveau_object
*
object
)
{
struct
nouveau_ltcg
*
ltcg
=
(
struct
nouveau_ltcg
*
)
object
;
struct
nvc0_ltcg_priv
*
priv
=
(
struct
nvc
0_ltcg_priv
*
)
ltcg
;
struct
gf100_ltcg_priv
*
priv
=
(
struct
gf10
0_ltcg_priv
*
)
ltcg
;
int
ret
;
ret
=
nouveau_ltcg_init
(
ltcg
);
...
...
@@ -216,20 +207,20 @@ nvc0_ltcg_init(struct nouveau_object *object)
return
ret
;
nv_mask
(
priv
,
0x17e820
,
0x00100000
,
0x00000000
);
/* INTR_EN &= ~0x10 */
nv_wr32
(
priv
,
0x17e8d8
,
priv
->
part
_nr
);
nv_wr32
(
priv
,
0x17e8d8
,
priv
->
ltc
_nr
);
if
(
nv_device
(
ltcg
)
->
card_type
>=
NV_E0
)
nv_wr32
(
priv
,
0x17e000
,
priv
->
part
_nr
);
nv_wr32
(
priv
,
0x17e000
,
priv
->
ltc
_nr
);
nv_wr32
(
priv
,
0x17e8d4
,
priv
->
tag_base
);
return
0
;
}
struct
nouveau_oclass
nvc0_ltcg_oclass
=
{
struct
nouveau_oclass
*
gf100_ltcg_oclass
=
&
(
struct
nouveau_oclass
)
{
.
handle
=
NV_SUBDEV
(
LTCG
,
0xc0
),
.
ofuncs
=
&
(
struct
nouveau_ofuncs
)
{
.
ctor
=
nvc
0_ltcg_ctor
,
.
dtor
=
nvc
0_ltcg_dtor
,
.
init
=
nvc
0_ltcg_init
,
.
ctor
=
gf10
0_ltcg_ctor
,
.
dtor
=
gf10
0_ltcg_dtor
,
.
init
=
gf10
0_ltcg_init
,
.
fini
=
_nouveau_ltcg_fini
,
},
};
drivers/gpu/drm/nouveau/core/subdev/ltcg/gf100.h
0 → 100644
View file @
f6bad8ab
#ifndef __NVKM_LTCG_PRIV_GF100_H__
#define __NVKM_LTCG_PRIV_GF100_H__
#include <subdev/ltcg.h>
struct
gf100_ltcg_priv
{
struct
nouveau_ltcg
base
;
u32
ltc_nr
;
u32
lts_nr
;
u32
num_tags
;
u32
tag_base
;
struct
nouveau_mm
tags
;
struct
nouveau_mm_node
*
tag_ram
;
};
void
gf100_ltcg_dtor
(
struct
nouveau_object
*
);
int
gf100_ltcg_init_tag_ram
(
struct
nouveau_fb
*
,
struct
gf100_ltcg_priv
*
);
int
gf100_ltcg_tags_alloc
(
struct
nouveau_ltcg
*
,
u32
,
struct
nouveau_mm_node
**
);
void
gf100_ltcg_tags_free
(
struct
nouveau_ltcg
*
,
struct
nouveau_mm_node
**
);
#endif
drivers/gpu/drm/nouveau/core/subdev/ltcg/gm107.c
0 → 100644
View file @
f6bad8ab
/*
* Copyright 2014 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 <subdev/fb.h>
#include <subdev/timer.h>
#include "gf100.h"
static
void
gm107_ltcg_lts_isr
(
struct
gf100_ltcg_priv
*
priv
,
int
ltc
,
int
lts
)
{
u32
base
=
0x140000
+
(
ltc
*
0x2000
)
+
(
lts
*
0x400
);
u32
stat
=
nv_rd32
(
priv
,
base
+
0x00c
);
if
(
stat
)
{
nv_info
(
priv
,
"LTC%d_LTS%d: 0x%08x
\n
"
,
ltc
,
lts
,
stat
);
nv_wr32
(
priv
,
base
+
0x00c
,
stat
);
}
}
static
void
gm107_ltcg_intr
(
struct
nouveau_subdev
*
subdev
)
{
struct
gf100_ltcg_priv
*
priv
=
(
void
*
)
subdev
;
u32
mask
;
mask
=
nv_rd32
(
priv
,
0x00017c
);
while
(
mask
)
{
u32
lts
,
ltc
=
__ffs
(
mask
);
for
(
lts
=
0
;
lts
<
priv
->
lts_nr
;
lts
++
)
gm107_ltcg_lts_isr
(
priv
,
ltc
,
lts
);
mask
&=
~
(
1
<<
ltc
);
}
/* we do something horribly wrong and upset PMFB a lot, so mask off
* interrupts from it after the first one until it's fixed
*/
nv_mask
(
priv
,
0x000640
,
0x02000000
,
0x00000000
);
}
static
void
gm107_ltcg_tags_clear
(
struct
nouveau_ltcg
*
ltcg
,
u32
first
,
u32
count
)
{
struct
gf100_ltcg_priv
*
priv
=
(
struct
gf100_ltcg_priv
*
)
ltcg
;
u32
last
=
first
+
count
-
1
;
int
p
,
i
;
BUG_ON
((
first
>
last
)
||
(
last
>=
priv
->
num_tags
));
nv_wr32
(
priv
,
0x17e270
,
first
);
nv_wr32
(
priv
,
0x17e274
,
last
);
nv_wr32
(
priv
,
0x17e26c
,
0x4
);
/* trigger clear */
/* wait until it's finished with clearing */
for
(
p
=
0
;
p
<
priv
->
ltc_nr
;
++
p
)
{
for
(
i
=
0
;
i
<
priv
->
lts_nr
;
++
i
)
nv_wait
(
priv
,
0x14046c
+
p
*
0x2000
+
i
*
0x200
,
~
0
,
0
);
}
}
static
int
gm107_ltcg_ctor
(
struct
nouveau_object
*
parent
,
struct
nouveau_object
*
engine
,
struct
nouveau_oclass
*
oclass
,
void
*
data
,
u32
size
,
struct
nouveau_object
**
pobject
)
{
struct
gf100_ltcg_priv
*
priv
;
struct
nouveau_fb
*
pfb
=
nouveau_fb
(
parent
);
u32
parts
,
mask
;
int
ret
,
i
;
ret
=
nouveau_ltcg_create
(
parent
,
engine
,
oclass
,
&
priv
);
*
pobject
=
nv_object
(
priv
);
if
(
ret
)
return
ret
;
parts
=
nv_rd32
(
priv
,
0x022438
);
mask
=
nv_rd32
(
priv
,
0x021c14
);
for
(
i
=
0
;
i
<
parts
;
i
++
)
{
if
(
!
(
mask
&
(
1
<<
i
)))
priv
->
ltc_nr
++
;
}
priv
->
lts_nr
=
nv_rd32
(
priv
,
0x17e280
)
>>
28
;
ret
=
gf100_ltcg_init_tag_ram
(
pfb
,
priv
);
if
(
ret
)
return
ret
;
priv
->
base
.
tags_alloc
=
gf100_ltcg_tags_alloc
;
priv
->
base
.
tags_free
=
gf100_ltcg_tags_free
;
priv
->
base
.
tags_clear
=
gm107_ltcg_tags_clear
;
nv_subdev
(
priv
)
->
intr
=
gm107_ltcg_intr
;
return
0
;
}
static
int
gm107_ltcg_init
(
struct
nouveau_object
*
object
)
{
struct
nouveau_ltcg
*
ltcg
=
(
struct
nouveau_ltcg
*
)
object
;
struct
gf100_ltcg_priv
*
priv
=
(
struct
gf100_ltcg_priv
*
)
ltcg
;
int
ret
;
ret
=
nouveau_ltcg_init
(
ltcg
);
if
(
ret
)
return
ret
;
nv_wr32
(
priv
,
0x17e27c
,
priv
->
ltc_nr
);
nv_wr32
(
priv
,
0x17e278
,
priv
->
tag_base
);
return
0
;
}
struct
nouveau_oclass
*
gm107_ltcg_oclass
=
&
(
struct
nouveau_oclass
)
{
.
handle
=
NV_SUBDEV
(
LTCG
,
0xff
),
.
ofuncs
=
&
(
struct
nouveau_ofuncs
)
{
.
ctor
=
gm107_ltcg_ctor
,
.
dtor
=
gf100_ltcg_dtor
,
.
init
=
gm107_ltcg_init
,
.
fini
=
_nouveau_ltcg_fini
,
},
};
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