linux-stable/drivers/gpu/drm/meson
Daniel Vetter aebd8f0c6f Linux 6.2-rc6
-----BEGIN PGP SIGNATURE-----
 
 iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmPW7E8eHHRvcnZhbGRz
 QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGf7MIAI0JnHN9WvtEukSZ
 E6j6+cEGWxsvD6q0g3GPolaKOCw7hlv0pWcFJFcUAt0jebspMdxV2oUGJ8RYW7Lg
 nCcHvEVswGKLAQtQSWw52qotW6fUfMPsNYYB5l31sm1sKH4Cgss0W7l2HxO/1LvG
 TSeNHX53vNAZ8pVnFYEWCSXC9bzrmU/VALF2EV00cdICmfvjlgkELGXoLKJJWzUp
 s63fBHYGGURSgwIWOKStoO6HNo0j/F/wcSMx8leY8qDUtVKHj4v24EvSgxUSDBER
 ch3LiSQ6qf4sw/z7pqruKFthKOrlNmcc0phjiES0xwwGiNhLv0z3rAhc4OM2cgYh
 SDc/Y/c=
 =zpaD
 -----END PGP SIGNATURE-----

Merge v6.2-rc6 into drm-next

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-31 12:23:23 +01:00
..
Kconfig drm/gem: rename GEM CMA helpers to GEM DMA helpers 2022-08-03 18:31:49 +02:00
Makefile drm/meson: rename venc_cvbs to encoder_cvbs 2021-11-12 10:10:01 +01:00
meson_crtc.c
meson_crtc.h
meson_drv.c drm/fb-helper: Move generic fbdev emulation into separate source file 2022-11-05 17:12:04 +01:00
meson_drv.h drm/meson: remove drm bridges at aggregate driver unbind time 2022-09-23 09:45:49 +00:00
meson_dw_hdmi.c drm/meson: dw-hdmi: Fix devm_regulator_*get_enable*() conversion 2023-01-10 09:30:37 +01:00
meson_dw_hdmi.h
meson_encoder_cvbs.c drm/meson: Fix return type of meson_encoder_cvbs_mode_valid() 2022-11-03 09:39:42 +01:00
meson_encoder_cvbs.h drm/meson: remove drm bridges at aggregate driver unbind time 2022-09-23 09:45:49 +00:00
meson_encoder_hdmi.c drm/meson: remove drm bridges at aggregate driver unbind time 2022-09-23 09:45:49 +00:00
meson_encoder_hdmi.h drm/meson: remove drm bridges at aggregate driver unbind time 2022-09-23 09:45:49 +00:00
meson_osd_afbcd.c drm/meson: osd_afbcd: Add an exit callback to struct meson_afbcd_ops 2022-01-03 12:28:25 +01:00
meson_osd_afbcd.h drm/meson: osd_afbcd: Add an exit callback to struct meson_afbcd_ops 2022-01-03 12:28:25 +01:00
meson_overlay.c drm/gem: rename struct drm_gem_dma_object.{paddr => dma_addr} 2022-08-03 18:32:27 +02:00
meson_overlay.h
meson_plane.c drm pull for 6.1-rc1 2022-10-05 11:24:12 -07:00
meson_plane.h
meson_rdma.c
meson_rdma.h
meson_registers.h drm/meson: fix colour distortion from HDR set during vendor u-boot 2021-08-10 10:00:02 +02:00
meson_vclk.c
meson_vclk.h
meson_venc.c
meson_venc.h
meson_viu.c drm/meson: Reduce the FIFO lines held when AFBC is not used 2023-01-02 10:58:50 +01:00
meson_viu.h
meson_vpp.c
meson_vpp.h