blob: 62482b32fa2b1acf9c35d085ee1d9e78614309af (
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
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
|
From bdb02a42867ea0140271d0efea0cbbc37553a8df Mon Sep 17 00:00:00 2001
From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Date: Wed, 10 May 2017 18:05:02 -0400
Subject: [PATCH 0425/4131] drm/amd/display: fix scaling info based surface
update type check
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/amd/display/dc/core/dc.c | 47 +++++++++-----------------------
1 file changed, 13 insertions(+), 34 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index bc98081..6d56cb0 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1122,45 +1122,24 @@ static enum surface_update_type get_plane_info_update_type(
static enum surface_update_type get_scaling_info_update_type(
const struct dc_surface_update *u)
{
- struct dc_scaling_info temp_scaling_info = { { 0 } };
-
if (!u->scaling_info)
return UPDATE_TYPE_FAST;
- /* Copy all parameters that will cause a full update
- * from current surface, the rest of the parameters
- * from provided plane configuration.
- * Perform memory compare and special validation
- * for those that can cause fast/medium updates
- */
-
- /* Full Update Parameters */
- temp_scaling_info.dst_rect = u->surface->dst_rect;
- temp_scaling_info.src_rect = u->surface->src_rect;
- temp_scaling_info.scaling_quality = u->surface->scaling_quality;
-
- /* Special validation required */
- temp_scaling_info.clip_rect = u->scaling_info->clip_rect;
-
- if (memcmp(u->scaling_info, &temp_scaling_info,
- sizeof(struct dc_scaling_info)) != 0)
+ if (u->scaling_info->src_rect.width != u->surface->src_rect.width
+ || u->scaling_info->src_rect.height != u->surface->src_rect.height
+ || u->scaling_info->clip_rect.width != u->surface->clip_rect.width
+ || u->scaling_info->clip_rect.height != u->surface->clip_rect.height
+ || u->scaling_info->dst_rect.width != u->surface->dst_rect.width
+ || u->scaling_info->dst_rect.height != u->surface->dst_rect.height)
return UPDATE_TYPE_FULL;
- /* Check Clip rectangles if not equal
- * difference is in offsets == > UPDATE_TYPE_MED
- * difference is in dimensions == > UPDATE_TYPE_FULL
- */
- if (memcmp(&u->scaling_info->clip_rect,
- &u->surface->clip_rect, sizeof(struct rect)) != 0) {
- if ((u->scaling_info->clip_rect.height ==
- u->surface->clip_rect.height) &&
- (u->scaling_info->clip_rect.width ==
- u->surface->clip_rect.width)) {
- return UPDATE_TYPE_MED;
- } else {
- return UPDATE_TYPE_FULL;
- }
- }
+ if (u->scaling_info->src_rect.x != u->surface->src_rect.x
+ || u->scaling_info->src_rect.y != u->surface->src_rect.y
+ || u->scaling_info->clip_rect.x != u->surface->clip_rect.x
+ || u->scaling_info->clip_rect.y != u->surface->clip_rect.y
+ || u->scaling_info->dst_rect.x != u->surface->dst_rect.x
+ || u->scaling_info->dst_rect.y != u->surface->dst_rect.y)
+ return UPDATE_TYPE_MED;
return UPDATE_TYPE_FAST;
}
--
2.7.4
|
