]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix build warning in queue-5.4/drm-amd-display-prevent-bandwidth-overflow.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Dec 2020 10:16:20 +0000 (11:16 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Dec 2020 10:16:20 +0000 (11:16 +0100)
queue-5.4/drm-amd-display-prevent-bandwidth-overflow.patch

index ca2575840451534dc7163b48e06df144981b553b..cade2beffa03e34f73bfe199689c38ea2d254399 100644 (file)
@@ -21,24 +21,21 @@ Reviewed-by: Wenjing Liu <Wenjing.Liu@amd.com>
 Acked-by: Eryk Brol <eryk.brol@amd.com>
 Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/gpu/drm/amd/display/dc/core/dc_link.c | +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
 
-diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_link.c b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
-index 47cefc05fd3f5..f933791f1fbbb 100644
 --- a/drivers/gpu/drm/amd/display/dc/core/dc_link.c
 +++ b/drivers/gpu/drm/amd/display/dc/core/dc_link.c
-@@ -2906,11 +2906,14 @@ uint32_t dc_bandwidth_in_kbps_from_timing(
- {
-       uint32_t bits_per_channel = 0;
-       uint32_t kbps;
-+      struct fixed31_32 link_bw_kbps;
+@@ -2909,8 +2909,12 @@ uint32_t dc_bandwidth_in_kbps_from_timin
  
  #ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT
        if (timing->flags.DSC) {
 -              kbps = (timing->pix_clk_100hz * timing->dsc_cfg.bits_per_pixel);
 -              kbps = kbps / 160 + ((kbps % 160) ? 1 : 0);
++              struct fixed31_32 link_bw_kbps;
++
 +              link_bw_kbps = dc_fixpt_from_int(timing->pix_clk_100hz);
 +              link_bw_kbps = dc_fixpt_div_int(link_bw_kbps, 160);
 +              link_bw_kbps = dc_fixpt_mul_int(link_bw_kbps, timing->dsc_cfg.bits_per_pixel);
@@ -46,6 +43,3 @@ index 47cefc05fd3f5..f933791f1fbbb 100644
                return kbps;
        }
  #endif
--- 
-2.27.0
-