mirror_ubuntu-kernels/drivers/gpu/drm/i915
Daniel Vetter 213cc929cb Merge drm/drm-fixes into drm-next
msm-next pull request has a baseline with stuff from -fixes, roll
forward first.

Some simple conflicts in amdgpu, ttm and one in i915 where git gets
confused and tries to add the same function twice.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2021-04-13 23:15:09 +02:00
..
display Merge drm/drm-fixes into drm-next 2021-04-13 23:15:09 +02:00
gem Merge tag 'drm-intel-gt-next-2021-04-06' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 2021-04-08 12:46:12 +10:00
gt Merge tag 'drm-intel-next-2021-04-01' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 2021-04-08 14:02:21 +10:00
gvt
selftests Merge tag 'drm-intel-next-2021-04-01' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 2021-04-08 14:02:21 +10:00
.gitignore
dma_resv_utils.c
dma_resv_utils.h
i915_active_types.h
i915_active.c
i915_active.h
i915_buddy.c drm/i915/buddy: document the unused header bits 2021-03-24 19:30:35 +01:00
i915_buddy.h drm/i915/buddy: document the unused header bits 2021-03-24 19:30:35 +01:00
i915_cmd_parser.c
i915_config.c
i915_debugfs_params.c
i915_debugfs_params.h
i915_debugfs.c Merge tag 'drm-intel-next-2021-04-01' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 2021-04-08 14:02:21 +10:00
i915_debugfs.h
i915_drv.c Merge tag 'drm-intel-next-2021-04-01' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 2021-04-08 14:02:21 +10:00
i915_drv.h Merge tag 'drm-intel-next-2021-04-01' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 2021-04-08 14:02:21 +10:00
i915_fixed.h
i915_gem_evict.c
i915_gem_gtt.c drm/i915: Finally remove obj->mm.lock. 2021-03-24 17:47:20 +01:00
i915_gem_gtt.h
i915_gem.c drm/i915: Finally remove obj->mm.lock. 2021-03-24 17:47:20 +01:00
i915_gem.h
i915_getparam.c
i915_globals.c
i915_globals.h
i915_gpu_error.c
i915_gpu_error.h
i915_ioc32.c
i915_ioc32.h
i915_irq.c
i915_irq.h
i915_memcpy.c
i915_memcpy.h
i915_mitigations.c
i915_mitigations.h
i915_mm.c
i915_params.c drm/i915: Allow configuring default request expiry via modparam 2021-03-26 01:01:38 +01:00
i915_params.h drm/i915: Allow configuring default request expiry via modparam 2021-03-26 01:01:38 +01:00
i915_pci.c Merge tag 'drm-intel-next-2021-04-01' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 2021-04-08 14:02:21 +10:00
i915_perf_types.h
i915_perf.c
i915_perf.h
i915_pmu.c
i915_pmu.h
i915_priolist_types.h drm/i915: Remove I915_USER_PRIORITY_SHIFT 2021-03-24 19:30:34 +01:00
i915_pvinfo.h
i915_query.c
i915_query.h
i915_reg.h drm/i915: reserve stolen for LMEM region 2021-03-24 19:30:36 +01:00
i915_request.c Merge tag 'drm-intel-gt-next-2021-04-06' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 2021-04-08 12:46:12 +10:00
i915_request.h Merge tag 'drm-intel-gt-next-2021-04-06' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 2021-04-08 12:46:12 +10:00
i915_scatterlist.c
i915_scatterlist.h
i915_scheduler_types.h
i915_scheduler.c drm/i915: Remove I915_USER_PRIORITY_SHIFT 2021-03-24 19:30:34 +01:00
i915_scheduler.h drm/i915: Strip out internal priorities 2021-03-24 19:30:34 +01:00
i915_selftest.h
i915_suspend.c
i915_suspend.h
i915_sw_fence_work.c
i915_sw_fence_work.h
i915_sw_fence.c
i915_sw_fence.h
i915_switcheroo.c
i915_switcheroo.h
i915_syncmap.c
i915_syncmap.h
i915_sysfs.c
i915_sysfs.h
i915_trace_points.c
i915_trace.h
i915_user_extensions.c
i915_user_extensions.h
i915_utils.c
i915_utils.h
i915_vgpu.c
i915_vgpu.h
i915_vma_types.h drm/i915: Add support for FBs requiring a POT stride alignment 2021-03-29 22:58:12 +03:00
i915_vma.c
i915_vma.h
intel_device_info.c Merge tag 'drm-intel-next-2021-04-01' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 2021-04-08 14:02:21 +10:00
intel_device_info.h Merge tag 'drm-intel-next-2021-04-01' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 2021-04-08 14:02:21 +10:00
intel_dram.c
intel_dram.h
intel_gvt.c
intel_gvt.h
intel_memory_region.c drm/i915: give stolen system memory its own class 2021-03-24 19:31:59 +01:00
intel_memory_region.h drm/i915: give stolen system memory its own class 2021-03-24 19:31:59 +01:00
intel_pch.c
intel_pch.h
intel_pm.c drm/i915: rename DISP_STEPPING->DISPLAY_STEP and GT_STEPPING->GT_STEP 2021-03-29 14:56:17 +03:00
intel_pm.h
intel_runtime_pm.c drm/i915: Fix docbook header for __intel_runtime_pm_get_if_active() 2021-03-31 16:57:33 +03:00
intel_runtime_pm.h
intel_sideband.c
intel_sideband.h
intel_step.c drm/i915: rename i915_rev_steppings->intel_step_info 2021-03-29 14:56:26 +03:00
intel_step.h drm/i915: rename i915_rev_steppings->intel_step_info 2021-03-29 14:56:26 +03:00
intel_uncore.c
intel_uncore.h
intel_wakeref.c
intel_wakeref.h
intel_wopcm.c
intel_wopcm.h
Kconfig
Kconfig.debug
Kconfig.profile drm/i915: Fail too long user submissions by default 2021-03-26 01:01:27 +01:00
Kconfig.unstable
Makefile Merge tag 'drm-intel-next-2021-04-01' of git://anongit.freedesktop.org/drm/drm-intel into drm-next 2021-04-08 14:02:21 +10:00
TODO.txt drm/i915: add gem/gt TODO 2021-03-26 09:24:31 +01:00
vlv_suspend.c
vlv_suspend.h