From c91c830dadeb9034be48164d47e8dc7b8a1df2b9 Mon Sep 17 00:00:00 2001
From: graysky <graysky@archlinux.us>
Date: Tue, 23 Mar 2021 11:44:39 -0400
Subject: [PATCH] core/linux-raspberrypi4: upstream mainlined these two patches

---
 core/linux-raspberrypi4/PKGBUILD | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/core/linux-raspberrypi4/PKGBUILD b/core/linux-raspberrypi4/PKGBUILD
index 41f796b80..026ec8585 100644
--- a/core/linux-raspberrypi4/PKGBUILD
+++ b/core/linux-raspberrypi4/PKGBUILD
@@ -6,7 +6,7 @@
 buildarch=12
 
 pkgbase=linux-raspberrypi4
-_commit=b62f64b7df524956bef0c09566a04eec883c3214
+_commit=e1499baa0b0c4b91f0f149421a212746739b93c2
 _srcname=linux-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="Raspberry Pi 4"
@@ -23,19 +23,15 @@ source=("https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz"
         '60-linux.hook'
         '90-linux.hook'
         0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch
-        0002-vc4-drm-vc4_plane-remove-subpixel-positioning-check.patch::https://patch-diff.githubusercontent.com/raw/raspberrypi/linux/pull/4215.patch
-        0003-vc4-drm-fix-source-offsets-with-drm_format_p030.patch::https://github.com/popcornmix/linux/commit/6f33f7fa8b60700a96a8fbd497efeb5c2e8bf2b9.patch
         )
 source_armv7h=('config' 'config.txt')
 source_aarch64=('config8' 'config8.txt')
-md5sums=('a4f3c64c40de2442cc06dc1e4ae6d9e9'
+md5sums=('b17fe250e62993bf5b3b6f3200527c1f'
          '31c02f4518d46deb5f0c2ad1f8b083cd'
          '86d4a35722b5410e3b29fc92dae15d4b'
          'ce6c81ad1ad1f8b333fd6077d47abdaf'
          '441ec084c47cddc53e592fb0cbce4edf'
-         'f66a7ea3feb708d398ef57e4da4815e9'
-         'ce0949a5704dfcddc25382118600e813'
-         '021c743bd96a27100c786ba10a202ceb')
+         'f66a7ea3feb708d398ef57e4da4815e9')
 md5sums_armv7h=('564213efed2fedecef1ea219c102cf2b'
                 '9669d916a5929a2eedbd64477f83d99e')
 md5sums_aarch64=('4e701f76ed19fb6072b3857d2ac6210c'
@@ -58,10 +54,6 @@ prepare() {
 
   # consistent behavior of lscpu on arm/arm64
   patch -Np1 -i ../0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch
-  
-  # the following fix known issues with ffmpeg/kodi HW-decoding
-  patch -Np1 -i ../0002-vc4-drm-vc4_plane-remove-subpixel-positioning-check.patch
-  patch -Np1 -i ../0003-vc4-drm-fix-source-offsets-with-drm_format_p030.patch
 }
 
 build() {