From: Bernard Zhao <bernard@vivo.com>
Date: Tue, 10 Nov 2020 08:03:13 +0000 (-0800)
Subject: amd/display/amdgpu_dm: delete same check in if condition
X-Git-Tag: v5.11-rc1~206^2^2~416
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c0e684074d573c75145d1064f92c1be615901ef;p=thirdparty%2Fkernel%2Flinux.git

amd/display/amdgpu_dm: delete same check in if condition

In function amdgpu_dm_connector_get_modes, drm_edid_is_valid
will check weather (!edid), no need to check again in the if
branch.

Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Bernard Zhao <bernard@vivo.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 16e7eb4028e2b..678bd81a9bff6 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -6846,7 +6846,7 @@ static int amdgpu_dm_connector_get_modes(struct drm_connector *connector)
 
 	encoder = amdgpu_dm_connector_to_encoder(connector);
 
-	if (!edid || !drm_edid_is_valid(edid)) {
+	if (!drm_edid_is_valid(edid)) {
 		amdgpu_dm_connector->num_modes =
 				drm_add_modes_noedid(connector, 640, 480);
 	} else {