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
e9dd8e11
Commit
e9dd8e11
authored
Jan 04, 2010
by
Ben Skeggs
Committed by
Dave Airlie
Jan 11, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau: remove unused nouveau_channel_idle() function
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
7de3643f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
42 deletions
+0
-42
drivers/gpu/drm/nouveau/nouveau_channel.c
drivers/gpu/drm/nouveau/nouveau_channel.c
+0
-41
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/nouveau/nouveau_drv.h
+0
-1
No files found.
drivers/gpu/drm/nouveau/nouveau_channel.c
View file @
e9dd8e11
...
@@ -235,47 +235,6 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret,
...
@@ -235,47 +235,6 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret,
return
0
;
return
0
;
}
}
int
nouveau_channel_idle
(
struct
nouveau_channel
*
chan
)
{
struct
drm_device
*
dev
=
chan
->
dev
;
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
nouveau_engine
*
engine
=
&
dev_priv
->
engine
;
uint32_t
caches
;
int
idle
;
if
(
!
chan
)
{
NV_ERROR
(
dev
,
"no channel...
\n
"
);
return
1
;
}
caches
=
nv_rd32
(
dev
,
NV03_PFIFO_CACHES
);
nv_wr32
(
dev
,
NV03_PFIFO_CACHES
,
caches
&
~
1
);
if
(
engine
->
fifo
.
channel_id
(
dev
)
!=
chan
->
id
)
{
struct
nouveau_gpuobj
*
ramfc
=
chan
->
ramfc
?
chan
->
ramfc
->
gpuobj
:
NULL
;
if
(
!
ramfc
)
{
NV_ERROR
(
dev
,
"No RAMFC for channel %d
\n
"
,
chan
->
id
);
return
1
;
}
engine
->
instmem
.
prepare_access
(
dev
,
false
);
if
(
nv_ro32
(
dev
,
ramfc
,
0
)
!=
nv_ro32
(
dev
,
ramfc
,
1
))
idle
=
0
;
else
idle
=
1
;
engine
->
instmem
.
finish_access
(
dev
);
}
else
{
idle
=
(
nv_rd32
(
dev
,
NV04_PFIFO_CACHE1_DMA_GET
)
==
nv_rd32
(
dev
,
NV04_PFIFO_CACHE1_DMA_PUT
));
}
nv_wr32
(
dev
,
NV03_PFIFO_CACHES
,
caches
);
return
idle
;
}
/* stops a fifo */
/* stops a fifo */
void
void
nouveau_channel_free
(
struct
nouveau_channel
*
chan
)
nouveau_channel_free
(
struct
nouveau_channel
*
chan
)
...
...
drivers/gpu/drm/nouveau/nouveau_drv.h
View file @
e9dd8e11
...
@@ -745,7 +745,6 @@ extern int nouveau_channel_alloc(struct drm_device *dev,
...
@@ -745,7 +745,6 @@ extern int nouveau_channel_alloc(struct drm_device *dev,
struct
drm_file
*
file_priv
,
struct
drm_file
*
file_priv
,
uint32_t
fb_ctxdma
,
uint32_t
tt_ctxdma
);
uint32_t
fb_ctxdma
,
uint32_t
tt_ctxdma
);
extern
void
nouveau_channel_free
(
struct
nouveau_channel
*
);
extern
void
nouveau_channel_free
(
struct
nouveau_channel
*
);
extern
int
nouveau_channel_idle
(
struct
nouveau_channel
*
chan
);
/* nouveau_object.c */
/* nouveau_object.c */
extern
int
nouveau_gpuobj_early_init
(
struct
drm_device
*
);
extern
int
nouveau_gpuobj_early_init
(
struct
drm_device
*
);
...
...
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