From 8a33d2b27da7b9e6081ac603fe8e2d7770344a06 Mon Sep 17 00:00:00 2001 From: Tony Cheng Date: Sat, 27 Feb 2016 17:33:12 -0500 Subject: [PATCH 0870/1110] drm/amd/dal: remove unused type ovl_csc_adjustment Signed-off-by: Tony Cheng Acked-by: Harry Wentland --- drivers/gpu/drm/amd/dal/dc/dc_hw_types.h | 44 +++++++++++------------ drivers/gpu/drm/amd/dal/include/video_csc_types.h | 25 ------------- 2 files changed, 22 insertions(+), 47 deletions(-) diff --git a/drivers/gpu/drm/amd/dal/dc/dc_hw_types.h b/drivers/gpu/drm/amd/dal/dc/dc_hw_types.h index 03b95e9..bfe9955 100644 --- a/drivers/gpu/drm/amd/dal/dc/dc_hw_types.h +++ b/drivers/gpu/drm/amd/dal/dc/dc_hw_types.h @@ -158,6 +158,28 @@ enum surface_pixel_format { /*grow 444 video here if necessary */ }; +/* Pixel format */ +enum pixel_format { + /*graph*/ + PIXEL_FORMAT_UNINITIALIZED, + PIXEL_FORMAT_INDEX8, + PIXEL_FORMAT_RGB565, + PIXEL_FORMAT_ARGB8888, + PIXEL_FORMAT_ARGB2101010, + PIXEL_FORMAT_ARGB2101010_XRBIAS, + PIXEL_FORMAT_FP16, + /*video*/ + PIXEL_FORMAT_420BPP12, + /*end of pixel format definition*/ + PIXEL_FORMAT_INVALID, + + PIXEL_FORMAT_GRPH_BEGIN = PIXEL_FORMAT_INDEX8, + PIXEL_FORMAT_GRPH_END = PIXEL_FORMAT_FP16, + PIXEL_FORMAT_VIDEO_BEGIN = PIXEL_FORMAT_420BPP12, + PIXEL_FORMAT_VIDEO_END = PIXEL_FORMAT_420BPP12, + PIXEL_FORMAT_UNKNOWN +}; + enum tile_split_values { DC_DISPLAY_MICRO_TILING = 0x0, DC_THIN_MICRO_TILING = 0x1, @@ -321,28 +343,6 @@ struct dc_cursor_attributes { union dc_cursor_attribute_flags attribute_flags; }; -/* Pixel format */ -enum pixel_format { - /*graph*/ - PIXEL_FORMAT_UNINITIALIZED, - PIXEL_FORMAT_INDEX8, - PIXEL_FORMAT_RGB565, - PIXEL_FORMAT_ARGB8888, - PIXEL_FORMAT_ARGB2101010, - PIXEL_FORMAT_ARGB2101010_XRBIAS, - PIXEL_FORMAT_FP16, - /*video*/ - PIXEL_FORMAT_420BPP12, - /*end of pixel format definition*/ - PIXEL_FORMAT_INVALID, - - PIXEL_FORMAT_GRPH_BEGIN = PIXEL_FORMAT_INDEX8, - PIXEL_FORMAT_GRPH_END = PIXEL_FORMAT_FP16, - PIXEL_FORMAT_VIDEO_BEGIN = PIXEL_FORMAT_420BPP12, - PIXEL_FORMAT_VIDEO_END = PIXEL_FORMAT_420BPP12, - PIXEL_FORMAT_UNKNOWN -}; - /* OPP */ enum dc_pixel_encoding { PIXEL_ENCODING_UNDEFINED, diff --git a/drivers/gpu/drm/amd/dal/include/video_csc_types.h b/drivers/gpu/drm/amd/dal/include/video_csc_types.h index 58dcc04..85619fc 100644 --- a/drivers/gpu/drm/amd/dal/include/video_csc_types.h +++ b/drivers/gpu/drm/amd/dal/include/video_csc_types.h @@ -81,30 +81,5 @@ union ovl_csc_flag { } bits; }; -struct ovl_csc_adjustment { - struct ovl_color_adjust_option ovl_option; - enum dc_color_depth display_color_depth; - uint32_t lb_color_depth; - enum pixel_format desktop_surface_pixel_format; - enum ovl_surface_format ovl_sf; - /* API adjustment */ - struct overlay_adjust_item overlay_brightness; - struct overlay_adjust_item overlay_gamma; - struct overlay_adjust_item overlay_contrast; - struct overlay_adjust_item overlay_saturation; - struct overlay_adjust_item overlay_hue; /* unit in degree from API. */ - int32_t f_temperature[TEMPERATURE_MATRIX_SIZE]; - uint32_t temperature_divider; - /* OEM/Application matrix related. */ - int32_t matrix[MAXTRIX_SIZE_WITH_OFFSET]; - uint32_t matrix_divider; - - /* DCE50 parameters */ - enum overlay_gamma_adjust adjust_gamma_type; - enum overlay_csc_adjust_type adjust_csc_type; - enum overlay_gamut_adjust_type adjust_gamut_type; - union ovl_csc_flag flag; - -}; #endif -- 2.7.4