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
083c2142
Commit
083c2142
authored
Feb 22, 2014
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nvc0/fifo: ack pb intr individually after handling each unit
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
a07d0e76
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
40 additions
and
42 deletions
+40
-42
drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
+40
-42
No files found.
drivers/gpu/drm/nouveau/core/engine/fifo/nvc0.c
View file @
083c2142
...
@@ -345,6 +345,32 @@ nvc0_fifo_cclass = {
...
@@ -345,6 +345,32 @@ nvc0_fifo_cclass = {
* PFIFO engine
* PFIFO engine
******************************************************************************/
******************************************************************************/
static
int
nvc0_fifo_swmthd
(
struct
nvc0_fifo_priv
*
priv
,
u32
chid
,
u32
mthd
,
u32
data
)
{
struct
nvc0_fifo_chan
*
chan
=
NULL
;
struct
nouveau_handle
*
bind
;
unsigned
long
flags
;
int
ret
=
-
EINVAL
;
spin_lock_irqsave
(
&
priv
->
base
.
lock
,
flags
);
if
(
likely
(
chid
>=
priv
->
base
.
min
&&
chid
<=
priv
->
base
.
max
))
chan
=
(
void
*
)
priv
->
base
.
channel
[
chid
];
if
(
unlikely
(
!
chan
))
goto
out
;
bind
=
nouveau_namedb_get_class
(
nv_namedb
(
chan
),
0x906e
);
if
(
likely
(
bind
))
{
if
(
!
mthd
||
!
nv_call
(
bind
->
object
,
mthd
,
data
))
ret
=
0
;
nouveau_namedb_put
(
bind
);
}
out:
spin_unlock_irqrestore
(
&
priv
->
base
.
lock
,
flags
);
return
ret
;
}
static
const
struct
nouveau_enum
nvc0_fifo_fault_unit
[]
=
{
static
const
struct
nouveau_enum
nvc0_fifo_fault_unit
[]
=
{
{
0x00
,
"PGRAPH"
,
NULL
,
NVDEV_ENGINE_GR
},
{
0x00
,
"PGRAPH"
,
NULL
,
NVDEV_ENGINE_GR
},
{
0x03
,
"PEEPHOLE"
},
{
0x03
,
"PEEPHOLE"
},
...
@@ -400,13 +426,6 @@ static const struct nouveau_enum nvc0_fifo_fault_gpcclient[] = {
...
@@ -400,13 +426,6 @@ static const struct nouveau_enum nvc0_fifo_fault_gpcclient[] = {
{}
{}
};
};
static
const
struct
nouveau_bitfield
nvc0_fifo_pbdma_intr
[]
=
{
/* { 0x00008000, "" } seen with null ib push */
{
0x00200000
,
"ILLEGAL_MTHD"
},
{
0x00800000
,
"EMPTY_SUBC"
},
{}
};
static
void
static
void
nvc0_fifo_isr_vm_fault
(
struct
nvc0_fifo_priv
*
priv
,
int
unit
)
nvc0_fifo_isr_vm_fault
(
struct
nvc0_fifo_priv
*
priv
,
int
unit
)
{
{
...
@@ -458,34 +477,16 @@ nvc0_fifo_isr_vm_fault(struct nvc0_fifo_priv *priv, int unit)
...
@@ -458,34 +477,16 @@ nvc0_fifo_isr_vm_fault(struct nvc0_fifo_priv *priv, int unit)
nouveau_engctx_put
(
engctx
);
nouveau_engctx_put
(
engctx
);
}
}
static
int
static
const
struct
nouveau_bitfield
nvc0_fifo_swmthd
(
struct
nvc0_fifo_priv
*
priv
,
u32
chid
,
u32
mthd
,
u32
data
)
nvc0_fifo_pbdma_intr
[]
=
{
{
/* { 0x00008000, "" } seen with null ib push */
struct
nvc0_fifo_chan
*
chan
=
NULL
;
{
0x00200000
,
"ILLEGAL_MTHD"
},
struct
nouveau_handle
*
bind
;
{
0x00800000
,
"EMPTY_SUBC"
},
unsigned
long
flags
;
{}
int
ret
=
-
EINVAL
;
};
spin_lock_irqsave
(
&
priv
->
base
.
lock
,
flags
);
if
(
likely
(
chid
>=
priv
->
base
.
min
&&
chid
<=
priv
->
base
.
max
))
chan
=
(
void
*
)
priv
->
base
.
channel
[
chid
];
if
(
unlikely
(
!
chan
))
goto
out
;
bind
=
nouveau_namedb_get_class
(
nv_namedb
(
chan
),
0x906e
);
if
(
likely
(
bind
))
{
if
(
!
mthd
||
!
nv_call
(
bind
->
object
,
mthd
,
data
))
ret
=
0
;
nouveau_namedb_put
(
bind
);
}
out:
spin_unlock_irqrestore
(
&
priv
->
base
.
lock
,
flags
);
return
ret
;
}
static
void
static
void
nvc0_fifo_i
sr_pbdma_intr
(
struct
nvc0_fifo_priv
*
priv
,
int
unit
)
nvc0_fifo_i
ntr_pbdma
(
struct
nvc0_fifo_priv
*
priv
,
int
unit
)
{
{
u32
stat
=
nv_rd32
(
priv
,
0x040108
+
(
unit
*
0x2000
));
u32
stat
=
nv_rd32
(
priv
,
0x040108
+
(
unit
*
0x2000
));
u32
addr
=
nv_rd32
(
priv
,
0x0400c0
+
(
unit
*
0x2000
));
u32
addr
=
nv_rd32
(
priv
,
0x0400c0
+
(
unit
*
0x2000
));
...
@@ -615,16 +616,13 @@ nvc0_fifo_intr(struct nouveau_subdev *subdev)
...
@@ -615,16 +616,13 @@ nvc0_fifo_intr(struct nouveau_subdev *subdev)
}
}
if
(
stat
&
0x20000000
)
{
if
(
stat
&
0x20000000
)
{
u32
units
=
nv_rd32
(
priv
,
0x0025a0
);
u32
mask
=
nv_rd32
(
priv
,
0x0025a0
);
u32
u
=
units
;
while
(
mask
)
{
u32
unit
=
__ffs
(
mask
);
while
(
u
)
{
nvc0_fifo_intr_pbdma
(
priv
,
unit
);
int
i
=
__ffs
(
u
);
nv_wr32
(
priv
,
0x0025a0
,
(
1
<<
unit
));
nvc0_fifo_isr_pbdma_intr
(
priv
,
i
);
mask
&=
~
(
1
<<
unit
);
u
&=
~
(
1
<<
i
);
}
}
nv_wr32
(
priv
,
0x0025a0
,
units
);
stat
&=
~
0x20000000
;
stat
&=
~
0x20000000
;
}
}
...
...
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