Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 264363
b: refs/heads/master
c: 3a6dea3
h: refs/heads/master
i:
  264361: 394990f
  264359: 0589256
v: v3
  • Loading branch information
Alex Deucher authored and Dave Airlie committed Oct 18, 2011
1 parent 88094b5 commit 26ef541
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e22469ca88a8f1f6fe47adbf5e5ce0906aec07cd
refs/heads/master: 3a6dea31453a101bd5e9e9c89a79f4fcb6b0342e
13 changes: 9 additions & 4 deletions trunk/drivers/gpu/drm/radeon/radeon_encoders.c
Original file line number Diff line number Diff line change
Expand Up @@ -1756,10 +1756,15 @@ static int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder)
if (ASIC_IS_DCE4(rdev)) {
dig = radeon_encoder->enc_priv;
if (ASIC_IS_DCE41(rdev)) {
if (dig->linkb)
return 1;
else
return 0;
/* ontario follows DCE4 */
if (rdev->family == CHIP_PALM) {
if (dig->linkb)
return 1;
else
return 0;
} else
/* llano follows DCE3.2 */
return radeon_crtc->crtc_id;
} else {
switch (radeon_encoder->encoder_id) {
case ENCODER_OBJECT_ID_INTERNAL_UNIPHY:
Expand Down

0 comments on commit 26ef541

Please sign in to comment.