diff options
| author | Yue Hin Lau <Yuehin.Lau@amd.com> | 2017-11-23 11:32:18 -0500 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2017-12-14 10:57:15 -0500 |
| commit | 493942cd250c62f459f12a3a8a45639e360f4312 (patch) | |
| tree | 649fe512d18c6d7915273f5bd0821aa7e6de7360 /drivers/gpu/drm/amd | |
| parent | 7bc6f1ca9dbe8261d05dd4b63dacc26d4229415f (diff) | |
| download | lwn-493942cd250c62f459f12a3a8a45639e360f4312.tar.gz lwn-493942cd250c62f459f12a3a8a45639e360f4312.zip | |
drm/amd/display: dpp clean up
Signed-off-by: Yue Hin Lau <Yuehin.Lau@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>
Diffstat (limited to 'drivers/gpu/drm/amd')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 4 | ||||
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c index 4c90043e7b8c..4f5125398bbc 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c @@ -49,6 +49,8 @@ #define FN(reg_name, field_name) \ dpp->tf_shift->field_name, dpp->tf_mask->field_name +#define NUM_ELEMENTS(a) (sizeof(a) / sizeof((a)[0])) + struct dcn10_input_csc_matrix { enum dc_color_space color_space; uint16_t regval[12]; @@ -270,7 +272,7 @@ void dpp1_cm_set_output_csc_default( struct dcn10_dpp *dpp = TO_DCN10_DPP(dpp_base); struct out_csc_color_matrix tbl_entry; int i, j; - int arr_size = sizeof(output_csc_matrix) / sizeof(struct output_csc_matrix); + int arr_size = NUM_ELEMENTS(output_csc_matrix); uint32_t ocsc_mode = 4; tbl_entry.color_space = colorspace; diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h index d7d027c7ae51..0f70f36a3ebe 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h @@ -131,12 +131,7 @@ struct out_csc_color_matrix { uint16_t regval[12]; }; -struct output_csc_matrix { - enum dc_color_space color_space; - uint16_t regval[12]; -}; - -static const struct output_csc_matrix output_csc_matrix[] = { +static const struct out_csc_color_matrix output_csc_matrix[] = { { COLOR_SPACE_SRGB, { 0x2000, 0, 0, 0, 0, 0x2000, 0, 0, 0, 0, 0x2000, 0} }, { COLOR_SPACE_SRGB_LIMITED, |