blob: d13154bb3ba31cb1eb13a25b574b560e66c49eb8 (
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
|
From 8c709f5c43f3a51871847104fccc507afb6586a4 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 3 Oct 2017 13:49:42 +1000
Subject: [PATCH 2449/4131] amdgpu/dc: use kernel ilog2 for log_2.
This should produce the same result.
Signed-off-by: Dave Airlie <airlied@redhat.com>
---
drivers/gpu/drm/amd/display/dc/basics/conversion.c | 10 ----------
drivers/gpu/drm/amd/display/dc/basics/conversion.h | 5 ++++-
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/amd/display/dc/basics/conversion.c b/drivers/gpu/drm/amd/display/dc/basics/conversion.c
index a2e22ae..23c9a0e 100644
--- a/drivers/gpu/drm/amd/display/dc/basics/conversion.c
+++ b/drivers/gpu/drm/amd/display/dc/basics/conversion.c
@@ -102,13 +102,3 @@ void convert_float_matrix(
matrix[i] = (uint16_t)reg_value;
}
}
-
-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 189325f..ade785c 100644
--- a/drivers/gpu/drm/amd/display/dc/basics/conversion.h
+++ b/drivers/gpu/drm/amd/display/dc/basics/conversion.h
@@ -38,6 +38,9 @@ void convert_float_matrix(
struct fixed31_32 *flt,
uint32_t buffer_size);
-unsigned int log_2(unsigned int num);
+static inline unsigned int log_2(unsigned int num)
+{
+ return ilog2(num);
+}
#endif
--
2.7.4
|
