aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-07-29 12:25:26 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-07-30 17:22:16 +0200
commit7ca89e11873a1b7508f7a6a4d040cb93e2dc59f6 (patch)
tree1b2655affe4b794d824b937d28f4a91c956c2b07 /target/linux/bcm27xx
parent1db4f5cba30401c0a84742bcdfc5175e8a56925f (diff)
downloadupstream-7ca89e11873a1b7508f7a6a4d040cb93e2dc59f6.tar.gz
upstream-7ca89e11873a1b7508f7a6a4d040cb93e2dc59f6.tar.bz2
upstream-7ca89e11873a1b7508f7a6a4d040cb93e2dc59f6.zip
kernel: bump 5.10 to 5.10.134
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 7be62b1187bb7e21bcdaadfc3d47713a91f05898)
Diffstat (limited to 'target/linux/bcm27xx')
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0133-spi-bcm2835-enable-shared-interrupt-support.patch2
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch4
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0527-drm-connector-Create-a-helper-to-attach-the-hdr_outp.patch2
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0528-drm-connector-Add-helper-to-compare-HDR-metadata.patch4
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0595-spi-bcm2835-Increase-the-CS-limit-to-24.patch2
-rw-r--r--target/linux/bcm27xx/patches-5.10/950-0689-drm-automatic-legacy-gamma-support.patch2
6 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/bcm27xx/patches-5.10/950-0133-spi-bcm2835-enable-shared-interrupt-support.patch b/target/linux/bcm27xx/patches-5.10/950-0133-spi-bcm2835-enable-shared-interrupt-support.patch
index ce9872f645..0cd131b51d 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0133-spi-bcm2835-enable-shared-interrupt-support.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0133-spi-bcm2835-enable-shared-interrupt-support.patch
@@ -23,7 +23,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
/* Read as many bytes as possible from FIFO */
bcm2835_rd_fifo(bs);
/* Write as many bytes as possible to FIFO */
-@@ -1329,7 +1333,8 @@ static int bcm2835_spi_probe(struct plat
+@@ -1333,7 +1337,8 @@ static int bcm2835_spi_probe(struct plat
bcm2835_wr(bs, BCM2835_SPI_CS,
BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);
diff --git a/target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch b/target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch
index 27bbf9ad67..7d55968c2d 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0409-drm-atomic-Pass-the-full-state-to-CRTC-atomic_check.patch
@@ -201,7 +201,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -5606,17 +5606,19 @@ static void dm_update_crtc_active_planes
+@@ -5639,17 +5639,19 @@ static void dm_update_crtc_active_planes
}
static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc,
@@ -225,7 +225,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max
WARN_ON(1);
return ret;
}
-@@ -5627,8 +5629,8 @@ static int dm_crtc_helper_atomic_check(s
+@@ -5660,8 +5662,8 @@ static int dm_crtc_helper_atomic_check(s
* planes are disabled, which is not supported by the hardware. And there is legacy
* userspace which stops using the HW cursor altogether in response to the resulting EINVAL.
*/
diff --git a/target/linux/bcm27xx/patches-5.10/950-0527-drm-connector-Create-a-helper-to-attach-the-hdr_outp.patch b/target/linux/bcm27xx/patches-5.10/950-0527-drm-connector-Create-a-helper-to-attach-the-hdr_outp.patch
index 5ccff1866a..c40a07793b 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0527-drm-connector-Create-a-helper-to-attach-the-hdr_outp.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0527-drm-connector-Create-a-helper-to-attach-the-hdr_outp.patch
@@ -22,7 +22,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -6532,9 +6532,7 @@ void amdgpu_dm_connector_init_helper(str
+@@ -6565,9 +6565,7 @@ void amdgpu_dm_connector_init_helper(str
if (connector_type == DRM_MODE_CONNECTOR_HDMIA ||
connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
connector_type == DRM_MODE_CONNECTOR_eDP) {
diff --git a/target/linux/bcm27xx/patches-5.10/950-0528-drm-connector-Add-helper-to-compare-HDR-metadata.patch b/target/linux/bcm27xx/patches-5.10/950-0528-drm-connector-Add-helper-to-compare-HDR-metadata.patch
index 4cc8aa6d4b..e6d95d0eeb 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0528-drm-connector-Add-helper-to-compare-HDR-metadata.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0528-drm-connector-Add-helper-to-compare-HDR-metadata.patch
@@ -21,7 +21,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -5477,25 +5477,6 @@ static int fill_hdr_info_packet(const st
+@@ -5510,25 +5510,6 @@ static int fill_hdr_info_packet(const st
return 0;
}
@@ -47,7 +47,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
static int
amdgpu_dm_connector_atomic_check(struct drm_connector *conn,
struct drm_atomic_state *state)
-@@ -5511,7 +5492,7 @@ amdgpu_dm_connector_atomic_check(struct
+@@ -5544,7 +5525,7 @@ amdgpu_dm_connector_atomic_check(struct
if (!crtc)
return 0;
diff --git a/target/linux/bcm27xx/patches-5.10/950-0595-spi-bcm2835-Increase-the-CS-limit-to-24.patch b/target/linux/bcm27xx/patches-5.10/950-0595-spi-bcm2835-Increase-the-CS-limit-to-24.patch
index 0d4573430e..a22cdc7d31 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0595-spi-bcm2835-Increase-the-CS-limit-to-24.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0595-spi-bcm2835-Increase-the-CS-limit-to-24.patch
@@ -24,7 +24,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
#include <linux/of_irq.h>
#include <linux/spi/spi.h>
-@@ -1299,6 +1300,11 @@ static int bcm2835_spi_probe(struct plat
+@@ -1303,6 +1304,11 @@ static int bcm2835_spi_probe(struct plat
struct bcm2835_spi *bs;
int err;
diff --git a/target/linux/bcm27xx/patches-5.10/950-0689-drm-automatic-legacy-gamma-support.patch b/target/linux/bcm27xx/patches-5.10/950-0689-drm-automatic-legacy-gamma-support.patch
index 3d4d2b2e03..9816f9de75 100644
--- a/target/linux/bcm27xx/patches-5.10/950-0689-drm-automatic-legacy-gamma-support.patch
+++ b/target/linux/bcm27xx/patches-5.10/950-0689-drm-automatic-legacy-gamma-support.patch
@@ -42,7 +42,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201211114237.213288-2-tomi
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
-@@ -4993,7 +4993,6 @@ static void dm_disable_vblank(struct drm
+@@ -5026,7 +5026,6 @@ static void dm_disable_vblank(struct drm
static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = {
.reset = dm_crtc_reset_state,
.destroy = amdgpu_dm_crtc_destroy,