From: Greg Kroah-Hartman Date: Mon, 30 Jan 2023 13:02:52 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v5.10.166~13 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e17f1b6f82d7cb3be1cbb96c883ee5424dd17e0;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: drm-radeon-dp-make-radeon_dp_get_dp_link_config-static.patch --- diff --git a/queue-4.14/drm-radeon-dp-make-radeon_dp_get_dp_link_config-static.patch b/queue-4.14/drm-radeon-dp-make-radeon_dp_get_dp_link_config-static.patch new file mode 100644 index 00000000000..172402395e9 --- /dev/null +++ b/queue-4.14/drm-radeon-dp-make-radeon_dp_get_dp_link_config-static.patch @@ -0,0 +1,52 @@ +From d3f04c98ead2b89887e1e3c09b26e4917bacdd9e Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Fri, 29 Sep 2017 11:35:52 -0400 +Subject: drm/radeon/dp: make radeon_dp_get_dp_link_config static +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Alex Deucher + +commit d3f04c98ead2b89887e1e3c09b26e4917bacdd9e upstream. + +It's not used outside this file any longer. + +Reviewed-by: Christian König +Signed-off-by: Alex Deucher +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/radeon/atombios_dp.c | 8 ++++---- + drivers/gpu/drm/radeon/radeon_mode.h | 4 ---- + 2 files changed, 4 insertions(+), 8 deletions(-) + +--- a/drivers/gpu/drm/radeon/atombios_dp.c ++++ b/drivers/gpu/drm/radeon/atombios_dp.c +@@ -302,10 +302,10 @@ static int convert_bpc_to_bpp(int bpc) + + /***** radeon specific DP functions *****/ + +-int radeon_dp_get_dp_link_config(struct drm_connector *connector, +- const u8 dpcd[DP_DPCD_SIZE], +- unsigned pix_clock, +- unsigned *dp_lanes, unsigned *dp_rate) ++static int radeon_dp_get_dp_link_config(struct drm_connector *connector, ++ const u8 dpcd[DP_DPCD_SIZE], ++ unsigned pix_clock, ++ unsigned *dp_lanes, unsigned *dp_rate) + { + int bpp = convert_bpc_to_bpp(radeon_get_monitor_bpc(connector)); + static const unsigned link_rates[3] = { 162000, 270000, 540000 }; +--- a/drivers/gpu/drm/radeon/radeon_mode.h ++++ b/drivers/gpu/drm/radeon/radeon_mode.h +@@ -762,10 +762,6 @@ extern u8 radeon_dp_getsinktype(struct r + extern bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector); + extern int radeon_dp_get_panel_mode(struct drm_encoder *encoder, + struct drm_connector *connector); +-extern int radeon_dp_get_dp_link_config(struct drm_connector *connector, +- const u8 *dpcd, +- unsigned pix_clock, +- unsigned *dp_lanes, unsigned *dp_rate); + extern void radeon_dp_set_rx_power_state(struct drm_connector *connector, + u8 power_state); + extern void radeon_dp_aux_init(struct radeon_connector *radeon_connector); diff --git a/queue-4.14/series b/queue-4.14/series index dbcc983004b..66041f8a2f7 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -39,3 +39,4 @@ revert-input-synaptics-switch-touchpad-on-hp-laptop-15-da3001tu-to-rmi-mode.patc x86-i8259-mark-legacy-pic-interrupts-with-irq_level.patch wifi-brcmfmac-fix-up-incorrect-4.14.y-backport-for-brcmf_fw_map_chip_to_name.patch xen-fix-up-build-warning-with-xen_init_time_ops-reference.patch +drm-radeon-dp-make-radeon_dp_get_dp_link_config-static.patch