mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2025-01-19 18:26:31 +07:00
7f16e5c141
I want to merge in the new Broadwell support as a late hw enabling pull request. But since the internal branch was based upon our drm-intel-nightly integration branch I need to resolve all the oustanding conflicts in drm/i915 with a backmerge to make the 60+ patches apply properly. We'll propably have some fun because Linus will come up with a slightly different merge solution. Conflicts: drivers/gpu/drm/i915/i915_dma.c drivers/gpu/drm/i915/i915_drv.c drivers/gpu/drm/i915/intel_crt.c drivers/gpu/drm/i915/intel_ddi.c drivers/gpu/drm/i915/intel_display.c drivers/gpu/drm/i915/intel_dp.c drivers/gpu/drm/i915/intel_drv.h All rather simple adjacent lines changed or partial backports from -next to -fixes, with the exception of the thaw code in i915_dma.c. That one needed a bit of shuffling to restore the intent. Oh and the massive header file reordering in intel_drv.h is a bit trouble. But not much. v2: Also don't forget the fixup for the silent conflict that results in compile fail ... Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
||
|---|---|---|
| .. | ||
| core | ||
| dispnv04 | ||
| Kconfig | ||
| Makefile | ||
| nouveau_abi16.c | ||
| nouveau_abi16.h | ||
| nouveau_acpi.c | ||
| nouveau_acpi.h | ||
| nouveau_agp.c | ||
| nouveau_agp.h | ||
| nouveau_backlight.c | ||
| nouveau_bios.c | ||
| nouveau_bios.h | ||
| nouveau_bo.c | ||
| nouveau_bo.h | ||
| nouveau_chan.c | ||
| nouveau_chan.h | ||
| nouveau_connector.c | ||
| nouveau_connector.h | ||
| nouveau_crtc.h | ||
| nouveau_debugfs.c | ||
| nouveau_debugfs.h | ||
| nouveau_display.c | ||
| nouveau_display.h | ||
| nouveau_dma.c | ||
| nouveau_dma.h | ||
| nouveau_dp.c | ||
| nouveau_drm.c | ||
| nouveau_drm.h | ||
| nouveau_encoder.h | ||
| nouveau_fbcon.c | ||
| nouveau_fbcon.h | ||
| nouveau_fence.c | ||
| nouveau_fence.h | ||
| nouveau_gem.c | ||
| nouveau_gem.h | ||
| nouveau_hwsq.h | ||
| nouveau_ioc32.c | ||
| nouveau_ioctl.h | ||
| nouveau_mem.c | ||
| nouveau_perf.c | ||
| nouveau_pm.c | ||
| nouveau_pm.h | ||
| nouveau_prime.c | ||
| nouveau_reg.h | ||
| nouveau_sgdma.c | ||
| nouveau_ttm.c | ||
| nouveau_ttm.h | ||
| nouveau_vga.c | ||
| nouveau_vga.h | ||
| nouveau_volt.c | ||
| nv04_fbcon.c | ||
| nv04_fence.c | ||
| nv04_pm.c | ||
| nv10_fence.c | ||
| nv10_fence.h | ||
| nv17_fence.c | ||
| nv40_pm.c | ||
| nv50_display.c | ||
| nv50_display.h | ||
| nv50_fbcon.c | ||
| nv50_fence.c | ||
| nv50_pm.c | ||
| nv84_fence.c | ||
| nva3_pm.c | ||
| nvc0_fbcon.c | ||
| nvc0_fence.c | ||
| nvc0_pm.c | ||