Skip to content

Commit 430f70d

Browse files
agd5fairlied
authored andcommitted
drm/radeon/kms: only expose underscan on avivo chips
R4xx also uses the atom add connector function, but underscan is only supported on avivo chips. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
1 parent 1297c05 commit 430f70d

File tree

2 files changed

+16
-11
lines changed

2 files changed

+16
-11
lines changed

drivers/gpu/drm/radeon/radeon_connectors.c

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1134,9 +1134,10 @@ radeon_add_atom_connector(struct drm_device *dev,
11341134
drm_connector_attach_property(&radeon_connector->base,
11351135
rdev->mode_info.coherent_mode_property,
11361136
1);
1137-
drm_connector_attach_property(&radeon_connector->base,
1138-
rdev->mode_info.underscan_property,
1139-
UNDERSCAN_AUTO);
1137+
if (ASIC_IS_AVIVO(rdev))
1138+
drm_connector_attach_property(&radeon_connector->base,
1139+
rdev->mode_info.underscan_property,
1140+
UNDERSCAN_AUTO);
11401141
if (connector_type == DRM_MODE_CONNECTOR_DVII) {
11411142
radeon_connector->dac_load_detect = true;
11421143
drm_connector_attach_property(&radeon_connector->base,
@@ -1162,9 +1163,10 @@ radeon_add_atom_connector(struct drm_device *dev,
11621163
drm_connector_attach_property(&radeon_connector->base,
11631164
rdev->mode_info.coherent_mode_property,
11641165
1);
1165-
drm_connector_attach_property(&radeon_connector->base,
1166-
rdev->mode_info.underscan_property,
1167-
UNDERSCAN_AUTO);
1166+
if (ASIC_IS_AVIVO(rdev))
1167+
drm_connector_attach_property(&radeon_connector->base,
1168+
rdev->mode_info.underscan_property,
1169+
UNDERSCAN_AUTO);
11681170
subpixel_order = SubPixelHorizontalRGB;
11691171
break;
11701172
case DRM_MODE_CONNECTOR_DisplayPort:
@@ -1196,9 +1198,10 @@ radeon_add_atom_connector(struct drm_device *dev,
11961198
drm_connector_attach_property(&radeon_connector->base,
11971199
rdev->mode_info.coherent_mode_property,
11981200
1);
1199-
drm_connector_attach_property(&radeon_connector->base,
1200-
rdev->mode_info.underscan_property,
1201-
UNDERSCAN_AUTO);
1201+
if (ASIC_IS_AVIVO(rdev))
1202+
drm_connector_attach_property(&radeon_connector->base,
1203+
rdev->mode_info.underscan_property,
1204+
UNDERSCAN_AUTO);
12021205
break;
12031206
case DRM_MODE_CONNECTOR_SVIDEO:
12041207
case DRM_MODE_CONNECTOR_Composite:

drivers/gpu/drm/radeon/radeon_encoders.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1708,7 +1708,8 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t su
17081708
} else {
17091709
drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS);
17101710
radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);
1711-
radeon_encoder->underscan_type = UNDERSCAN_AUTO;
1711+
if (ASIC_IS_AVIVO(rdev))
1712+
radeon_encoder->underscan_type = UNDERSCAN_AUTO;
17121713
}
17131714
drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs);
17141715
break;
@@ -1738,7 +1739,8 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t su
17381739
} else {
17391740
drm_encoder_init(dev, encoder, &radeon_atom_enc_funcs, DRM_MODE_ENCODER_TMDS);
17401741
radeon_encoder->enc_priv = radeon_atombios_set_dig_info(radeon_encoder);
1741-
radeon_encoder->underscan_type = UNDERSCAN_AUTO;
1742+
if (ASIC_IS_AVIVO(rdev))
1743+
radeon_encoder->underscan_type = UNDERSCAN_AUTO;
17421744
}
17431745
drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs);
17441746
break;

0 commit comments

Comments
 (0)