rpms/kernel
9
2
Fork 4
Code Issues Pull Requests Releases Activity

Linux v4.18-rc7-178-g0b5b1f9a78b5

Browse Source
This commit is contained in:
Laura Abbott 2018-08-04 08:22:10 +01:00
parent badc2fce52
commit 4f02a7c343
4 changed files with 6 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drm-vc4-Reset-x-y-scaling-1-when-dealing-with-uniplanar-formats.patch
View File

@ -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 <boris.brezillon@bootlin.com>
X-Patchwork-Id: 240644
Message-Id: <20180724133601.32114-1-boris.brezillon@bootlin.com>
To: Eric Anholt <eric@anholt.net>
Cc: David Airlie <airlied@linux.ie>,
Boris Brezillon <boris.brezillon@bootlin.com>, 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: <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 | 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 &&

2
gitrev
View File

@ -1 +1 @@
6b4703768268d09ac928c64474fd686adf4574f9
0b5b1f9a78b5e1bb3c3972fcd27dc013367550f8

7
kernel.spec
View File

@ -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 <labbott@redhat.com> - 4.18.0-0.rc7.git3.1
- Linux v4.18-rc7-178-g0b5b1f9a78b5
* Thu Aug 02 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc7.git2.1
- Linux v4.18-rc7-112-g6b4703768268

2
sources
View File

@ -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