Linux kernel stable tree (mirror) https://git.radix-linux.su/kernel/linux.git/atom?h=v6.4.11 2023-03-29T14:00:23+00:00 2023-03-29T14:00:23+00:00 Daniel Vetter daniel.vetter@ffwll.ch 2023-03-29T14:00:23+00:00 urn:sha1:82bbec189ab34873688484cd14189a5392946fbb I just landed the fence deadline PR from Rob that a bunch of drivers want/need to apply driver-specific patches. Backmerge -rc4 so that they don't have to be stuck on -rc2 for no reason at all. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> 2023-03-22T17:00:38+00:00 Johan Hovold johan+linaro@kernel.org 2023-03-06T10:35:33+00:00 urn:sha1:ba98413bf45edbf33672e2539e321b851b2cfbd1 Make sure to unbind all subcomponents when binding the aggregate device fails. Fixes: a41e82e6c457 ("drm/meson: Add support for components") Cc: stable@vger.kernel.org # 4.12 Cc: Neil Armstrong <neil.armstrong@linaro.org> Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Acked-by: Neil Armstrong <neil.armstrong@linaro.org> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20230306103533.4915-1-johan+linaro@kernel.org 2023-03-15T09:06:46+00:00 Marek Szyprowski m.szyprowski@samsung.com 2023-03-09T15:24:46+00:00 urn:sha1:4028cbf867f70a3c599c9b0c9509334c56ed97d7 devm_regulator_get_enable_optional() returns -ENODEV if requested optional regulator is not present. Adjust code for that, because in the 67d0a30128c9 I've incorrectly assumed that it also returns 0 when regulator is not present. Reported-by: Ricardo Cañuelo <ricardo.canuelo@collabora.com> Fixes: 67d0a30128c9 ("drm/meson: dw-hdmi: Fix devm_regulator_*get_enable*() conversion") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Acked-by: Neil Armstrong <neil.armstrong@linaro.org> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20230309152446.104913-1-m.szyprowski@samsung.com 2023-03-14T16:07:48+00:00 Thomas Zimmermann tzimmermann@suse.de 2023-03-13T15:51:24+00:00 urn:sha1:8a9d46f4f5d3bc5be9ac6f3861f86b56e83ff00c Use the fbdev emulation that is optimized for DMA helpers. Avoids possible shadow buffering and makes the code simpler. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230313155138.20584-12-tzimmermann@suse.de 2023-03-13T09:14:05+00:00 Thomas Zimmermann tzimmermann@suse.de 2023-03-13T09:14:05+00:00 urn:sha1:b3c9a04135bdbd3aabd5e9534bad0fe6df505f8a Backmerging to get latest upstream. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> 2023-03-06T08:44:08+00:00 Carlo Caione ccaione@baylibre.com 2023-02-13T09:32:09+00:00 urn:sha1:bf458e5b139894234444e4f88500616a8398b719 Relax a bit the supported modes list by including also 480x1920 and 400x1280. This was actually tested on real hardware and it works correctly. Signed-off-by: Carlo Caione <ccaione@baylibre.com> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20230210-relax_dmt_limits-v2-1-318913f08121@baylibre.com 2023-03-06T08:42:01+00:00 Christian Hewitt christianshewitt@gmail.com 2023-03-03T12:33:12+00:00 urn:sha1:5c8cf1664f288098a971a1d1e65716a2b6a279e1 Playing media with a resolution smaller than the crtc size requires the video overlay to be scaled for output and GXM boards display a 1px pink line on the bottom of the scaled overlay. Comparing with the downstream vendor driver revealed VPP_DUMMY_DATA not being set [0]. Setting VPP_DUMMY_DATA prevents the 1px pink line from being seen. [0] https://github.com/endlessm/linux-s905x/blob/master/drivers/amlogic/amports/video.c#L7869 Fixes: bbbe775ec5b5 ("drm: Add support for Amlogic Meson Graphic Controller") Suggested-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Signed-off-by: Christian Hewitt <christianshewitt@gmail.com> Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://patchwork.freedesktop.org/patch/msgid/20230303123312.155164-1-christianshewitt@gmail.com 2023-01-31T11:23:23+00:00 Daniel Vetter daniel.vetter@ffwll.ch 2023-01-31T10:22:15+00:00 urn:sha1:aebd8f0c6f8280ba35bc989f4a9ea47469d3589a Due to holidays we started -next with more -fixes in-flight than usual, and people have been asking where they are. Backmerge to get things better in sync. Conflicts: - Tiny conflict in drm_fbdev_generic.c between variable rename and missing error handling that got added. - Conflict in drm_fb_helper.c between the added call to vgaswitcheroo in drm_fb_helper_single_fb_probe and a refactor patch that extracted lots of helpers and incidentally removed the dev local variable. Readd it to make things compile. Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> 2023-01-10T08:30:37+00:00 Marek Szyprowski m.szyprowski@samsung.com 2023-01-09T22:00:33+00:00 urn:sha1:67d0a30128c9f644595dfe67ac0fb941a716a6c9 devm_regulator_get_enable_optional() function returns 0 on success, so use it for the check if function succeeded instead of the -ENODEV value. Fixes: 429e87063661 ("drm/meson: dw-hdmi: Use devm_regulator_*get_enable*()") Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Acked-by: Neil Armstrong <neil.armstrong@linaro.org> Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> [narmstrong: s/succeeded/succeeded/ in commit message] Link: https://patchwork.freedesktop.org/patch/msgid/20230109220033.31202-1-m.szyprowski@samsung.com 2023-01-03T07:32:12+00:00 Maxime Ripard maxime@cerno.tech 2023-01-03T07:32:12+00:00 urn:sha1:2c55d703391acf7e9101da596d0c15ee03b318a3 Let's start the fixes cycle. Signed-off-by: Maxime Ripard <maxime@cerno.tech>