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
b2b09938
Commit
b2b09938
authored
Nov 24, 2010
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nvc0: implement pfifo engine hooks
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
529c4959
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
361 additions
and
0 deletions
+361
-0
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/nouveau/nouveau_drv.h
+2
-0
drivers/gpu/drm/nouveau/nvc0_fifo.c
drivers/gpu/drm/nouveau/nvc0_fifo.c
+359
-0
No files found.
drivers/gpu/drm/nouveau/nouveau_drv.h
View file @
b2b09938
...
@@ -240,6 +240,7 @@ struct nouveau_channel {
...
@@ -240,6 +240,7 @@ struct nouveau_channel {
/* PFIFO context */
/* PFIFO context */
struct
nouveau_gpuobj
*
ramfc
;
struct
nouveau_gpuobj
*
ramfc
;
struct
nouveau_gpuobj
*
cache
;
struct
nouveau_gpuobj
*
cache
;
void
*
fifo_priv
;
/* PGRAPH context */
/* PGRAPH context */
/* XXX may be merge 2 pointers as private data ??? */
/* XXX may be merge 2 pointers as private data ??? */
...
@@ -337,6 +338,7 @@ struct nouveau_fb_engine {
...
@@ -337,6 +338,7 @@ struct nouveau_fb_engine {
};
};
struct
nouveau_fifo_engine
{
struct
nouveau_fifo_engine
{
void
*
priv
;
int
channels
;
int
channels
;
struct
nouveau_gpuobj
*
playlist
[
2
];
struct
nouveau_gpuobj
*
playlist
[
2
];
...
...
drivers/gpu/drm/nouveau/nvc0_fifo.c
View file @
b2b09938
...
@@ -25,6 +25,48 @@
...
@@ -25,6 +25,48 @@
#include "drmP.h"
#include "drmP.h"
#include "nouveau_drv.h"
#include "nouveau_drv.h"
#include "nouveau_mm.h"
static
void
nvc0_fifo_isr
(
struct
drm_device
*
);
struct
nvc0_fifo_priv
{
struct
nouveau_gpuobj
*
playlist
[
2
];
int
cur_playlist
;
struct
nouveau_vma
user_vma
;
};
struct
nvc0_fifo_chan
{
struct
nouveau_bo
*
user
;
struct
nouveau_gpuobj
*
ramfc
;
};
static
void
nvc0_fifo_playlist_update
(
struct
drm_device
*
dev
)
{
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
nouveau_instmem_engine
*
pinstmem
=
&
dev_priv
->
engine
.
instmem
;
struct
nouveau_fifo_engine
*
pfifo
=
&
dev_priv
->
engine
.
fifo
;
struct
nvc0_fifo_priv
*
priv
=
pfifo
->
priv
;
struct
nouveau_gpuobj
*
cur
;
int
i
,
p
;
cur
=
priv
->
playlist
[
priv
->
cur_playlist
];
priv
->
cur_playlist
=
!
priv
->
cur_playlist
;
for
(
i
=
0
,
p
=
0
;
i
<
128
;
i
++
)
{
if
(
!
(
nv_rd32
(
dev
,
0x3004
+
(
i
*
8
))
&
1
))
continue
;
nv_wo32
(
cur
,
p
+
0
,
i
);
nv_wo32
(
cur
,
p
+
4
,
0x00000004
);
p
+=
8
;
}
pinstmem
->
flush
(
dev
);
nv_wr32
(
dev
,
0x002270
,
cur
->
vinst
>>
12
);
nv_wr32
(
dev
,
0x002274
,
0x01f00000
|
(
p
>>
3
));
if
(
!
nv_wait
(
dev
,
0x00227c
,
0x00100000
,
0x00000000
))
NV_ERROR
(
dev
,
"PFIFO - playlist update failed
\n
"
);
}
void
void
nvc0_fifo_disable
(
struct
drm_device
*
dev
)
nvc0_fifo_disable
(
struct
drm_device
*
dev
)
...
@@ -57,12 +99,135 @@ nvc0_fifo_channel_id(struct drm_device *dev)
...
@@ -57,12 +99,135 @@ nvc0_fifo_channel_id(struct drm_device *dev)
int
int
nvc0_fifo_create_context
(
struct
nouveau_channel
*
chan
)
nvc0_fifo_create_context
(
struct
nouveau_channel
*
chan
)
{
{
struct
drm_device
*
dev
=
chan
->
dev
;
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
nouveau_instmem_engine
*
pinstmem
=
&
dev_priv
->
engine
.
instmem
;
struct
nouveau_fifo_engine
*
pfifo
=
&
dev_priv
->
engine
.
fifo
;
struct
nvc0_fifo_priv
*
priv
=
pfifo
->
priv
;
struct
nvc0_fifo_chan
*
fifoch
;
u64
ib_virt
,
user_vinst
;
int
ret
;
chan
->
fifo_priv
=
kzalloc
(
sizeof
(
*
fifoch
),
GFP_KERNEL
);
if
(
!
chan
->
fifo_priv
)
return
-
ENOMEM
;
fifoch
=
chan
->
fifo_priv
;
/* allocate vram for control regs, map into polling area */
ret
=
nouveau_bo_new
(
dev
,
NULL
,
0x1000
,
0
,
TTM_PL_FLAG_VRAM
,
0
,
0
,
true
,
true
,
&
fifoch
->
user
);
if
(
ret
)
goto
error
;
ret
=
nouveau_bo_pin
(
fifoch
->
user
,
TTM_PL_FLAG_VRAM
);
if
(
ret
)
{
nouveau_bo_ref
(
NULL
,
&
fifoch
->
user
);
goto
error
;
}
user_vinst
=
fifoch
->
user
->
bo
.
mem
.
start
<<
PAGE_SHIFT
;
ret
=
nouveau_bo_map
(
fifoch
->
user
);
if
(
ret
)
{
nouveau_bo_unpin
(
fifoch
->
user
);
nouveau_bo_ref
(
NULL
,
&
fifoch
->
user
);
goto
error
;
}
nouveau_vm_map_at
(
&
priv
->
user_vma
,
chan
->
id
*
0x1000
,
fifoch
->
user
->
bo
.
mem
.
mm_node
);
chan
->
user
=
ioremap_wc
(
pci_resource_start
(
dev
->
pdev
,
1
)
+
priv
->
user_vma
.
offset
+
(
chan
->
id
*
0x1000
),
PAGE_SIZE
);
if
(
!
chan
->
user
)
{
ret
=
-
ENOMEM
;
goto
error
;
}
ib_virt
=
chan
->
pushbuf_base
+
chan
->
dma
.
ib_base
*
4
;
/* zero channel regs */
nouveau_bo_wr32
(
fifoch
->
user
,
0x0040
/
4
,
0
);
nouveau_bo_wr32
(
fifoch
->
user
,
0x0044
/
4
,
0
);
nouveau_bo_wr32
(
fifoch
->
user
,
0x0048
/
4
,
0
);
nouveau_bo_wr32
(
fifoch
->
user
,
0x004c
/
4
,
0
);
nouveau_bo_wr32
(
fifoch
->
user
,
0x0050
/
4
,
0
);
nouveau_bo_wr32
(
fifoch
->
user
,
0x0058
/
4
,
0
);
nouveau_bo_wr32
(
fifoch
->
user
,
0x005c
/
4
,
0
);
nouveau_bo_wr32
(
fifoch
->
user
,
0x0060
/
4
,
0
);
nouveau_bo_wr32
(
fifoch
->
user
,
0x0088
/
4
,
0
);
nouveau_bo_wr32
(
fifoch
->
user
,
0x008c
/
4
,
0
);
/* ramfc */
ret
=
nouveau_gpuobj_new_fake
(
dev
,
chan
->
ramin
->
pinst
,
chan
->
ramin
->
vinst
,
0x100
,
NVOBJ_FLAG_ZERO_ALLOC
,
&
fifoch
->
ramfc
);
if
(
ret
)
goto
error
;
nv_wo32
(
fifoch
->
ramfc
,
0x08
,
lower_32_bits
(
user_vinst
));
nv_wo32
(
fifoch
->
ramfc
,
0x0c
,
upper_32_bits
(
user_vinst
));
nv_wo32
(
fifoch
->
ramfc
,
0x10
,
0x0000face
);
nv_wo32
(
fifoch
->
ramfc
,
0x30
,
0xfffff902
);
nv_wo32
(
fifoch
->
ramfc
,
0x48
,
lower_32_bits
(
ib_virt
));
nv_wo32
(
fifoch
->
ramfc
,
0x4c
,
drm_order
(
chan
->
dma
.
ib_max
+
1
)
<<
16
|
upper_32_bits
(
ib_virt
));
nv_wo32
(
fifoch
->
ramfc
,
0x54
,
0x00000002
);
nv_wo32
(
fifoch
->
ramfc
,
0x84
,
0x20400000
);
nv_wo32
(
fifoch
->
ramfc
,
0x94
,
0x30000001
);
nv_wo32
(
fifoch
->
ramfc
,
0x9c
,
0x00000100
);
nv_wo32
(
fifoch
->
ramfc
,
0xa4
,
0x1f1f1f1f
);
nv_wo32
(
fifoch
->
ramfc
,
0xa8
,
0x1f1f1f1f
);
nv_wo32
(
fifoch
->
ramfc
,
0xac
,
0x0000001f
);
nv_wo32
(
fifoch
->
ramfc
,
0xb8
,
0xf8000000
);
nv_wo32
(
fifoch
->
ramfc
,
0xf8
,
0x10003080
);
/* 0x002310 */
nv_wo32
(
fifoch
->
ramfc
,
0xfc
,
0x10000010
);
/* 0x002350 */
pinstmem
->
flush
(
dev
);
nv_wr32
(
dev
,
0x003000
+
(
chan
->
id
*
8
),
0xc0000000
|
(
chan
->
ramin
->
vinst
>>
12
));
nv_wr32
(
dev
,
0x003004
+
(
chan
->
id
*
8
),
0x001f0001
);
nvc0_fifo_playlist_update
(
dev
);
return
0
;
return
0
;
error:
pfifo
->
destroy_context
(
chan
);
return
ret
;
}
}
void
void
nvc0_fifo_destroy_context
(
struct
nouveau_channel
*
chan
)
nvc0_fifo_destroy_context
(
struct
nouveau_channel
*
chan
)
{
{
struct
drm_device
*
dev
=
chan
->
dev
;
struct
nvc0_fifo_chan
*
fifoch
;
nv_mask
(
dev
,
0x003004
+
(
chan
->
id
*
8
),
0x00000001
,
0x00000000
);
nv_wr32
(
dev
,
0x002634
,
chan
->
id
);
if
(
!
nv_wait
(
dev
,
0x0002634
,
0xffffffff
,
chan
->
id
))
NV_WARN
(
dev
,
"0x2634 != chid: 0x%08x
\n
"
,
nv_rd32
(
dev
,
0x2634
));
nvc0_fifo_playlist_update
(
dev
);
nv_wr32
(
dev
,
0x003000
+
(
chan
->
id
*
8
),
0x00000000
);
if
(
chan
->
user
)
{
iounmap
(
chan
->
user
);
chan
->
user
=
NULL
;
}
fifoch
=
chan
->
fifo_priv
;
chan
->
fifo_priv
=
NULL
;
if
(
!
fifoch
)
return
;
nouveau_gpuobj_ref
(
NULL
,
&
fifoch
->
ramfc
);
if
(
fifoch
->
user
)
{
nouveau_bo_unmap
(
fifoch
->
user
);
nouveau_bo_unpin
(
fifoch
->
user
);
nouveau_bo_ref
(
NULL
,
&
fifoch
->
user
);
}
kfree
(
fifoch
);
}
}
int
int
...
@@ -77,14 +242,208 @@ nvc0_fifo_unload_context(struct drm_device *dev)
...
@@ -77,14 +242,208 @@ nvc0_fifo_unload_context(struct drm_device *dev)
return
0
;
return
0
;
}
}
static
void
nvc0_fifo_destroy
(
struct
drm_device
*
dev
)
{
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
nouveau_fifo_engine
*
pfifo
=
&
dev_priv
->
engine
.
fifo
;
struct
nvc0_fifo_priv
*
priv
;
priv
=
pfifo
->
priv
;
if
(
!
priv
)
return
;
nouveau_vm_put
(
&
priv
->
user_vma
);
nouveau_gpuobj_ref
(
NULL
,
&
priv
->
playlist
[
1
]);
nouveau_gpuobj_ref
(
NULL
,
&
priv
->
playlist
[
0
]);
kfree
(
priv
);
}
void
void
nvc0_fifo_takedown
(
struct
drm_device
*
dev
)
nvc0_fifo_takedown
(
struct
drm_device
*
dev
)
{
{
nv_wr32
(
dev
,
0x002140
,
0x00000000
);
nvc0_fifo_destroy
(
dev
);
}
static
int
nvc0_fifo_create
(
struct
drm_device
*
dev
)
{
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
nouveau_fifo_engine
*
pfifo
=
&
dev_priv
->
engine
.
fifo
;
struct
nvc0_fifo_priv
*
priv
;
int
ret
;
priv
=
kzalloc
(
sizeof
(
*
priv
),
GFP_KERNEL
);
if
(
!
priv
)
return
-
ENOMEM
;
pfifo
->
priv
=
priv
;
ret
=
nouveau_gpuobj_new
(
dev
,
NULL
,
0x1000
,
0x1000
,
0
,
&
priv
->
playlist
[
0
]);
if
(
ret
)
goto
error
;
ret
=
nouveau_gpuobj_new
(
dev
,
NULL
,
0x1000
,
0x1000
,
0
,
&
priv
->
playlist
[
1
]);
if
(
ret
)
goto
error
;
ret
=
nouveau_vm_get
(
dev_priv
->
bar1_vm
,
pfifo
->
channels
*
0x1000
,
12
,
NV_MEM_ACCESS_RW
,
&
priv
->
user_vma
);
if
(
ret
)
goto
error
;
nouveau_irq_register
(
dev
,
8
,
nvc0_fifo_isr
);
NVOBJ_CLASS
(
dev
,
0x506e
,
SW
);
/* nvsw */
return
0
;
error:
nvc0_fifo_destroy
(
dev
);
return
ret
;
}
}
int
int
nvc0_fifo_init
(
struct
drm_device
*
dev
)
nvc0_fifo_init
(
struct
drm_device
*
dev
)
{
{
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
nouveau_fifo_engine
*
pfifo
=
&
dev_priv
->
engine
.
fifo
;
struct
nvc0_fifo_priv
*
priv
;
int
ret
,
i
;
if
(
!
pfifo
->
priv
)
{
ret
=
nvc0_fifo_create
(
dev
);
if
(
ret
)
return
ret
;
}
priv
=
pfifo
->
priv
;
/* reset PFIFO, enable all available PSUBFIFO areas */
nv_mask
(
dev
,
0x000200
,
0x00000100
,
0x00000000
);
nv_mask
(
dev
,
0x000200
,
0x00000100
,
0x00000100
);
nv_wr32
(
dev
,
0x000204
,
0xffffffff
);
nv_wr32
(
dev
,
0x002204
,
0xffffffff
);
/* assign engines to subfifos */
nv_wr32
(
dev
,
0x002208
,
~
(
1
<<
0
));
/* PGRAPH */
nv_wr32
(
dev
,
0x00220c
,
~
(
1
<<
1
));
/* PVP */
nv_wr32
(
dev
,
0x002210
,
~
(
1
<<
1
));
/* PPP */
nv_wr32
(
dev
,
0x002214
,
~
(
1
<<
1
));
/* PBSP */
nv_wr32
(
dev
,
0x002218
,
~
(
1
<<
2
));
/* PCE0 */
nv_wr32
(
dev
,
0x00221c
,
~
(
1
<<
1
));
/* PCE1 */
/* PSUBFIFO[n] */
for
(
i
=
0
;
i
<
3
;
i
++
)
{
nv_mask
(
dev
,
0x04013c
+
(
i
*
0x2000
),
0x10000100
,
0x00000000
);
nv_wr32
(
dev
,
0x040108
+
(
i
*
0x2000
),
0xffffffff
);
/* INTR */
nv_wr32
(
dev
,
0x04010c
+
(
i
*
0x2000
),
0xfffffeff
);
/* INTR_EN */
}
nv_mask
(
dev
,
0x002200
,
0x00000001
,
0x00000001
);
nv_wr32
(
dev
,
0x002254
,
0x10000000
|
priv
->
user_vma
.
offset
>>
12
);
nv_wr32
(
dev
,
0x002a00
,
0xffffffff
);
/* clears PFIFO.INTR bit 30 */
nv_wr32
(
dev
,
0x002100
,
0xffffffff
);
nv_wr32
(
dev
,
0x002140
,
0xbfffffff
);
return
0
;
return
0
;
}
}
struct
nouveau_enum
nvc0_fifo_fault_unit
[]
=
{
{
0
,
"PGRAPH"
},
{
3
,
"PEEPHOLE"
},
{
4
,
"BAR1"
},
{
5
,
"BAR3"
},
{
7
,
"PFIFO"
},
{}
};
struct
nouveau_enum
nvc0_fifo_fault_reason
[]
=
{
{
0
,
"PT_NOT_PRESENT"
},
{
1
,
"PT_TOO_SHORT"
},
{
2
,
"PAGE_NOT_PRESENT"
},
{
3
,
"VM_LIMIT_EXCEEDED"
},
{}
};
struct
nouveau_bitfield
nvc0_fifo_subfifo_intr
[]
=
{
/* { 0x00008000, "" } seen with null ib push */
{
0x00200000
,
"ILLEGAL_MTHD"
},
{
0x00800000
,
"EMPTY_SUBC"
},
{}
};
static
void
nvc0_fifo_isr_vm_fault
(
struct
drm_device
*
dev
,
int
unit
)
{
u32
inst
=
nv_rd32
(
dev
,
0x2800
+
(
unit
*
0x10
));
u32
valo
=
nv_rd32
(
dev
,
0x2804
+
(
unit
*
0x10
));
u32
vahi
=
nv_rd32
(
dev
,
0x2808
+
(
unit
*
0x10
));
u32
stat
=
nv_rd32
(
dev
,
0x280c
+
(
unit
*
0x10
));
NV_INFO
(
dev
,
"PFIFO: %s fault at 0x%010llx ["
,
(
stat
&
0x00000080
)
?
"write"
:
"read"
,
(
u64
)
vahi
<<
32
|
valo
);
nouveau_enum_print
(
nvc0_fifo_fault_reason
,
stat
&
0x0000000f
);
printk
(
"] from "
);
nouveau_enum_print
(
nvc0_fifo_fault_unit
,
unit
);
printk
(
" on channel 0x%010llx
\n
"
,
(
u64
)
inst
<<
12
);
}
static
void
nvc0_fifo_isr_subfifo_intr
(
struct
drm_device
*
dev
,
int
unit
)
{
u32
stat
=
nv_rd32
(
dev
,
0x040108
+
(
unit
*
0x2000
));
u32
addr
=
nv_rd32
(
dev
,
0x0400c0
+
(
unit
*
0x2000
));
u32
data
=
nv_rd32
(
dev
,
0x0400c4
+
(
unit
*
0x2000
));
u32
chid
=
nv_rd32
(
dev
,
0x040120
+
(
unit
*
0x2000
))
&
0x7f
;
u32
subc
=
(
addr
&
0x00070000
);
u32
mthd
=
(
addr
&
0x00003ffc
);
NV_INFO
(
dev
,
"PSUBFIFO %d:"
,
unit
);
nouveau_bitfield_print
(
nvc0_fifo_subfifo_intr
,
stat
);
NV_INFO
(
dev
,
"PSUBFIFO %d: ch %d subc %d mthd 0x%04x data 0x%08x
\n
"
,
unit
,
chid
,
subc
,
mthd
,
data
);
nv_wr32
(
dev
,
0x0400c0
+
(
unit
*
0x2000
),
0x80600008
);
nv_wr32
(
dev
,
0x040108
+
(
unit
*
0x2000
),
stat
);
}
static
void
nvc0_fifo_isr
(
struct
drm_device
*
dev
)
{
u32
stat
=
nv_rd32
(
dev
,
0x002100
);
if
(
stat
&
0x10000000
)
{
u32
units
=
nv_rd32
(
dev
,
0x00259c
);
u32
u
=
units
;
while
(
u
)
{
int
i
=
ffs
(
u
)
-
1
;
nvc0_fifo_isr_vm_fault
(
dev
,
i
);
u
&=
~
(
1
<<
i
);
}
nv_wr32
(
dev
,
0x00259c
,
units
);
stat
&=
~
0x10000000
;
}
if
(
stat
&
0x20000000
)
{
u32
units
=
nv_rd32
(
dev
,
0x0025a0
);
u32
u
=
units
;
while
(
u
)
{
int
i
=
ffs
(
u
)
-
1
;
nvc0_fifo_isr_subfifo_intr
(
dev
,
i
);
u
&=
~
(
1
<<
i
);
}
nv_wr32
(
dev
,
0x0025a0
,
units
);
stat
&=
~
0x20000000
;
}
if
(
stat
)
{
NV_INFO
(
dev
,
"PFIFO: unhandled status 0x%08x
\n
"
,
stat
);
nv_wr32
(
dev
,
0x002100
,
stat
);
}
nv_wr32
(
dev
,
0x2140
,
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