projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux...
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
radeon
/
r600_hdmi.c
diff --git
a/drivers/gpu/drm/radeon/r600_hdmi.c
b/drivers/gpu/drm/radeon/r600_hdmi.c
index
969c275
..
82a0a4c
100644
(file)
--- a/
drivers/gpu/drm/radeon/r600_hdmi.c
+++ b/
drivers/gpu/drm/radeon/r600_hdmi.c
@@
-322,9
+322,6
@@
void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mod
struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
uint32_t offset;
struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
uint32_t offset;
- if (ASIC_IS_DCE5(rdev))
- return;
-
/* Silent, r600_hdmi_enable will raise WARN for us */
if (!dig->afmt->enabled)
return;
/* Silent, r600_hdmi_enable will raise WARN for us */
if (!dig->afmt->enabled)
return;
@@
-483,7
+480,7
@@
void r600_hdmi_enable(struct drm_encoder *encoder)
uint32_t offset;
u32 hdmi;
uint32_t offset;
u32 hdmi;
- if (ASIC_IS_DCE
5
(rdev))
+ if (ASIC_IS_DCE
6
(rdev))
return;
/* Silent, r600_hdmi_enable will raise WARN for us */
return;
/* Silent, r600_hdmi_enable will raise WARN for us */
@@
-543,7
+540,7
@@
void r600_hdmi_disable(struct drm_encoder *encoder)
struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
uint32_t offset;
struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;
uint32_t offset;
- if (ASIC_IS_DCE
5
(rdev))
+ if (ASIC_IS_DCE
6
(rdev))
return;
/* Called for ATOM_ENCODER_MODE_HDMI only */
return;
/* Called for ATOM_ENCODER_MODE_HDMI only */