From 4f02a7c3431bce5632fa915615fa4d9ca748b06a Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Sat, 4 Aug 2018 08:22:10 +0100 Subject: Linux v4.18-rc7-178-g0b5b1f9a78b5 --- ...ing-1-when-dealing-with-uniplanar-formats.patch | 40 ---------------------- gitrev | 2 +- kernel.spec | 7 ++-- sources | 2 +- 4 files changed, 6 insertions(+), 45 deletions(-) delete mode 100644 drm-vc4-Reset-x-y-scaling-1-when-dealing-with-uniplanar-formats.patch diff --git a/drm-vc4-Reset-x-y-scaling-1-when-dealing-with-uniplanar-formats.patch b/drm-vc4-Reset-x-y-scaling-1-when-dealing-with-uniplanar-formats.patch deleted file mode 100644 index dd773ff63..000000000 --- a/drm-vc4-Reset-x-y-scaling-1-when-dealing-with-uniplanar-formats.patch +++ /dev/null @@ -1,40 +0,0 @@ -From patchwork Tue Jul 24 13:36:01 2018 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: drm/vc4: Reset ->{x, y}_scaling[1] when dealing with uniplanar formats -From: Boris Brezillon -X-Patchwork-Id: 240644 -Message-Id: <20180724133601.32114-1-boris.brezillon@bootlin.com> -To: Eric Anholt -Cc: David Airlie , - Boris Brezillon , stable@vger.kernel.org, - dri-devel@lists.freedesktop.org -Date: Tue, 24 Jul 2018 15:36:01 +0200 - -This is needed to ensure ->is_unity is correct when the plane was -previously configured to output a multi-planar format with scaling -enabled, and is then being reconfigured to output a uniplanar format. - -Fixes: fc04023fafec ("drm/vc4: Add support for YUV planes.") -Cc: -Signed-off-by: Boris Brezillon -Reviewed-by: Eric Anholt ---- - drivers/gpu/drm/vc4/vc4_plane.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c -index 9d7a36f148cf..cfb50fedfa2b 100644 ---- a/drivers/gpu/drm/vc4/vc4_plane.c -+++ b/drivers/gpu/drm/vc4/vc4_plane.c -@@ -320,6 +320,9 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state) - vc4_state->x_scaling[0] = VC4_SCALING_TPZ; - if (vc4_state->y_scaling[0] == VC4_SCALING_NONE) - vc4_state->y_scaling[0] = VC4_SCALING_TPZ; -+ } else { -+ vc4_state->x_scaling[1] = VC4_SCALING_NONE; -+ vc4_state->y_scaling[1] = VC4_SCALING_NONE; - } - - vc4_state->is_unity = (vc4_state->x_scaling[0] == VC4_SCALING_NONE && diff --git a/gitrev b/gitrev index e84f35724..031cedf22 100644 --- a/gitrev +++ b/gitrev @@ -1 +1 @@ -6b4703768268d09ac928c64474fd686adf4574f9 +0b5b1f9a78b5e1bb3c3972fcd27dc013367550f8 diff --git a/kernel.spec b/kernel.spec index 5675e5226..7721f1ad4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %global rcrev 7 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -602,8 +602,6 @@ Patch331: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch Patch332: bcm2835-hwmon-Add-support-for-RPi-voltage-sensor.patch -# https://patchwork.freedesktop.org/patch/240644/ -Patch333: drm-vc4-Reset-x-y-scaling-1-when-dealing-with-uniplanar-formats.patch # https://patchwork.freedesktop.org/patch/240917/ Patch334: drm-vc4-Fix-the-no-scaling-case-on-multi-planar-YUV-formats.patch @@ -1908,6 +1906,9 @@ fi # # %changelog +* Sat Aug 04 2018 Laura Abbott - 4.18.0-0.rc7.git3.1 +- Linux v4.18-rc7-178-g0b5b1f9a78b5 + * Thu Aug 02 2018 Laura Abbott - 4.18.0-0.rc7.git2.1 - Linux v4.18-rc7-112-g6b4703768268 diff --git a/sources b/sources index 6365f915b..8095a6fa5 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db SHA512 (patch-4.18-rc7.xz) = 5a14316adf35dbef37d9900a031924bd84aadc8e2069f96d2e0b25d908598c53c6290abd0677a8018fee378e1b31dda36df9ee524d684a8fa3f0ce942b8e8eb8 -SHA512 (patch-4.18-rc7-git2.xz) = c87dd59cfb1485c4a5ac1f2ff6915a8dbd79578cd9ca1402dde9d8f16d513024aa0f667f81496e9a6adc5bdc87c3a6dd7fc4561aa3491d317b639432ff118aef +SHA512 (patch-4.18-rc7-git3.xz) = e55c81db050834e5c801e48159c7196341bfb9e5b665feb87ffddde5cd086a4e6d60ba390202552fee3ff4720cc6f6a777842486ad3254eaa2a4f78f2dcfbfa4 -- cgit From e69190de9902bcc668721d853272c964541bdf09 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Mon, 6 Aug 2018 09:35:57 +0200 Subject: Disable debugging options. --- kernel.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel.spec b/kernel.spec index 7721f1ad4..aed480dd5 100644 --- a/kernel.spec +++ b/kernel.spec @@ -122,7 +122,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # Kernel headers are being split out into a separate package %define with_headers 0 @@ -1906,6 +1906,9 @@ fi # # %changelog +* Mon Aug 06 2018 Laura Abbott +- Disable debugging options. + * Sat Aug 04 2018 Laura Abbott - 4.18.0-0.rc7.git3.1 - Linux v4.18-rc7-178-g0b5b1f9a78b5 -- cgit From 581efe4e7e1cc6faa17a776df09aea3a941c0089 Mon Sep 17 00:00:00 2001 From: Laura Abbott Date: Mon, 6 Aug 2018 09:39:56 +0200 Subject: Linux v4.18-rc8 --- kernel.spec | 7 +++++-- sources | 3 +-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kernel.spec b/kernel.spec index aed480dd5..3a2ed4244 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,9 +67,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%global rcrev 7 +%global rcrev 8 # The git snapshot level -%define gitrev 3 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -1906,6 +1906,9 @@ fi # # %changelog +* Mon Aug 06 2018 Laura Abbott - 4.18.0-0.rc8.git0.1 +- Linux v4.18-rc8 + * Mon Aug 06 2018 Laura Abbott - Disable debugging options. diff --git a/sources b/sources index 8095a6fa5..3df3873ae 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db -SHA512 (patch-4.18-rc7.xz) = 5a14316adf35dbef37d9900a031924bd84aadc8e2069f96d2e0b25d908598c53c6290abd0677a8018fee378e1b31dda36df9ee524d684a8fa3f0ce942b8e8eb8 -SHA512 (patch-4.18-rc7-git3.xz) = e55c81db050834e5c801e48159c7196341bfb9e5b665feb87ffddde5cd086a4e6d60ba390202552fee3ff4720cc6f6a777842486ad3254eaa2a4f78f2dcfbfa4 +SHA512 (patch-4.18-rc8.xz) = 59a5ae81037f60372dcbdb64e47750cae0a19d8d5e99aeba01d7ebc7121715890ed9c2ef90a264356ed06eac4a15067e89add148a3c667713a17b105bd51e40b -- cgit