summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYongqiang Sun2016-12-12 20:20:45 +0100
committerAlex Deucher2017-09-26 23:05:05 +0200
commit88499197de090c9bb391cc11bf9410b9f020092f (patch)
tree504eefe1bf1036c71cea04ef875d1f6a98b85cb8
parentdrm/amd/display: re gamma programming (diff)
downloadkernel-qcow2-linux-88499197de090c9bb391cc11bf9410b9f020092f.tar.gz
kernel-qcow2-linux-88499197de090c9bb391cc11bf9410b9f020092f.tar.xz
kernel-qcow2-linux-88499197de090c9bb391cc11bf9410b9f020092f.zip
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>
-rw-r--r--drivers/gpu/drm/amd/display/dc/basics/conversion.c9
-rw-r--r--drivers/gpu/drm/amd/display/dc/basics/conversion.h2
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c11
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 ebe14e17cc2e..5682fea2080d 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 18cbe41e80ff..b7fe431a7952 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 fd8a49afbec6..e9005e0048e6 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,