diff options
| author | Petr Štetiar <ynezz@true.cz> | 2022-08-22 14:02:36 +0200 |
|---|---|---|
| committer | Petr Štetiar <ynezz@true.cz> | 2022-08-23 10:37:04 +0200 |
| commit | ca5c695a4522091234026e22e8336f05d65602ba (patch) | |
| tree | 7ea3f3abfa9a15e8fee51408918a6a0671062409 /target/linux/bcm27xx/patches-5.15/950-0715-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch | |
| parent | d1163fd13f6498826d202f0b58cedf32d7891d52 (diff) | |
| download | upstream-ca5c695a4522091234026e22e8336f05d65602ba.tar.gz upstream-ca5c695a4522091234026e22e8336f05d65602ba.tar.bz2 upstream-ca5c695a4522091234026e22e8336f05d65602ba.zip | |
kernel: bump 5.15 to 5.15.62
Deleted following upstreamed patches:
bcm27xx: 950-0006-drm-vc4-hdmi-Fix-HPD-GPIO-detection.patch
bcm27xx: 950-0420-drm-vc4-Adopt-the-dma-configuration-from-the-HVS-or-.patch
bcm27xx: 950-0425-drm-vc4-A-present-but-empty-dmas-disables-audio.patch
bcm27xx: 950-0432-vc4-drm-Avoid-full-hdmi-audio-fifo-writes.patch
bcm27xx: 950-0433-vc4-drm-vc4_plane-Remove-subpixel-positioning-check.patch
bcm27xx: 950-0435-drm-vc4-Correct-pixel-order-for-DSI0.patch
bcm27xx: 950-0436-drm-vc4-Register-dsi0-as-the-correct-vc4-encoder-typ.patch
bcm27xx: 950-0437-drm-vc4-Fix-dsi0-interrupt-support.patch
bcm27xx: 950-0438-drm-vc4-Add-correct-stop-condition-to-vc4_dsi_encode.patch
bcm27xx: 950-0443-drm-vc4-Fix-timings-for-interlaced-modes.patch
bcm27xx: 950-0445-drm-vc4-Fix-margin-calculations-for-the-right-bottom.patch
bcm27xx: 950-0475-drm-vc4-Reset-HDMI-MISC_CONTROL-register.patch
bcm27xx: 950-0476-drm-vc4-Release-workaround-buffer-and-DMA-in-error-p.patch
bcm27xx: 950-0477-drm-vc4-Correct-DSI-divider-calculations.patch
bcm27xx: 950-0664-drm-vc4-dsi-Correct-max-divider-to-255-not-7.patch
bcm53xx: 072-next-ARM_dts_BCM53015-add-mr26.patch
mediatek: 920-linux-next-dts-mt7622-bpi-r64-fix-wps-button.patch
Manually rebased following patches:
bcm27xx: 950-0004-drm-vc4-hdmi-Remove-the-DDC-probing-for-status-detec.patch
bcm27xx: 950-0700-net-phy-lan87xx-Decrease-phy-polling-rate.patch
bcm27xx: 950-0711-drm-vc4-Rename-bridge-to-out_bridge.patch
bcm27xx: 950-0713-drm-vc4-Remove-splitting-the-bridge-chain-from-the-d.patch
bcm27xx: 950-0715-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch
bcm27xx: 950-0787-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch
bcm27xx: 950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
Runtime tested on turris-omnia and glinet-b1300.
Tested-by: John Audia <therealgraysky@proton.me> [bcm2711/RPi4B, mt7622/RT3200]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15/950-0715-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch')
| -rw-r--r-- | target/linux/bcm27xx/patches-5.15/950-0715-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0715-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch b/target/linux/bcm27xx/patches-5.15/950-0715-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch index 74cae273f8..e196a5e675 100644 --- a/target/linux/bcm27xx/patches-5.15/950-0715-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch +++ b/target/linux/bcm27xx/patches-5.15/950-0715-drm-vc4-Convert-vc4_dsi-to-using-a-bridge-instead-of.patch @@ -240,18 +240,18 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> }; static const struct vc4_dsi_variant bcm2711_dsi1_variant = { -@@ -1691,9 +1744,8 @@ static int vc4_dsi_bind(struct device *d - goto err_free_dma; +@@ -1692,9 +1745,8 @@ static int vc4_dsi_bind(struct device *d + return ret; drm_simple_encoder_init(drm, dsi->encoder, DRM_MODE_ENCODER_DSI); - drm_encoder_helper_add(dsi->encoder, &vc4_dsi_encoder_helper_funcs); - ret = drm_bridge_attach(dsi->encoder, dsi->out_bridge, NULL, 0); + ret = drm_bridge_attach(dsi->encoder, &dsi->bridge, NULL, 0); - if (ret) { - dev_err(dev, "bridge attach failed: %d\n", ret); - goto err_free_dma; -@@ -1755,6 +1807,10 @@ static int vc4_dsi_dev_probe(struct plat + if (ret) + return ret; + +@@ -1730,6 +1782,10 @@ static int vc4_dsi_dev_probe(struct plat return -ENOMEM; dev_set_drvdata(dev, dsi); |