aboutsummaryrefslogtreecommitdiffstats
path: root/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3021-drm-amd-display-Set-default-block_size-even-in-unexp.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3021-drm-amd-display-Set-default-block_size-even-in-unexp.patch')
-rw-r--r--meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3021-drm-amd-display-Set-default-block_size-even-in-unexp.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3021-drm-amd-display-Set-default-block_size-even-in-unexp.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3021-drm-amd-display-Set-default-block_size-even-in-unexp.patch
new file mode 100644
index 00000000..a54e57ca
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/3021-drm-amd-display-Set-default-block_size-even-in-unexp.patch
@@ -0,0 +1,45 @@
+From a184885fe5c3b08ddd60f516c38e1637c657bbdb Mon Sep 17 00:00:00 2001
+From: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
+Date: Tue, 4 Jun 2019 14:48:33 -0400
+Subject: [PATCH 3021/4256] drm/amd/display: Set default block_size, even in
+ unexpected cases
+
+We're not expected to enter the default case, but not returning a
+default value here is incorrect.
+
+Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
+Reviewed-by: Eric Bernstein <Eric.Bernstein@amd.com>
+Acked-by: Leo Li <sunpeng.li@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 1 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c
+index c72a9ff57f15..6e2dbd03f9bf 100644
+--- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c
++++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c
+@@ -337,6 +337,7 @@ static enum dcn_hubbub_page_table_block_size page_table_block_size_to_hw(unsigne
+ break;
+ default:
+ ASSERT(false);
++ block_size = page_table_block_size;
+ break;
+ }
+
+diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h b/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h
+index 1ea505f7a05a..9502478c4a1b 100644
+--- a/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h
++++ b/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h
+@@ -62,7 +62,7 @@ enum dcn_hubbub_page_table_depth {
+
+ enum dcn_hubbub_page_table_block_size {
+ DCN_PAGE_TABLE_BLOCK_SIZE_4KB = 0,
+- DCN_PAGE_TABLE_BLOCK_SIZE_64KB = 4
++ DCN_PAGE_TABLE_BLOCK_SIZE_64KB = 4,
+ };
+
+ struct dcn_hubbub_phys_addr_config {
+--
+2.17.1
+