v4.20.1

3 files changed, 4 insertions, 46 deletions

diff --git a/bcm283x-drm-vc4-set-is_yuv-to-false-when-num_planes-1.patch b/bcm283x-drm-vc4-set-is_yuv-to-false-when-num_planes-1.patch
deleted file mode 100644
index 5aa9668bc..000000000
--- a/bcm283x-drm-vc4-set-is_yuv-to-false-when-num_planes-1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From patchwork Tue Oct  9 13:24:46 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: drm/vc4: Set ->is_yuv to false when num_planes == 1
-From: Boris Brezillon <boris.brezillon@bootlin.com>
-X-Patchwork-Id: 255528
-Message-Id: <20181009132446.21960-1-boris.brezillon@bootlin.com>
-To: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
- dri-devel@lists.freedesktop.org, Eric Anholt <eric@anholt.net>
-Cc: Boris Brezillon <boris.brezillon@bootlin.com>, stable@vger.kernel.org
-Date: Tue,  9 Oct 2018 15:24:46 +0200
-
-When vc4_plane_state is duplicated ->is_yuv is left assigned to its
-previous value, and we never set it back to false when switching to
-a non-YUV format.
-
-Fix that by setting ->is_yuv to false in the 'num_planes == 1' branch
-of the vc4_plane_setup_clipping_and_scaling() function.
-
-Fixes: fc04023fafecf ("drm/vc4: Add support for YUV planes.")
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
-Reviewed-by: Eric Anholt <eric@anholt.net>
----
- drivers/gpu/drm/vc4/vc4_plane.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c
-index d04b3c3246ba..60d5ad19cedd 100644
---- a/drivers/gpu/drm/vc4/vc4_plane.c
-+++ b/drivers/gpu/drm/vc4/vc4_plane.c
-@@ -321,6 +321,7 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state)
- 		if (vc4_state->is_unity)
- 			vc4_state->x_scaling[0] = VC4_SCALING_PPF;
- 	} else {
-+		vc4_state->is_yuv = false;
- 		vc4_state->x_scaling[1] = VC4_SCALING_NONE;
- 		vc4_state->y_scaling[1] = VC4_SCALING_NONE;
- 	}
diff --git a/kernel.spec b/kernel.spec
index 5c328088d..aee05b87b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
 %if 0%{?released_kernel}
 
 # Do we have a -stable update to apply?
-%define stable_update 1
+%define stable_update 2
 # Set rpm version accordingly
 %if 0%{?stable_update}
 %define stablerev %{stable_update}
@@ -577,8 +577,6 @@ Patch305: qcom-msm89xx-fixes.patch
 # https://patchwork.kernel.org/project/linux-mmc/list/?submitter=71861
 Patch306: arm-sdhci-esdhc-imx-fixes.patch
 
-Patch330: bcm283x-drm-vc4-set-is_yuv-to-false-when-num_planes-1.patch
-
 # https://patchwork.kernel.org/patch/10686407/
 Patch331: raspberrypi-Fix-firmware-calls-with-large-buffers.patch
 
@@ -1898,7 +1896,8 @@ fi
 #
 #
 %changelog
-* Mon Jan 14 2019 Peter Robinson <pbrobinson@fedoraproject.org>
+* Mon Jan 14 2019 Peter Robinson <pbrobinson@fedoraproject.org> 4.20.2-200
+- Linux v4.20.1
 - DT updates for Raspbery Pi
 - Update to AllWinner A64 SoC timer errata
 
diff --git a/sources b/sources
index 35806ac35..206b42b7e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (linux-4.20.tar.xz) = e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
-SHA512 (patch-4.20.1.xz) = 082cdf87ac1df876c71b82afb4c9339a7b8c3d70ed4f209b9707623827e790f54b93b5ad9a79f3ea4f88a22a3c2756f1e87d0e4f111f77cb1c622292903ba7d4
+SHA512 (patch-4.20.2.xz) = 1df1e8e92005f6a665049eea16e5c14317cc345403fea55b4a28255782a7abbfce830464bac52e762ad39253a599db6afc6789077b70234200d245dafe97687d