1 files changed, 36 insertions, 0 deletions
diff --git a/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4295-drm-amdgpu-display-fix-mixed-declarations-and-code.patch b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4295-drm-amdgpu-display-fix-mixed-declarations-and-code.patch
new file mode 100644
index 00000000..93980f7e
--- /dev/null
+++ b/meta-amd-bsp/recipes-kernel/linux/linux-yocto-4.19.8/4295-drm-amdgpu-display-fix-mixed-declarations-and-code.patch
@@ -0,0 +1,36 @@
+From 7e9737fbdd50afa33a095132729c4a4a4c059b62 Mon Sep 17 00:00:00 2001
+From: Alex Deucher <alexander.deucher@amd.com>
+Date: Fri, 25 Oct 2019 16:03:17 -0400
+Subject: [PATCH 4295/4736] drm/amdgpu/display: fix mixed declarations and code
+
+Trivial.
+
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+ drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c
+index ff32c7380efb..987897748174 100644
+--- a/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c
++++ b/drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c
+@@ -1687,6 +1687,7 @@ static bool construct(
+ 	struct dc_context *ctx = dc->ctx;
+ 	struct irq_service_init_data init_data;
+ 	uint32_t pipe_fuses = read_pipe_fuses(ctx);
++	uint32_t num_pipes;
+ 
+ 	ctx->dc_bios->regs = &bios_regs;
+ 
+@@ -1800,7 +1801,7 @@ static bool construct(
+ 
+ 	pool->base.pp_smu = dcn21_pp_smu_create(ctx);
+ 
+-	uint32_t num_pipes = dcn2_1_ip.max_num_dpp;
++	num_pipes = dcn2_1_ip.max_num_dpp;
+ 
+ 	for (i = 0; i < dcn2_1_ip.max_num_dpp; i++)
+ 		if (pipe_fuses & 1 << i)
+-- 
+2.17.1
+