drm: radeon&amdgpu block resolution

block resolution 1600x1200 for oland in radeon&amdgpu

Reported-by: Yujing Ming <mingyujing@uniontech.com>
Signed-off-by: hongao <hongao@uniontech.com>
Signed-off-by: luozhijia <luozhijia@uniontech.com>
Signed-off-by: WangYuli <wangyuli@uniontech.com>

Author: hongaoo

drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c

@@ -864,12 +864,25 @@ static enum drm_mode_status amdgpu_connector_vga_mode_valid(struct drm_connector
 {
 	struct drm_device *dev = connector->dev;
 	struct amdgpu_device *adev = drm_to_adev(dev);
+	struct edid *edid = amdgpu_connector_edid(connector);
 
 	/* XXX check mode bandwidth */
 
 	if ((mode->clock / 10) > adev->clock.max_pixel_clock)
 		return MODE_CLOCK_HIGH;
 
+	/* Monitor ViewSonic include resolution 1600x1200 which is buggly,
+	 * GPU scaling with "Full" and "Full aspect" will cause screen flicker,
+	 * GPU scaling with "Center" will cause screen black,
+	 * FIXME: block it directly is ugly, is there a new way to fix it?
+	 */
+	if(edid != NULL && edid->mfg_id[0] == 0x5a && edid->mfg_id[1] == 0x63)
+	{
+		if (adev->asic_type == CHIP_OLAND && mode->hdisplay == 1600 && mode->vdisplay == 1200){
+			return MODE_BAD_WIDTH;
+		}
+	}
+
 	return MODE_OK;
 }
 
@@ -1211,6 +1224,7 @@ static enum drm_mode_status amdgpu_connector_dvi_mode_valid(struct drm_connector
 	struct drm_device *dev = connector->dev;
 	struct amdgpu_device *adev = drm_to_adev(dev);
 	struct amdgpu_connector *amdgpu_connector = to_amdgpu_connector(connector);
+	struct edid *edid = amdgpu_connector_edid(connector);
 
 	/* XXX check mode bandwidth */
 
@@ -1230,6 +1244,18 @@ static enum drm_mode_status amdgpu_connector_dvi_mode_valid(struct drm_connector
 		}
 	}
 
+	/* Monitor ViewSonic include resolution 1600x1200 which is buggly,
+	 * GPU scaling with "Full" and "Full aspect" will cause screen flicker,
+	 * GPU scaling with "Center" will cause screen black,
+	 * FIXME: block it directly is ugly, is there a new way to fix it?
+	 */
+	if(edid != NULL && edid->mfg_id[0] == 0x5a && edid->mfg_id[1] == 0x63)
+	{
+		if (adev->asic_type == CHIP_OLAND && mode->hdisplay == 1600 && mode->vdisplay == 1200){
+			return MODE_BAD_WIDTH;
+		}
+	}
+
 	/* check against the max pixel clock */
 	if ((mode->clock / 10) > adev->clock.max_pixel_clock)
 		return MODE_CLOCK_HIGH;

drivers/gpu/drm/radeon/radeon_connectors.c

@@ -984,12 +984,25 @@ static enum drm_mode_status radeon_vga_mode_valid(struct drm_connector *connecto
 {
 	struct drm_device *dev = connector->dev;
 	struct radeon_device *rdev = dev->dev_private;
+	struct edid *edid = radeon_connector_edid(connector);
 
 	/* XXX check mode bandwidth */
 
 	if ((mode->clock / 10) > rdev->clock.max_pixel_clock)
 		return MODE_CLOCK_HIGH;
 
+	/* Monitor ViewSonic include resolution 1600x1200 which is buggly,
+	 * GPU scaling with "Full" and "Full aspect" will cause screen flicker,
+	 * GPU scaling with "Center" will cause screen black,
+	 * FIXME: block it directly is ugly, is there a new way to fix it?
+	 */
+	if(edid != NULL && edid->mfg_id[0] == 0x5a && edid->mfg_id[1] == 0x63)
+	{
+		if (ASIC_IS_DCE64(rdev) && mode->hdisplay == 1600 && mode->vdisplay == 1200){
+			return MODE_BAD_WIDTH;
+		}
+	}
+
 	return MODE_OK;
 }
 
@@ -1464,6 +1477,7 @@ static enum drm_mode_status radeon_dvi_mode_valid(struct drm_connector *connecto
 	struct drm_device *dev = connector->dev;
 	struct radeon_device *rdev = dev->dev_private;
 	struct radeon_connector *radeon_connector = to_radeon_connector(connector);
+	struct edid *edid = radeon_connector_edid(connector);
 
 	/* XXX check mode bandwidth */
 
@@ -1493,6 +1507,18 @@ static enum drm_mode_status radeon_dvi_mode_valid(struct drm_connector *connecto
 	if ((mode->clock / 10) > rdev->clock.max_pixel_clock)
 		return MODE_CLOCK_HIGH;
 
+	/* Monitor ViewSonic include resolution 1600x1200 which is buggly,
+	 * GPU scaling with "Full" and "Full aspect" will cause screen flicker,
+	 * GPU scaling with "Center" will cause screen black,
+	 * FIXME: block it directly is ugly, is there a new way to fix it?
+	 */
+	if(edid != NULL && edid->mfg_id[0] == 0x5a && edid->mfg_id[1] == 0x63)
+	{
+		if (ASIC_IS_DCE64(rdev) && mode->hdisplay == 1600 && mode->vdisplay == 1200){
+			return MODE_BAD_WIDTH;
+		}
+	}
+
 	return MODE_OK;
 }