git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://neil.brown.name/md
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_encoders.c
diff --git
a/drivers/gpu/drm/radeon/radeon_encoders.c
b/drivers/gpu/drm/radeon/radeon_encoders.c
index
06e413e
..
4b27efa
100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_encoders.c
+++ b/
drivers/gpu/drm/radeon/radeon_encoders.c
@@
-233,13
+233,12
@@
u16 radeon_encoder_get_dp_bridge_encoder_id(struct drm_encoder *encoder)
switch (radeon_encoder->encoder_id) {
case ENCODER_OBJECT_ID_TRAVIS:
case ENCODER_OBJECT_ID_NUTMEG:
switch (radeon_encoder->encoder_id) {
case ENCODER_OBJECT_ID_TRAVIS:
case ENCODER_OBJECT_ID_NUTMEG:
- return
true
;
+ return
radeon_encoder->encoder_id
;
default:
default:
- return
false
;
+ return
ENCODER_OBJECT_ID_NONE
;
}
}
}
}
-
- return false;
+ return ENCODER_OBJECT_ID_NONE;
}
void radeon_panel_mode_fixup(struct drm_encoder *encoder,
}
void radeon_panel_mode_fixup(struct drm_encoder *encoder,