From f07e572f6447465d8938679533d604e402b0f066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Thu, 18 Feb 2021 18:04:33 +0100 Subject: bcm27xx: import latest patches from the RPi foundation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bcm2708: boot tested on RPi B+ v1.2 bcm2709: boot tested on RPi 3B v1.2 and RPi 4B v1.1 4G bcm2710: boot tested on RPi 3B v1.2 bcm2711: boot tested on RPi 4B v1.1 4G Signed-off-by: Álvaro Fernández Rojas --- ...g-of-the-pitch-is-only-valid-for-linear-f.patch | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 target/linux/bcm27xx/patches-5.4/950-0594-drm-Checking-of-the-pitch-is-only-valid-for-linear-f.patch (limited to 'target/linux/bcm27xx/patches-5.4/950-0594-drm-Checking-of-the-pitch-is-only-valid-for-linear-f.patch') diff --git a/target/linux/bcm27xx/patches-5.4/950-0594-drm-Checking-of-the-pitch-is-only-valid-for-linear-f.patch b/target/linux/bcm27xx/patches-5.4/950-0594-drm-Checking-of-the-pitch-is-only-valid-for-linear-f.patch new file mode 100644 index 0000000000..3f0aa4aa02 --- /dev/null +++ b/target/linux/bcm27xx/patches-5.4/950-0594-drm-Checking-of-the-pitch-is-only-valid-for-linear-f.patch @@ -0,0 +1,39 @@ +From 60ef8af4bc2d5f8643adbcb69bb1f52e491a96ae Mon Sep 17 00:00:00 2001 +From: Dave Stevenson +Date: Mon, 27 Jan 2020 10:22:44 +0000 +Subject: [PATCH] drm: Checking of the pitch is only valid for linear + formats + +framebuffer_check was computing a minimum pitch value and ensuring +that the provided value was greater than this. +That check is only valid if the format is linear. + +Signed-off-by: Dave Stevenson +--- + drivers/gpu/drm/drm_framebuffer.c | 16 ++++++++++------ + 1 file changed, 10 insertions(+), 6 deletions(-) + +--- a/drivers/gpu/drm/drm_framebuffer.c ++++ b/drivers/gpu/drm/drm_framebuffer.c +@@ -217,12 +217,16 @@ static int framebuffer_check(struct drm_ + if (min_pitch > UINT_MAX) + return -ERANGE; + +- if ((uint64_t) height * r->pitches[i] + r->offsets[i] > UINT_MAX) +- return -ERANGE; ++ if (r->modifier[i] == DRM_FORMAT_MOD_LINEAR) { ++ if ((uint64_t)height * r->pitches[i] + r->offsets[i] > ++ UINT_MAX) ++ return -ERANGE; + +- if (block_size && r->pitches[i] < min_pitch) { +- DRM_DEBUG_KMS("bad pitch %u for plane %d\n", r->pitches[i], i); +- return -EINVAL; ++ if (block_size && r->pitches[i] < min_pitch) { ++ DRM_DEBUG_KMS("bad pitch %u for plane %d\n", ++ r->pitches[i], i); ++ return -EINVAL; ++ } + } + + if (r->modifier[i] && !(r->flags & DRM_MODE_FB_MODIFIERS)) { -- cgit v1.2.3