Commit 5bbbc9b7 authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher

drm/amd/display: Drop AMD_EDID_UTILITY defines

We don't use this upstream in the Linux kernel.
Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarNicholas Kazlauskas <nicholas.kazlauskas@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6bb27085
...@@ -41,10 +41,8 @@ struct dc_dsc_bw_range { ...@@ -41,10 +41,8 @@ struct dc_dsc_bw_range {
struct display_stream_compressor { struct display_stream_compressor {
const struct dsc_funcs *funcs; const struct dsc_funcs *funcs;
#ifndef AMD_EDID_UTILITY
struct dc_context *ctx; struct dc_context *ctx;
int inst; int inst;
#endif
}; };
bool dc_dsc_parse_dsc_dpcd(const uint8_t *dpcd_dsc_basic_data, bool dc_dsc_parse_dsc_dpcd(const uint8_t *dpcd_dsc_basic_data,
......
...@@ -26,8 +26,6 @@ ...@@ -26,8 +26,6 @@
#ifndef DC_HW_TYPES_H #ifndef DC_HW_TYPES_H
#define DC_HW_TYPES_H #define DC_HW_TYPES_H
#ifndef AMD_EDID_UTILITY
#include "os_types.h" #include "os_types.h"
#include "fixed31_32.h" #include "fixed31_32.h"
#include "signal_types.h" #include "signal_types.h"
...@@ -584,8 +582,6 @@ struct scaling_taps { ...@@ -584,8 +582,6 @@ struct scaling_taps {
bool integer_scaling; bool integer_scaling;
}; };
#endif /* AMD_EDID_UTILITY */
enum dc_timing_standard { enum dc_timing_standard {
DC_TIMING_STANDARD_UNDEFINED, DC_TIMING_STANDARD_UNDEFINED,
DC_TIMING_STANDARD_DMT, DC_TIMING_STANDARD_DMT,
...@@ -742,8 +738,6 @@ struct dc_crtc_timing { ...@@ -742,8 +738,6 @@ struct dc_crtc_timing {
struct dc_dsc_config dsc_cfg; struct dc_dsc_config dsc_cfg;
}; };
#ifndef AMD_EDID_UTILITY
enum trigger_delay { enum trigger_delay {
TRIGGER_DELAY_NEXT_PIXEL = 0, TRIGGER_DELAY_NEXT_PIXEL = 0,
TRIGGER_DELAY_NEXT_LINE, TRIGGER_DELAY_NEXT_LINE,
...@@ -837,7 +831,5 @@ struct tg_color { ...@@ -837,7 +831,5 @@ struct tg_color {
uint16_t color_b_cb; uint16_t color_b_cb;
}; };
#endif /* AMD_EDID_UTILITY */
#endif /* DC_HW_TYPES_H */ #endif /* DC_HW_TYPES_H */
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#ifndef DC_TYPES_H_ #ifndef DC_TYPES_H_
#define DC_TYPES_H_ #define DC_TYPES_H_
#ifndef AMD_EDID_UTILITY
/* AND EdidUtility only needs a portion /* AND EdidUtility only needs a portion
* of this file, including the rest only * of this file, including the rest only
* causes additional issues. * causes additional issues.
...@@ -781,9 +780,6 @@ struct dc_clock_config { ...@@ -781,9 +780,6 @@ struct dc_clock_config {
uint32_t current_clock_khz;/*current clock in use*/ uint32_t current_clock_khz;/*current clock in use*/
}; };
#endif /*AMD_EDID_UTILITY*/
//AMD EDID UTILITY does not need any of the above structures
/* DSC DPCD capabilities */ /* DSC DPCD capabilities */
union dsc_slice_caps1 { union dsc_slice_caps1 {
struct { struct {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment