Use the macro instead of ternary operator.
Signed-off-by: Yu Jiaoliang <yujiaoli...@vivo.com>
---
drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
index b38340c690c6..5d40f61261ad 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc_resource.c
@@ -797,9 +797,9 @@ static struct rect intersect_rec(const struct rect *r0,
const struct rect *r1)
int r0_y_end = r0->y + r0->height;
int r1_y_end = r1->y + r1->height;
- rec.x = r0->x > r1->x ? r0->x : r1->x;
+ rec.x = max(r0->x, r1->x);
rec.width = r0_x_end > r1_x_end ? r1_x_end - rec.x : r0_x_end - rec.x;
- rec.y = r0->y > r1->y ? r0->y : r1->y;
+ rec.y = max(r0->y, r1->y);
rec.height = r0_y_end > r1_y_end ? r1_y_end - rec.y : r0_y_end - rec.y;
/* in case that there is no intersection */
--
2.34.1
