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
ea5f2786
Commit
ea5f2786
authored
Jan 31, 2011
by
Ben Skeggs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drm/nouveau: silence some compiler warnings
Signed-off-by:
Ben Skeggs
<
bskeggs@redhat.com
>
parent
cb1d771a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
2 additions
and
9 deletions
+2
-9
drivers/gpu/drm/nouveau/nouveau_channel.c
drivers/gpu/drm/nouveau/nouveau_channel.c
+1
-1
drivers/gpu/drm/nouveau/nouveau_dp.c
drivers/gpu/drm/nouveau/nouveau_dp.c
+0
-2
drivers/gpu/drm/nouveau/nv50_display.c
drivers/gpu/drm/nouveau/nv50_display.c
+1
-1
drivers/gpu/drm/nouveau/nv50_gpio.c
drivers/gpu/drm/nouveau/nv50_gpio.c
+0
-2
drivers/gpu/drm/nouveau/nv50_vm.c
drivers/gpu/drm/nouveau/nv50_vm.c
+0
-1
drivers/gpu/drm/nouveau/nvc0_graph.c
drivers/gpu/drm/nouveau/nvc0_graph.c
+0
-2
No files found.
drivers/gpu/drm/nouveau/nouveau_channel.c
View file @
ea5f2786
...
@@ -35,7 +35,7 @@ nouveau_channel_pushbuf_ctxdma_init(struct nouveau_channel *chan)
...
@@ -35,7 +35,7 @@ nouveau_channel_pushbuf_ctxdma_init(struct nouveau_channel *chan)
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
nouveau_bo
*
pb
=
chan
->
pushbuf_bo
;
struct
nouveau_bo
*
pb
=
chan
->
pushbuf_bo
;
struct
nouveau_gpuobj
*
pushbuf
=
NULL
;
struct
nouveau_gpuobj
*
pushbuf
=
NULL
;
int
ret
;
int
ret
=
0
;
if
(
dev_priv
->
card_type
>=
NV_50
)
{
if
(
dev_priv
->
card_type
>=
NV_50
)
{
if
(
dev_priv
->
card_type
<
NV_C0
)
{
if
(
dev_priv
->
card_type
<
NV_C0
)
{
...
...
drivers/gpu/drm/nouveau/nouveau_dp.c
View file @
ea5f2786
...
@@ -175,7 +175,6 @@ nouveau_dp_link_train_adjust(struct drm_encoder *encoder, uint8_t *config)
...
@@ -175,7 +175,6 @@ nouveau_dp_link_train_adjust(struct drm_encoder *encoder, uint8_t *config)
{
{
struct
nouveau_encoder
*
nv_encoder
=
nouveau_encoder
(
encoder
);
struct
nouveau_encoder
*
nv_encoder
=
nouveau_encoder
(
encoder
);
struct
drm_device
*
dev
=
encoder
->
dev
;
struct
drm_device
*
dev
=
encoder
->
dev
;
struct
bit_displayport_encoder_table_entry
*
dpse
;
struct
bit_displayport_encoder_table
*
dpe
;
struct
bit_displayport_encoder_table
*
dpe
;
int
ret
,
i
,
dpe_headerlen
,
vs
=
0
,
pre
=
0
;
int
ret
,
i
,
dpe_headerlen
,
vs
=
0
,
pre
=
0
;
uint8_t
request
[
2
];
uint8_t
request
[
2
];
...
@@ -183,7 +182,6 @@ nouveau_dp_link_train_adjust(struct drm_encoder *encoder, uint8_t *config)
...
@@ -183,7 +182,6 @@ nouveau_dp_link_train_adjust(struct drm_encoder *encoder, uint8_t *config)
dpe
=
nouveau_bios_dp_table
(
dev
,
nv_encoder
->
dcb
,
&
dpe_headerlen
);
dpe
=
nouveau_bios_dp_table
(
dev
,
nv_encoder
->
dcb
,
&
dpe_headerlen
);
if
(
!
dpe
)
if
(
!
dpe
)
return
false
;
return
false
;
dpse
=
(
void
*
)((
char
*
)
dpe
+
dpe_headerlen
);
ret
=
auxch_rd
(
encoder
,
DP_ADJUST_REQUEST_LANE0_1
,
request
,
2
);
ret
=
auxch_rd
(
encoder
,
DP_ADJUST_REQUEST_LANE0_1
,
request
,
2
);
if
(
ret
)
if
(
ret
)
...
...
drivers/gpu/drm/nouveau/nv50_display.c
View file @
ea5f2786
...
@@ -587,7 +587,7 @@ static void
...
@@ -587,7 +587,7 @@ static void
nv50_display_unk20_handler
(
struct
drm_device
*
dev
)
nv50_display_unk20_handler
(
struct
drm_device
*
dev
)
{
{
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
u32
unk30
=
nv_rd32
(
dev
,
0x610030
),
tmp
,
pclk
,
script
,
mc
;
u32
unk30
=
nv_rd32
(
dev
,
0x610030
),
tmp
,
pclk
,
script
,
mc
=
0
;
struct
dcb_entry
*
dcb
;
struct
dcb_entry
*
dcb
;
int
i
,
crtc
,
or
,
type
=
OUTPUT_ANY
;
int
i
,
crtc
,
or
,
type
=
OUTPUT_ANY
;
...
...
drivers/gpu/drm/nouveau/nv50_gpio.c
View file @
ea5f2786
...
@@ -205,7 +205,6 @@ nv50_gpio_init(struct drm_device *dev)
...
@@ -205,7 +205,6 @@ nv50_gpio_init(struct drm_device *dev)
{
{
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
nouveau_gpio_engine
*
pgpio
=
&
dev_priv
->
engine
.
gpio
;
struct
nouveau_gpio_engine
*
pgpio
=
&
dev_priv
->
engine
.
gpio
;
struct
nv50_gpio_priv
*
priv
;
int
ret
;
int
ret
;
if
(
!
pgpio
->
priv
)
{
if
(
!
pgpio
->
priv
)
{
...
@@ -213,7 +212,6 @@ nv50_gpio_init(struct drm_device *dev)
...
@@ -213,7 +212,6 @@ nv50_gpio_init(struct drm_device *dev)
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
}
}
priv
=
pgpio
->
priv
;
/* disable, and ack any pending gpio interrupts */
/* disable, and ack any pending gpio interrupts */
nv_wr32
(
dev
,
0xe050
,
0x00000000
);
nv_wr32
(
dev
,
0xe050
,
0x00000000
);
...
...
drivers/gpu/drm/nouveau/nv50_vm.c
View file @
ea5f2786
...
@@ -31,7 +31,6 @@ void
...
@@ -31,7 +31,6 @@ void
nv50_vm_map_pgt
(
struct
nouveau_gpuobj
*
pgd
,
u32
pde
,
nv50_vm_map_pgt
(
struct
nouveau_gpuobj
*
pgd
,
u32
pde
,
struct
nouveau_gpuobj
*
pgt
[
2
])
struct
nouveau_gpuobj
*
pgt
[
2
])
{
{
struct
drm_nouveau_private
*
dev_priv
=
pgd
->
dev
->
dev_private
;
u64
phys
=
0xdeadcafe00000000ULL
;
u64
phys
=
0xdeadcafe00000000ULL
;
u32
coverage
=
0
;
u32
coverage
=
0
;
...
...
drivers/gpu/drm/nouveau/nvc0_graph.c
View file @
ea5f2786
...
@@ -640,7 +640,6 @@ nvc0_graph_init(struct drm_device *dev)
...
@@ -640,7 +640,6 @@ nvc0_graph_init(struct drm_device *dev)
{
{
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
drm_nouveau_private
*
dev_priv
=
dev
->
dev_private
;
struct
nouveau_pgraph_engine
*
pgraph
=
&
dev_priv
->
engine
.
graph
;
struct
nouveau_pgraph_engine
*
pgraph
=
&
dev_priv
->
engine
.
graph
;
struct
nvc0_graph_priv
*
priv
;
int
ret
;
int
ret
;
dev_priv
->
engine
.
graph
.
accel_blocked
=
true
;
dev_priv
->
engine
.
graph
.
accel_blocked
=
true
;
...
@@ -665,7 +664,6 @@ nvc0_graph_init(struct drm_device *dev)
...
@@ -665,7 +664,6 @@ nvc0_graph_init(struct drm_device *dev)
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
}
}
priv
=
pgraph
->
priv
;
nvc0_graph_init_obj418880
(
dev
);
nvc0_graph_init_obj418880
(
dev
);
nvc0_graph_init_regs
(
dev
);
nvc0_graph_init_regs
(
dev
);
...
...
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