diff options
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4612-drm-amd-display-Drop-AMD_EDID_UTILITY-defines.patch')
-rw-r--r-- | meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4612-drm-amd-display-Drop-AMD_EDID_UTILITY-defines.patch | 96 |
1 files changed, 96 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4612-drm-amd-display-Drop-AMD_EDID_UTILITY-defines.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4612-drm-amd-display-Drop-AMD_EDID_UTILITY-defines.patch new file mode 100644 index 00000000..fb4dfd71 --- /dev/null +++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4612-drm-amd-display-Drop-AMD_EDID_UTILITY-defines.patch @@ -0,0 +1,96 @@ +From 12d45f8bdc7c9d1d078f104da0a20788a8e3bdfc Mon Sep 17 00:00:00 2001 +From: Harry Wentland <harry.wentland@amd.com> +Date: Thu, 28 Nov 2019 11:30:10 -0500 +Subject: [PATCH 4612/4736] drm/amd/display: Drop AMD_EDID_UTILITY defines + +We don't use this upstream in the Linux kernel. + +Change-Id: I3dd29b4bd46b3493e6a0c218df048712ea665c9a +Signed-off-by: Harry Wentland <harry.wentland@amd.com> +Reviewed-by: Nicholas Kazlauskas <nicholas.kazlauskas@amd.com> +Signed-off-by: Rahul Kumar <rahul.kumar1@amd.com> +--- + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 2 -- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 8 -------- + drivers/gpu/drm/amd/display/dc/dc_types.h | 4 ---- + 3 files changed, 14 deletions(-) + +diff --git a/drivers/gpu/drm/amd/display/dc/dc_dsc.h b/drivers/gpu/drm/amd/display/dc/dc_dsc.h +index a782ae18a1c5..cc9915e545cd 100644 +--- a/drivers/gpu/drm/amd/display/dc/dc_dsc.h ++++ b/drivers/gpu/drm/amd/display/dc/dc_dsc.h +@@ -41,10 +41,8 @@ struct dc_dsc_bw_range { + + struct display_stream_compressor { + const struct dsc_funcs *funcs; +-#ifndef AMD_EDID_UTILITY + struct dc_context *ctx; + int inst; +-#endif + }; + + bool dc_dsc_parse_dsc_dpcd(const uint8_t *dpcd_dsc_basic_data, +diff --git a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h +index 86043d431d40..25c50bcab9e9 100644 +--- a/drivers/gpu/drm/amd/display/dc/dc_hw_types.h ++++ b/drivers/gpu/drm/amd/display/dc/dc_hw_types.h +@@ -26,8 +26,6 @@ + #ifndef DC_HW_TYPES_H + #define DC_HW_TYPES_H + +-#ifndef AMD_EDID_UTILITY +- + #include "os_types.h" + #include "fixed31_32.h" + #include "signal_types.h" +@@ -584,8 +582,6 @@ struct scaling_taps { + bool integer_scaling; + }; + +-#endif /* AMD_EDID_UTILITY */ +- + enum dc_timing_standard { + DC_TIMING_STANDARD_UNDEFINED, + DC_TIMING_STANDARD_DMT, +@@ -742,8 +738,6 @@ struct dc_crtc_timing { + struct dc_dsc_config dsc_cfg; + }; + +-#ifndef AMD_EDID_UTILITY +- + enum trigger_delay { + TRIGGER_DELAY_NEXT_PIXEL = 0, + TRIGGER_DELAY_NEXT_LINE, +@@ -837,7 +831,5 @@ struct tg_color { + uint16_t color_b_cb; + }; + +-#endif /* AMD_EDID_UTILITY */ +- + #endif /* DC_HW_TYPES_H */ + +diff --git a/drivers/gpu/drm/amd/display/dc/dc_types.h b/drivers/gpu/drm/amd/display/dc/dc_types.h +index 1363e8907fbf..2b92bfa28bde 100644 +--- a/drivers/gpu/drm/amd/display/dc/dc_types.h ++++ b/drivers/gpu/drm/amd/display/dc/dc_types.h +@@ -25,7 +25,6 @@ + #ifndef DC_TYPES_H_ + #define DC_TYPES_H_ + +-#ifndef AMD_EDID_UTILITY + /* AND EdidUtility only needs a portion + * of this file, including the rest only + * causes additional issues. +@@ -781,9 +780,6 @@ struct dc_clock_config { + 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 */ + union dsc_slice_caps1 { + struct { +-- +2.17.1 + |