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
|
From 02f12bfbfa185589a607ac1e454ffb6d191bc0a8 Mon Sep 17 00:00:00 2001
From: Yongqiang Sun <yongqiang.sun@amd.com>
Date: Mon, 12 Dec 2016 14:20:45 -0500
Subject: [PATCH 0062/4131] drm/amd/display: Moved swizzle parameter
translation to dc.
Signed-off-by: Yongqiang Sun <yongqiang.sun@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/basics/conversion.c | 9 +++++++++
drivers/gpu/drm/amd/display/dc/basics/conversion.h | 2 ++
drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 11 +----------
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/basics/conversion.c b/drivers/gpu/drm/amd/display/dc/basics/conversion.c
index ebe14e1..5682fea 100644
--- a/drivers/gpu/drm/amd/display/dc/basics/conversion.c
+++ b/drivers/gpu/drm/amd/display/dc/basics/conversion.c
@@ -221,3 +221,12 @@ void calculate_adjustments_y_only(
adjustments->brightness);
}
+unsigned int log_2(unsigned int num)
+{
+ unsigned int result = 0;
+
+ while ((num >>= 1) != 0)
+ result++;
+
+ return result;
+}
diff --git a/drivers/gpu/drm/amd/display/dc/basics/conversion.h b/drivers/gpu/drm/amd/display/dc/basics/conversion.h
index 18cbe41..b7fe431 100644
--- a/drivers/gpu/drm/amd/display/dc/basics/conversion.h
+++ b/drivers/gpu/drm/amd/display/dc/basics/conversion.h
@@ -48,4 +48,6 @@ void calculate_adjustments_y_only(
const struct dc_csc_adjustments *adjustments,
struct fixed31_32 *matrix);
+unsigned int log_2(unsigned int num);
+
#endif
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
index fd8a49a..e9005e0 100644
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c
@@ -25,6 +25,7 @@
#include "mem_input.h"
#include "reg_helper.h"
+#include "basics/conversion.h"
#define CTX \
mi->ctx
@@ -129,16 +130,6 @@ static bool is_vert_scan(enum dc_rotation_angle rotation)
}
}
-static unsigned int log_2(unsigned int num)
-{
- unsigned int result = 0;
-
- while ((num >>= 1) != 0)
- result++;
-
- return result;
-}
-
void dce_mem_input_program_pte_vm(struct mem_input *mi,
enum surface_pixel_format format,
union dc_tiling_info *tiling_info,
--
2.7.4
|
