blob: 9454b54b49a16ec4bbd9313782044b90bb5420cd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
|
From e0aaa1acd1f33cc60e2b5c43cf6aac63bf3bbbc9 Mon Sep 17 00:00:00 2001
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
Date: Mon, 12 Jul 2021 13:06:07 +0100
Subject: [PATCH] ydrm/vc4: fkms: Fix margin calculations for the
right/bottom edges
The calculations clipped the right/bottom edge of the clipped
range based on the left/top margins.
https://github.com/raspberrypi/linux/issues/4447
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
---
drivers/gpu/drm/vc4/vc4_firmware_kms.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--- a/drivers/gpu/drm/vc4/vc4_firmware_kms.c
+++ b/drivers/gpu/drm/vc4/vc4_firmware_kms.c
@@ -458,15 +458,15 @@ static int vc4_fkms_margins_adj(struct d
plane->dst_x = DIV_ROUND_CLOSEST(plane->dst_x * adjhdisplay,
(int)crtc_state->mode.hdisplay);
plane->dst_x += left;
- if (plane->dst_x > (int)(crtc_state->mode.hdisplay - left))
- plane->dst_x = crtc_state->mode.hdisplay - left;
+ if (plane->dst_x > (int)(crtc_state->mode.hdisplay - right))
+ plane->dst_x = crtc_state->mode.hdisplay - right;
adjvdisplay = crtc_state->mode.vdisplay - (top + bottom);
plane->dst_y = DIV_ROUND_CLOSEST(plane->dst_y * adjvdisplay,
(int)crtc_state->mode.vdisplay);
plane->dst_y += top;
- if (plane->dst_y > (int)(crtc_state->mode.vdisplay - top))
- plane->dst_y = crtc_state->mode.vdisplay - top;
+ if (plane->dst_y > (int)(crtc_state->mode.vdisplay - bottom))
+ plane->dst_y = crtc_state->mode.vdisplay - bottom;
plane->dst_w = DIV_ROUND_CLOSEST(plane->dst_w * adjhdisplay,
crtc_state->mode.hdisplay);
|
