X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fchunkeey.git;a=blobdiff_plain;f=target%2Flinux%2Fbcm27xx%2Fpatches-5.10%2F950-0204-drm-Checking-of-the-pitch-is-only-valid-for-linear-f.patch;fp=target%2Flinux%2Fbcm27xx%2Fpatches-5.10%2F950-0204-drm-Checking-of-the-pitch-is-only-valid-for-linear-f.patch;h=0000000000000000000000000000000000000000;hp=44e064870076973e9a3a14059f53eb22757ff12e;hb=d5c4f24b2af991df2ec24df1a3f906049370f59f;hpb=99ad84b6d9727a63f99a16e0b8386747262e3433 diff --git a/target/linux/bcm27xx/patches-5.10/950-0204-drm-Checking-of-the-pitch-is-only-valid-for-linear-f.patch b/target/linux/bcm27xx/patches-5.10/950-0204-drm-Checking-of-the-pitch-is-only-valid-for-linear-f.patch deleted file mode 100644 index 44e0648700..0000000000 --- a/target/linux/bcm27xx/patches-5.10/950-0204-drm-Checking-of-the-pitch-is-only-valid-for-linear-f.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c24a6aef5b7ef24fb5c6f83ada015b06bcc3c665 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)) {