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
e774055a
Commit
e774055a
authored
Nov 05, 2016
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau/fifo: tidy up channel creation event code
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
86d7442b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
6 deletions
+13
-6
drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
+11
-5
drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
+1
-1
drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h
drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h
+1
-0
No files found.
drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
View file @
e774055a
...
@@ -91,8 +91,8 @@ nvkm_fifo_chan_chid(struct nvkm_fifo *fifo, int chid, unsigned long *rflags)
...
@@ -91,8 +91,8 @@ nvkm_fifo_chan_chid(struct nvkm_fifo *fifo, int chid, unsigned long *rflags)
}
}
static
int
static
int
nvkm_fifo_event_ctor
(
struct
nvkm_object
*
object
,
void
*
data
,
u32
size
,
nvkm_fifo_
c
event_ctor
(
struct
nvkm_object
*
object
,
void
*
data
,
u32
size
,
struct
nvkm_notify
*
notify
)
struct
nvkm_notify
*
notify
)
{
{
if
(
size
==
0
)
{
if
(
size
==
0
)
{
notify
->
size
=
0
;
notify
->
size
=
0
;
...
@@ -104,10 +104,16 @@ nvkm_fifo_event_ctor(struct nvkm_object *object, void *data, u32 size,
...
@@ -104,10 +104,16 @@ nvkm_fifo_event_ctor(struct nvkm_object *object, void *data, u32 size,
}
}
static
const
struct
nvkm_event_func
static
const
struct
nvkm_event_func
nvkm_fifo_event_func
=
{
nvkm_fifo_
c
event_func
=
{
.
ctor
=
nvkm_fifo_event_ctor
,
.
ctor
=
nvkm_fifo_
c
event_ctor
,
};
};
void
nvkm_fifo_cevent
(
struct
nvkm_fifo
*
fifo
)
{
nvkm_event_send
(
&
fifo
->
cevent
,
1
,
0
,
NULL
,
0
);
}
static
void
static
void
nvkm_fifo_uevent_fini
(
struct
nvkm_event
*
event
,
int
type
,
int
index
)
nvkm_fifo_uevent_fini
(
struct
nvkm_event
*
event
,
int
type
,
int
index
)
{
{
...
@@ -283,5 +289,5 @@ nvkm_fifo_ctor(const struct nvkm_fifo_func *func, struct nvkm_device *device,
...
@@ -283,5 +289,5 @@ nvkm_fifo_ctor(const struct nvkm_fifo_func *func, struct nvkm_device *device,
return
ret
;
return
ret
;
}
}
return
nvkm_event_init
(
&
nvkm_fifo_event_func
,
1
,
1
,
&
fifo
->
cevent
);
return
nvkm_event_init
(
&
nvkm_fifo_
c
event_func
,
1
,
1
,
&
fifo
->
cevent
);
}
}
drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c
View file @
e774055a
...
@@ -410,6 +410,6 @@ nvkm_fifo_chan_ctor(const struct nvkm_fifo_chan_func *func,
...
@@ -410,6 +410,6 @@ nvkm_fifo_chan_ctor(const struct nvkm_fifo_chan_func *func,
base
+
user
*
chan
->
chid
;
base
+
user
*
chan
->
chid
;
chan
->
size
=
user
;
chan
->
size
=
user
;
nvkm_
event_send
(
&
fifo
->
cevent
,
1
,
0
,
NULL
,
0
);
nvkm_
fifo_cevent
(
fifo
);
return
0
;
return
0
;
}
}
drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h
View file @
e774055a
...
@@ -6,6 +6,7 @@
...
@@ -6,6 +6,7 @@
int
nvkm_fifo_ctor
(
const
struct
nvkm_fifo_func
*
,
struct
nvkm_device
*
,
int
nvkm_fifo_ctor
(
const
struct
nvkm_fifo_func
*
,
struct
nvkm_device
*
,
int
index
,
int
nr
,
struct
nvkm_fifo
*
);
int
index
,
int
nr
,
struct
nvkm_fifo
*
);
void
nvkm_fifo_uevent
(
struct
nvkm_fifo
*
);
void
nvkm_fifo_uevent
(
struct
nvkm_fifo
*
);
void
nvkm_fifo_cevent
(
struct
nvkm_fifo
*
);
struct
nvkm_fifo_chan_oclass
;
struct
nvkm_fifo_chan_oclass
;
struct
nvkm_fifo_func
{
struct
nvkm_fifo_func
{
...
...
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