1 files changed, 12 insertions, 9 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 609eda6bcb7..2395c8600cf 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -1134,9 +1134,10 @@ radeon_add_atom_connector(struct drm_device *dev,
                 drm_connector_attach_property(&radeon_connector->base,
                                               rdev->mode_info.coherent_mode_property,
                                               1);
-                drm_connector_attach_property(&radeon_connector->base,
-                                              rdev->mode_info.underscan_property,
-                                              UNDERSCAN_AUTO);
+                if (ASIC_IS_AVIVO(rdev))
+                        drm_connector_attach_property(&radeon_connector->base,
+                                                      rdev->mode_info.underscan_property,
+                                                      UNDERSCAN_AUTO);
                 if (connector_type == DRM_MODE_CONNECTOR_DVII) {
                         radeon_connector->dac_load_detect = true;
                         drm_connector_attach_property(&radeon_connector->base,
@@ -1162,9 +1163,10 @@ radeon_add_atom_connector(struct drm_device *dev,
                 drm_connector_attach_property(&radeon_connector->base,
                                               rdev->mode_info.coherent_mode_property,
                                               1);
-                drm_connector_attach_property(&radeon_connector->base,
-                                              rdev->mode_info.underscan_property,
-                                              UNDERSCAN_AUTO);
+                if (ASIC_IS_AVIVO(rdev))
+                        drm_connector_attach_property(&radeon_connector->base,
+                                                      rdev->mode_info.underscan_property,
+                                                      UNDERSCAN_AUTO);
                 subpixel_order = SubPixelHorizontalRGB;
                 break;
         case DRM_MODE_CONNECTOR_DisplayPort:
@@ -1196,9 +1198,10 @@ radeon_add_atom_connector(struct drm_device *dev,
                 drm_connector_attach_property(&radeon_connector->base,
                                               rdev->mode_info.coherent_mode_property,
                                               1);
-                drm_connector_attach_property(&radeon_connector->base,
-                                              rdev->mode_info.underscan_property,
-                                              UNDERSCAN_AUTO);
+                if (ASIC_IS_AVIVO(rdev))
+                        drm_connector_attach_property(&radeon_connector->base,
+                                                      rdev->mode_info.underscan_property,
+                                                      UNDERSCAN_AUTO);
                 break;
         case DRM_MODE_CONNECTOR_SVIDEO:
         case DRM_MODE_CONNECTOR_Composite: