aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.15/950-0901-drm-vc4-drv-Register-a-different-driver-on-BCM2711.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-08-25 10:36:19 -0400
committerPetr Štetiar <ynezz@true.cz>2022-08-25 22:07:43 +0200
commitedeae512c065ed54f5ab492b5a2bdf0e833bb685 (patch)
tree90f789da2b98538184d97f462d9fa679157bcdc3 /target/linux/bcm27xx/patches-5.15/950-0901-drm-vc4-drv-Register-a-different-driver-on-BCM2711.patch
parent31648c4b59add5b1cb441073a46c80ab768b588c (diff)
downloadupstream-edeae512c065ed54f5ab492b5a2bdf0e833bb685.tar.gz
upstream-edeae512c065ed54f5ab492b5a2bdf0e833bb685.tar.bz2
upstream-edeae512c065ed54f5ab492b5a2bdf0e833bb685.zip
kernel: bump 5.15 to 5.15.63
All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0901-drm-vc4-drv-Register-a-different-driver-on-BCM2711.patch')
-rw-r--r--target/linux/bcm27xx/patches-5.15/950-0901-drm-vc4-drv-Register-a-different-driver-on-BCM2711.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0901-drm-vc4-drv-Register-a-different-driver-on-BCM2711.patch b/target/linux/bcm27xx/patches-5.15/950-0901-drm-vc4-drv-Register-a-different-driver-on-BCM2711.patch
index c7e587ae16..81859f89df 100644
--- a/target/linux/bcm27xx/patches-5.15/950-0901-drm-vc4-drv-Register-a-different-driver-on-BCM2711.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0901-drm-vc4-drv-Register-a-different-driver-on-BCM2711.patch
@@ -83,7 +83,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
static int compare_dev(struct device *dev, void *data)
{
return dev == data;
-@@ -263,6 +297,7 @@ static bool firmware_kms(void)
+@@ -255,6 +289,7 @@ static bool firmware_kms(void)
static int vc4_drm_bind(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
@@ -91,7 +91,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
struct rpi_firmware *firmware = NULL;
struct drm_device *drm;
struct vc4_dev *vc4;
-@@ -274,12 +309,10 @@ static int vc4_drm_bind(struct device *d
+@@ -266,12 +301,10 @@ static int vc4_drm_bind(struct device *d
dev->coherent_dma_mask = DMA_BIT_MASK(32);
is_vc5 = of_device_is_compatible(dev->of_node, "brcm,bcm2711-vc5");
@@ -108,7 +108,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
node = of_find_matching_node_and_match(NULL, vc4_dma_range_matches,
NULL);
-@@ -301,7 +334,7 @@ static int vc4_drm_bind(struct device *d
+@@ -283,7 +316,7 @@ static int vc4_drm_bind(struct device *d
return ret;
}
@@ -117,7 +117,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
if (IS_ERR(vc4))
return PTR_ERR(vc4);
vc4->is_vc5 = is_vc5;
-@@ -333,7 +366,7 @@ static int vc4_drm_bind(struct device *d
+@@ -315,7 +348,7 @@ static int vc4_drm_bind(struct device *d
return -EPROBE_DEFER;
}