diff mbox series

drm/amd/display: rewrite the check for mods

Message ID 20221117073258.21214-1-jiasheng@iscas.ac.cn (mailing list archive)
State New, archived
Headers show
Series drm/amd/display: rewrite the check for mods | expand

Commit Message

Jiasheng Jiang Nov. 17, 2022, 7:32 a.m. UTC 
When the *mods is NULL, it should be better to return error immediately,
rather than continue with redundant operations.

Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn>
---
 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Simon Ser Nov. 17, 2022, 7:56 a.m. UTC | #1 
This breaks the "size" out-parameter.
diff mbox series

Patch

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
index e6854f7270a6..05efc76b2226 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
@@ -638,11 +638,14 @@  static int get_plane_modifiers(struct amdgpu_device *adev, unsigned int plane_ty
 		return 0;
 
 	*mods = kmalloc(capacity * sizeof(uint64_t), GFP_KERNEL);
+	if (!*mods)
+		return -ENOMEM;
+
 
 	if (plane_type == DRM_PLANE_TYPE_CURSOR) {
 		add_modifier(mods, &size, &capacity, DRM_FORMAT_MOD_LINEAR);
 		add_modifier(mods, &size, &capacity, DRM_FORMAT_MOD_INVALID);
-		return *mods ? 0 : -ENOMEM;
+		return 0;
 	}
 
 	switch (adev->family) {
@@ -671,9 +674,6 @@  static int get_plane_modifiers(struct amdgpu_device *adev, unsigned int plane_ty
 	/* INVALID marks the end of the list. */
 	add_modifier(mods, &size, &capacity, DRM_FORMAT_MOD_INVALID);
 
-	if (!*mods)
-		return -ENOMEM;
-
 	return 0;
 }