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
952eb635
Commit
952eb635
authored
Mar 18, 2010
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau: remove some unused members from drm_nouveau_private
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
78ad0f7b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
11 deletions
+0
-11
drivers/gpu/drm/nouveau/nouveau_channel.c
drivers/gpu/drm/nouveau/nouveau_channel.c
+0
-2
drivers/gpu/drm/nouveau/nouveau_drv.h
drivers/gpu/drm/nouveau/nouveau_drv.h
+0
-9
No files found.
drivers/gpu/drm/nouveau/nouveau_channel.c
View file @
952eb635
...
@@ -142,7 +142,6 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret,
...
@@ -142,7 +142,6 @@ nouveau_channel_alloc(struct drm_device *dev, struct nouveau_channel **chan_ret,
GFP_KERNEL
);
GFP_KERNEL
);
if
(
!
dev_priv
->
fifos
[
channel
])
if
(
!
dev_priv
->
fifos
[
channel
])
return
-
ENOMEM
;
return
-
ENOMEM
;
dev_priv
->
fifo_alloc_count
++
;
chan
=
dev_priv
->
fifos
[
channel
];
chan
=
dev_priv
->
fifos
[
channel
];
INIT_LIST_HEAD
(
&
chan
->
nvsw
.
vbl_wait
);
INIT_LIST_HEAD
(
&
chan
->
nvsw
.
vbl_wait
);
INIT_LIST_HEAD
(
&
chan
->
fence
.
pending
);
INIT_LIST_HEAD
(
&
chan
->
fence
.
pending
);
...
@@ -321,7 +320,6 @@ nouveau_channel_free(struct nouveau_channel *chan)
...
@@ -321,7 +320,6 @@ nouveau_channel_free(struct nouveau_channel *chan)
iounmap
(
chan
->
user
);
iounmap
(
chan
->
user
);
dev_priv
->
fifos
[
chan
->
id
]
=
NULL
;
dev_priv
->
fifos
[
chan
->
id
]
=
NULL
;
dev_priv
->
fifo_alloc_count
--
;
kfree
(
chan
);
kfree
(
chan
);
}
}
...
...
drivers/gpu/drm/nouveau/nouveau_drv.h
View file @
952eb635
...
@@ -534,7 +534,6 @@ struct drm_nouveau_private {
...
@@ -534,7 +534,6 @@ struct drm_nouveau_private {
struct
fb_info
*
fbdev_info
;
struct
fb_info
*
fbdev_info
;
int
fifo_alloc_count
;
struct
nouveau_channel
*
fifos
[
NOUVEAU_MAX_CHANNEL_NR
];
struct
nouveau_channel
*
fifos
[
NOUVEAU_MAX_CHANNEL_NR
];
struct
nouveau_engine
engine
;
struct
nouveau_engine
engine
;
...
@@ -573,10 +572,6 @@ struct drm_nouveau_private {
...
@@ -573,10 +572,6 @@ struct drm_nouveau_private {
struct
nouveau_gpuobj
*
sg_ctxdma
;
struct
nouveau_gpuobj
*
sg_ctxdma
;
struct
page
*
sg_dummy_page
;
struct
page
*
sg_dummy_page
;
dma_addr_t
sg_dummy_bus
;
dma_addr_t
sg_dummy_bus
;
/* nottm hack */
struct
drm_ttm_backend
*
sg_be
;
unsigned
long
sg_handle
;
}
gart_info
;
}
gart_info
;
/* nv10-nv40 tiling regions */
/* nv10-nv40 tiling regions */
...
@@ -615,11 +610,7 @@ struct drm_nouveau_private {
...
@@ -615,11 +610,7 @@ struct drm_nouveau_private {
uint32_t
dac_users
[
4
];
uint32_t
dac_users
[
4
];
struct
nouveau_suspend_resume
{
struct
nouveau_suspend_resume
{
uint32_t
fifo_mode
;
uint32_t
graph_ctx_control
;
uint32_t
graph_state
;
uint32_t
*
ramin_copy
;
uint32_t
*
ramin_copy
;
uint64_t
ramin_size
;
}
susres
;
}
susres
;
struct
backlight_device
*
backlight
;
struct
backlight_device
*
backlight
;
...
...
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