~ubuntu-kernel/ubuntu/+source/linux-raspi/+git/hirsute:master-prep

Last commit made on 2021-10-06
Get this branch:
git clone -b master-prep https://git.launchpad.net/~ubuntu-kernel/ubuntu/+source/linux-raspi/+git/hirsute
Members of Ubuntu Kernel Repositories can upload to this branch. Log in for directions.

Branch merges

Branch information

Recent commits

430234e... by Stefan Bader

UBUNTU: Ubuntu-raspi-5.11.0-1021.22

Signed-off-by: Stefan Bader <email address hidden>

300154a... by Stefan Bader

UBUNTU: link-to-tracker: update tracking bug

BugLink: https://bugs.launchpad.net/bugs/1945897
Properties: no-test-build
Signed-off-by: Stefan Bader <email address hidden>

2778415... by Juerg Haefliger

UBUNTU: SAUCE: Revert "drm/vc4: hdmi: Warn if we access the controller while disabled"

BugLink: https://bugs.launchpad.net/bugs/1944397

This reverts commit 6ca5a5418a5203c6d857193a1698f50cdd93d5d0.

This commit causes lots of warnings during boot which in turn could cause
other problems. Prevent that by reverting the commit until we figure out
the root cause of the warnings.

Signed-off-by: Juerg Haefliger <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

229971c... by Juerg Haefliger

UBUNTU: SAUCE: Revert "drm/vc4: Notify the firmware when DRM is in charge"

BugLink: https://bugs.launchpad.net/bugs/1944397

This reverts commit 5e4c6b0cbd95bfac2c0ffec2bf2ebefe8b143631.

With current Hirsute firmware, this commit causes:
[ 0.124340] raspberrypi-firmware soc:firmware: Attached to firmware from 2021-02-25T12:10:40, variant start
[ 0.128359] raspberrypi-firmware soc:firmware: Firmware hash is 564e5f9b852b23a330b1764bcf0b2d022a20afd0
[ 17.517350] raspberrypi-firmware soc:firmware: Request 0x00030066 returned status 0x80000001
[ 17.530301] vc4-drm gpu: [drm] Couldn't stop firmware display driver: -22

So revert it.

Signed-off-by: Juerg Haefliger <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

0a54803... by Juerg Haefliger

UBUNTU: SAUCE: Revert "vc4/drv: Only notify firmware of display done with kms"

BugLink: https://bugs.launchpad.net/bugs/1944397

This reverts commit e730e0de9b7ad1510676076c13dddaaa006d986a.

Prerequisite for the next commit.

Signed-off-by: Juerg Haefliger <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

41fb1a3... by Juerg Haefliger

UBUNTU: SAUCE: Revert "drm/vc4: Fix typo when getting firmware node"

BugLink: https://bugs.launchpad.net/bugs/1944397

This reverts commit d28f1d9a848dd789f09c44f9b64091affbcf046a.

Prerequisite for the next commit.

Signed-off-by: Juerg Haefliger <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

94ced73... by Juerg Haefliger

drm/vc4: hdmi: Fix bvb clock enable error checking

BugLink: https://bugs.launchpad.net/bugs/1944397

Check for errors only if we actually tried to enable the bvb clock.

Fixes: 01a6d727b407 ("vc4/drm: hdmi: Handle case when bvb clock is null")
Signed-off-by: Juerg Haefliger <email address hidden>

(forward ported from commit 7c9c402b0cc2ad4eae6b345b9699ab6701b48bc7 linux-rpi)
[juergh: Adjusted context.]
Signed-off-by: Juerg Haefliger <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

fcb0ef2... by Maxime Ripard <email address hidden>

drm/vc4: hdmi: Remove unnecessary pm_runtime_put

BugLink: https://bugs.launchpad.net/bugs/1944397

Unlike pm_runtime_get_sync(), pm_runtime_resume_and_get() doesn't take a
reference on failure, so we don't need to call pm_runtime_put() on
failure.

Signed-off-by: Maxime Ripard <email address hidden>

(cherry picked from commit 42111230f631c76840be67376bebcc6b06e3baca linux-rpi)
Signed-off-by: Juerg Haefliger <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

ead2f1b... by Maxime Ripard <email address hidden>

drm/vc4: hdmi: Make sure the controller is powered up during bind

BugLink: https://bugs.launchpad.net/bugs/1944397

In the bind hook, we actually need the device to have the HSM clock
running during the final part of the display initialisation where we
reset the controller and initialise the CEC component.

Failing to do so will result in a complete, silent, hang of the CPU.

Fixes: 411efa18e4b0 ("drm/vc4: hdmi: Move the HSM clock enable to runtime_pm")
Signed-off-by: Maxime Ripard <email address hidden>

(backported from commit 142a6a7f0e8223bd0f591ba67e33868f9ab6ed43 linux-rpi)
[juergh: Adjusted context.]
Signed-off-by: Juerg Haefliger <email address hidden>
Acked-by: Stefan Bader <email address hidden>
Acked-by: Tim Gardner <email address hidden>
Signed-off-by: Stefan Bader <email address hidden>

92e9aba... by Stefan Bader

UBUNTU: Start new release

Ignore: yes
Signed-off-by: Stefan Bader <email address hidden>