mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-23 17:30:02 +00:00
Code Issues Releases Wiki Activity
linux-stable/drivers/gpu/drm/nouveau
History
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
..
dispnv04 drm/nouveau: Remove unnecessary include statements for drm_crtc_helper.h 2023-01-18 09:25:31 +01:00
dispnv50 drm/nouveau: Remove unnecessary include statements for drm_crtc_helper.h 2023-01-18 09:25:31 +01:00
include drm/nouveau/fb/ga102: Replace zero-length array of trailing structs with flex-array 2023-01-16 18:18:12 +01:00
nvif drm/nouveau/vfn: move NV_USERMODE class from host 2022-11-09 10:44:36 +10:00
nvkm drm/nouveau/devinit: Convert function disable() to be void 2023-01-25 16:50:31 -05:00
Kbuild drm/nouveau/kms: switch to drm fbdev helpers 2022-11-09 10:44:27 +10:00
Kconfig drm/nouveau: Remove support for legacy contexts/buffers 2023-01-13 09:22:02 +01:00
nouveau_abi16.c drm/nouveau/fifo: add new channel classes 2022-11-09 10:44:50 +10:00
nouveau_abi16.h drm/nouveau/ce/gv100-: move method buffer to ce ctx 2022-07-13 13:56:50 +10:00
nouveau_acpi.c drm/nouveau: Register ACPI video backlight when nv_backlight registration fails (v2) 2022-09-03 12:17:26 +02:00
nouveau_acpi.h drm/nouveau: Register ACPI video backlight when nv_backlight registration fails (v2) 2022-09-03 12:17:26 +02:00
nouveau_backlight.c drm/nouveau: Add support to control backlight using bl_power for nva3. 2022-11-11 15:56:33 +01:00
nouveau_bios.c drm/nouveau/disp: add output class 2022-07-27 09:05:49 +10:00
nouveau_bios.h
nouveau_bo.c drm/ttm: revert "prevent moving of pinned BOs" 2023-01-25 17:27:51 +01:00
nouveau_bo.h drm/ttm: merge ttm_bo_api.h and ttm_bo_driver.h v2 2022-12-06 12:54:14 +01:00
nouveau_bo0039.c drm/ttm: rework on ttm_resource to use size_t type 2022-10-27 11:42:58 +02:00
nouveau_bo74c1.c drm/ttm: rework on ttm_resource to use size_t type 2022-10-27 11:42:58 +02:00
nouveau_bo85b5.c drm/ttm: rework on ttm_resource to use size_t type 2022-10-27 11:42:58 +02:00
nouveau_bo90b5.c drm/ttm: rework on ttm_resource to use size_t type 2022-10-27 11:42:58 +02:00
nouveau_bo5039.c drm/ttm: rework on ttm_resource to use size_t type 2022-10-27 11:42:58 +02:00
nouveau_bo9039.c drm/ttm: rework on ttm_resource to use size_t type 2022-10-27 11:42:58 +02:00
nouveau_boa0b5.c drm/ttm: rework on ttm_resource to use size_t type 2022-10-27 11:42:58 +02:00
nouveau_chan.c drm/nouveau/fifo/ga100-: initial support 2022-11-09 10:44:50 +10:00
nouveau_chan.h drm/nouveau/fifo: add new channel classes 2022-11-09 10:44:50 +10:00
nouveau_connector.c drm/nouveau/disp: expose conn event class 2022-11-09 10:44:27 +10:00
nouveau_connector.h drm/nouveau/disp: expose conn event class 2022-11-09 10:44:27 +10:00
nouveau_crtc.h drm/nouveau/disp: expose head event class 2022-11-09 10:44:27 +10:00
nouveau_debugfs.c drm/nouveau: simplify the return expression of nouveau_debugfs_init() 2022-04-29 15:44:54 -04:00
nouveau_debugfs.h
nouveau_display.c drm/nouveau/kms: switch to drm fbdev helpers 2022-11-09 10:44:27 +10:00
nouveau_display.h
nouveau_dma.c drm/nouveau/fifo: add new channel classes 2022-11-09 10:44:50 +10:00
nouveau_dma.h
nouveau_dmem.c nouveau/dmem: Remove duplicated include in nouveau_dmem.c 2022-10-21 17:13:17 -04:00
nouveau_dmem.h
nouveau_dp.c drm/nouveau/disp: expose conn event class 2022-11-09 10:44:27 +10:00
nouveau_drm.c drm/nouveau: Remove unnecessary include statements for drm_crtc_helper.h 2023-01-18 09:25:31 +01:00
nouveau_drv.h drm/ttm: merge ttm_bo_api.h and ttm_bo_driver.h v2 2022-12-06 12:54:14 +01:00
nouveau_encoder.h drm/nouveau/disp: expose conn event class 2022-11-09 10:44:27 +10:00
nouveau_fence.c drm/nouveau/fifo: expose per-runlist CHID information 2022-11-09 10:44:47 +10:00
nouveau_fence.h drm/nouveau/fifo: expose non-stall intr in host channel event class 2022-11-09 10:44:27 +10:00
nouveau_gem.c drm/nouveau: stop using ttm_bo_wait 2023-01-18 15:57:52 +01:00
nouveau_gem.h
nouveau_hwmon.c drm/nouveau/hwmon: use simplified HWMON_CHANNEL_INFO macro 2022-08-22 22:50:57 -04:00
nouveau_hwmon.h
nouveau_ioc32.c
nouveau_ioctl.h
nouveau_led.c
nouveau_led.h
nouveau_mem.c drm/ttm: merge ttm_bo_api.h and ttm_bo_driver.h v2 2022-12-06 12:54:14 +01:00
nouveau_mem.h drm/ttm: merge ttm_bo_api.h and ttm_bo_driver.h v2 2022-12-06 12:54:14 +01:00
nouveau_nvif.c drm/nouveau/nvkm: rip out old notify 2022-11-09 10:44:27 +10:00
nouveau_platform.c
nouveau_platform.h
nouveau_prime.c drm/ttm: merge ttm_bo_api.h and ttm_bo_driver.h v2 2022-12-06 12:54:14 +01:00
nouveau_reg.h
nouveau_sgdma.c drm/ttm: merge ttm_bo_api.h and ttm_bo_driver.h v2 2022-12-06 12:54:14 +01:00
nouveau_svm.c drm/nouveau/fault: expose replayable fault buffer event class 2022-11-09 10:44:27 +10:00
nouveau_svm.h
nouveau_ttm.c drm/ttm: rework on ttm_resource to use size_t type 2022-10-27 11:42:58 +02:00
nouveau_ttm.h
nouveau_usif.c drm/nouveau/nvkm: rip out old notify 2022-11-09 10:44:27 +10:00
nouveau_usif.h
nouveau_vga.c drm/nouveau: Remove unnecessary include statements for drm_crtc_helper.h 2023-01-18 09:25:31 +01:00
nouveau_vga.h
nouveau_vmm.c
nouveau_vmm.h
nv04_fence.c
nv10_fence.c
nv10_fence.h
nv17_fence.c
nv50_display.h
nv50_fence.c
nv84_fence.c drm/nouveau/fifo/ga100-: initial support 2022-11-09 10:44:50 +10:00
nvc0_fence.c