The NetBSD Project

CVS log for src/sys/external/bsd/drm2/ttm/ttm_bo_vm.c

[BACK] Up to [cvs.NetBSD.org] / src / sys / external / bsd / drm2 / ttm

Request diff between arbitrary revisions


Keyword substitution: kv
Default branch: MAIN


Revision 1.22.4.1: download - view: text, markup, annotated - select for diffs
Fri Oct 4 11:40:53 2024 UTC (2 months ago) by martin
Branches: netbsd-10
Diff to: previous 1.22: preferred, colored; next MAIN 1.23: preferred, colored
Changes since revision 1.22: +217 -113 lines
Pull up following revision(s) (requested by rin in ticket #928):

	sys/external/bsd/drm2/dist/drm/drm_gem.c: revision 1.25
	sys/external/bsd/drm2/dist/drm/radeon/radeon_ci_dpm.c: revision 1.7
	sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/priv.h: revision 1.4
	sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_acpi.c: revision 1.4
	sys/external/bsd/drm2/dist/drm/i915/display/intel_opregion.h: revision 1.6
	sys/external/bsd/drm2/dist/drm/i915/i915_drv.h: revision 1.49
	sys/external/bsd/drm2/include/linux/mxm-wmi.h: revision 1.1
	sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/pci/nouveau_nvkm_subdev_pci_pcie.c: revision 1.4
	sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_base.c: revision 1.13
	sys/external/bsd/common/include/linux/bitops.h: revision 1.17
	sys/external/bsd/drm2/nouveau/files.nouveau: revision 1.40
	sys/external/bsd/drm2/linux/linux_pci.c: revision 1.30
	sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.h: revision 1.5
	sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/pci/nouveau_nvkm_subdev_pci_pcie.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/mxm/nouveau_nvkm_subdev_mxm_base.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_gart.c: revision 1.12
	sys/external/bsd/drm2/dist/drm/radeon/radeon_rv770.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/disp/nouveau_nvkm_engine_disp_sorgm200.c: revision 1.3
	sys/external/bsd/common/include/linux/printk.h: revision 1.14
	sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/instmem/nouveau_nvkm_subdev_instmem_gk20a.c: revision 1.10
	sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_vi.c: revision 1.4
	sys/external/bsd/drm2/include/linux/acpi.h: revision 1.11
	sys/external/bsd/drm2/drm/drm_cdevsw.c: revision 1.31
	sys/external/bsd/drm2/dist/drm/radeon/radeon_si.c: revision 1.6
	sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/i915/display/intel_acpi.h: revision 1.5
	sys/external/bsd/drm2/include/acpi/video.h: revision 1.3
	sys/external/bsd/drm2/dist/drm/radeon/radeon_evergreen.c: revision 1.6
	sys/external/bsd/drm2/dist/drm/nouveau/nouveau_acpi.h: revision 1.4
	sys/arch/sparc64/include/pci_machdep.h: revision 1.31
	sys/arch/sparc64/dev/pci_machdep.c: revision 1.83
	sys/external/bsd/drm2/include/linux/kref.h: revision 1.14
	sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_pci.c: revision 1.12
	sys/external/bsd/drm2/linux/linux_dma_buf.c: revision 1.17
	sys/external/bsd/drm2/dist/drm/nouveau/nvkm/subdev/bios/nouveau_nvkm_subdev_bios_shadowacpi.c: revision 1.4
	sys/external/bsd/drm2/drm/drm_module.c: revision 1.32
	sys/external/bsd/drm2/dist/drm/i915/i915_gem.h: revision 1.8
	sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_dmabuf.c: revision 1.7
	sys/external/bsd/drm2/include/linux/smp.h: revision 1.5
	sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_si.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c: revision 1.20
	sys/arch/x86/x86/bus_dma.c: revision 1.91
	sys/external/bsd/drm2/radeon/files.radeon: revision 1.40
	sys/external/bsd/drm2/include/acpi/acpi_bus.h: revision 1.1
	sys/external/bsd/drm2/dist/drm/nouveau/nouveau_drv.h: revision 1.5
	sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_device.c: revision 1.21
	sys/external/bsd/common/include/asm/barrier.h: revision 1.20
	sys/external/bsd/drm2/include/linux/nbsd-namespace-acpi.h: revision 1.2
	sys/external/bsd/common/include/asm/barrier.h: revision 1.21
	sys/modules/drmkms/drmkms_pci.h: revision 1.1
	sys/external/bsd/drm2/dist/drm/drm_dp_helper.c: revision 1.17
	sys/external/bsd/drm2/radeon/radeon_pci.c: revision 1.23
	sys/external/bsd/drm2/linux/linux_xa.c: revision 1.4
	sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.23
	sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.24
	sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.25
	sys/external/bsd/drm2/linux/linux_pci.c: revision 1.26
	sys/dev/pci/pcivar.h: revision 1.120
	sys/arch/xen/include/pci_machdep.h: revision 1.24
	sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.26
	sys/external/bsd/drm2/linux/linux_pci.c: revision 1.27
	sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.27
	sys/external/bsd/drm2/linux/linux_pci.c: revision 1.28
	sys/external/bsd/drm2/dist/drm/radeon/radeon_cik.c: revision 1.8
	sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.28
	sys/external/bsd/drm2/linux/linux_pci.c: revision 1.29
	sys/external/bsd/drm2/include/linux/pci.h: revision 1.57
	sys/external/bsd/drm2/include/linux/pci.h: revision 1.58
	sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/nouveau/nouveau_display.c: revision 1.6
	sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr/amdgpu_hwmgr.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/amd/display/dc/core/amdgpu_dc_stream.c: revision 1.3
	share/man/man9/bus_dma.9: revision 1.69
	sys/external/bsd/drm2/drm/drm_gem_cma_helper.c: revision 1.15
	sys/external/bsd/drm2/dist/drm/radeon/radeon_acpi.c: revision 1.6
	sys/external/bsd/drm2/dist/drm/radeon/radeon.h: revision 1.12
	sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_cik.c: revision 1.7
	sys/dev/acpi/acpi_mcfg.c: revision 1.29
	sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_acpi.c: revision 1.6
	sys/external/bsd/drm2/dist/drm/radeon/radeon_r600.c: revision 1.7
	sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c: revision 1.13
	sys/modules/amdgpu/Makefile: revision 1.9
	sys/external/bsd/drm2/dist/drm/radeon/radeon_bios.c: revision 1.14
	sys/external/bsd/common/linux/linux_tasklet.c: revision 1.12
	sys/external/bsd/drm2/dist/drm/nouveau/include/nvkm/core/device.h: revision 1.10
	sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c: revision 1.23
	sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu.h: revision 1.9
	sys/external/bsd/drm2/include/linux/interval_tree.h: revision 1.14
	sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c: revision 1.26
	sys/external/bsd/drm2/dist/drm/amd/powerplay/hwmgr/amdgpu_smu7_hwmgr.c: revision 1.5
	sys/dev/pci/pci.c: revision 1.168
	sys/external/bsd/drm2/dist/drm/i915/gem/i915_gem_mman.c: revision 1.27
	sys/external/bsd/drm2/dist/drm/radeon/radeon_si_dpm.c: revision 1.9
	sys/external/bsd/drm2/pci/files.drmkms_pci: revision 1.18
	sys/external/bsd/drm2/linux/linux_sync_file.c: revision 1.3
	sys/external/bsd/drm2/amdgpu/files.amdgpu: revision 1.31
	sys/external/bsd/drm2/dist/drm/nouveau/nvkm/engine/device/nouveau_nvkm_engine_device_tegra.c: revision 1.4
	sys/external/bsd/drm2/dist/drm/drm_gem.c: revision 1.24
	sys/arch/xen/xen/xpci_xenbus.c: revision 1.29

drm: Eliminate __HAVE_ATOMIC_AS_MEMBAR conditionals.
Discussed on tech-kern:
https://mail-index.netbsd.org/tech-kern/2023/02/23/msg028729.html

linux asm/barrier.h: Fix !MULTIPROCESSOR build.

remove "nouveau" from a comment.  noted by jmcneill.

drm: KASSERT(A && B) -> KASSERT(A); KASSERT(B)
comment a function that has a clear overbounds read but it isn't used.
found by GCC 12.

nix the NetBSD specific GEM_BUG_ON().
avoids GCC 12 warnings, and matches upstream closer.
avoid uninitialised variable usage in drm_gem_cma_create_internal().
in the case nothing has returned 'error', 'nsegs' and the dma info
are (potentially) uninitialised, so consider this an error.
found by GCC 12.

avoid a GCC 12 warning.
there's a 1-element long array and a loop conditional that tries to see
if indexes for it are not identical.  as these indexes will always both
be 0, the only valid index, the condition is always false.  GCC 12
triggers a strange warning on this code that can never run (see below),
so simply assert the array size is 1 and comment the rest.
amdgpu_dc_stream.c:470:55: error: array subscript [0, 0] is outside array bounds of 'struct dc_writeback_info[1]' [-Werror=array-bounds]
  470 |                                 stream->writeback_info[j] = stream->writeback_info[i];

convert a KASSERT() into an if () panic() sequence to appease GCC 12.
OK riastradh@.

drm: Fix conditionals around drmkms_pci and agp.
Kernel should build now with all pci drm drivers stripped out but
DRM_LEGACY still enabled.  (Might not be very useful, but it'll
build.  Maybe we should also have DRM_LEGACY_PCI so those drivers can
be modloaded later.)

drmkms: Fix module build.
avoid an unlikely array bounds issue picked up by GCC 12.
nvkm_pcie_speed() can return -1, which is then used as an array index,
so make this default return PCIe 1.0 speeds.

drm: enable almost all PCIe functionality
linux_pci.c revisions 1.24 and 1.25 implemented most of the remaining
missing PCIe backends, but only enabled them for some amdgpu portions.
this enables all code marked with "XXX amdgpu pcie", "XXX radeon pcie",
and "XXX pcie speed".  for most of it, simply removing #ifndefs __NetBSD__
to enable compliation was required, once the new "bus->max_bus_speed"
member was added to struct pci_bus.  add an "always fails" backend for
pci_enable_atomic_ops_to_root() which seems to only be necessary
for virtual GPU functionality (and could be implemented if needed.)
tested on radeon 5450, 7750, R7 240 [radeon], and RX 550 [amdgpu], and
nvidia 750 and 1030 [nouveau].
this still does not quite work on nvidia cards.  there are two problems
that remain:
- the call to set the link speed is skipped because the speed is set
  to the default value of "-1".  nvkm_pcie_set_link() will actually
  determine the right value for this and for some cards, calling this
  function if the current speed is -1 helps set the link speed.  it
  may be that on linux other paths we don't have enabled properly
  would set this (there's one via debugfs, and a jetson specific one,
  though perhaps setting either AC or DC speed values as boot options
  (after hooking up these for netbsd) would currently work.
- worse, cards newer than kepler - geforce 900, 1000, and newer, are
  all lacking the backing support to set pcie link speed.  the GT 1030
  card i have been testing with remains at pcie 1.0.

radeon: fix and enable ACPI methods for getting ROM BIOS
The hacky way of getting the BIOS mapped only works on x86. ACPI
should be preferred if available. Makes BIOS reading though VFCT
work on aarch64 with EDK2. (But only if EDK2 has POSTed the GPU.)
XXX amdgpu should get the same treatment.

drm: put_cpu() should enable preemption, not disable it again

drm(4): make pr_debug equivalent to aprint_debug
significantly reduces the default spam from amdgpu(4).

drm: Set CONFIG_ACPI in linux/acpi.h and make it build.

Leave a little ACPI-related functionality disabled for now, like
getting EDID out of ACPI -- needs a bit more work to make this work,
and I don't have hardware to work on that.
Should help with failures of the forms:
- unable to locate a BIOS ROM
- bios: unable to locate usable image
on various machines.

radeon_acpi.c: ifdef out unused function on NetBSD.
Should fix syzkaller build.

drm(4): Fix st_rdev in stat.
dminor->index already has the 64*type adjustment, as allocated in
drm_minor_alloc.
PR kern/58180

linux_sync_file: Fix missing init/fini steps.
Noted by rjs@.
PR kern/58210

ttm: Sync ttm_bo_uvm_fault_idle better with Linux.
PR xsrc/58133
ttm: Undo mistake in previous.

PR xsrc/58133
linux: Add a few more cases to pci_get_class.
Should fix crash on boot with amdgpu now that the ACPI business is
enabled.

i915: Fix dmabuf mmap object.

drm: Fix missing bounds checks in dma buf mmap.

drm_gem.c: Fix sense of assertion.
This is the opposite of WARN_ON.
Noted by rjs@.

drm_gem.c: Enable drm_gem_fence_array_add now that we emulate xa.
linux_xa: Delete and replace collision in xa_store as intended.
Don't free the colliding node that's still in the tree.
Noted by rjs@.

i915_gem_mman.c: Apply mmap types via pmap flags.
This way, userland gets buffers mapped write-combining or uncached as
needed.
PR xsrc/58307

x86: Teach bus_dmamem_map about BUS_DMA_PREFETCHABLE.
PR port-amd64/58308

bus_dma(9): Document BUS_DMA_PREFETCHABLE.
Like BUS_DMA_NOCACHE.  Doesn't absolve you of the need for
bus_dmamap_sync, but if you later pass the vaddr to bus_dmamap_load,
the DMA map might notice the mapping is write-combining and use this
to make bus_dmamap_sync cheaper.
PR kern/58309

nouveau_nvkm_subdev_instmem_gk20a.c: Use BUS_DMA_PREFETCHABLE.
Matches Linux's pgprot_writecombine.
Unclear where the appropriate bus_dmamap_sync happens, or is supposed
to happen -- not using it would be wrong, but asking for a
prefetchable mapping may paper over symptoms, at least!

ttm: Sync more with Linux.
Add the original copyright and attribution since this is now,
intentionally, a modified copy of the original and not just roughly
the same algorithm.

ttm: Respect PGO_ALLPAGES.
Not sure this is useful but it reduces XXX's and makes this match
udv_fault better so it's easier to understand.

ttm: Sync cacheability flag logic with Linux.

ttm: Add XXX about readahead fault failures.

pci: Pass cookie through pci_find_device, pci_enumerate_bus, take 2.
New functions pci_find_device1 and pci_enumerate_bus1 have the cookie
argument.  Existing symbols pci_find_device and pci_enumerate_bus are
now wrappers for the cookieless version.
This will allow pci_find_device callers to pass a cookie through to
the match function so they can keep state or pass in extra parameters
like b/d/f numbers, which will allow us to nix some horrible kludges
in the Linux PCI API emulation for drm (and, perhaps, Intel wifi).
This change drops the symbol pci_probe_device, in favour of a new
pci_probe_device1 with the cookie argument.  But I don't think that
requires a revbump because it's only called by MD pci_enumerate_bus1
implementations, which don't live in modules anyway.
Take 2: Make sure to handle NULL match function.
linux_pci: Nix pci enumeration kludges.
Now that we can pass a cookie through, this stuff will be a little
less fragile.

i915: Omit needless i915_gem_object_pin/unpin_pages cycle in fault.
vm_fault_cpu and vm_fault_gtt, called by i915_gem_fault, already do
the pinning and unpinning internally, so there is no need for
i915_gem_fault to do it.
No functional change intended, except that the transient pin count
will be one lower than before during the fault routine (but it will
still be positive).

i915: Match Linux fault routine return code actions.
Omit needless EINTR interception -- this is now handled by
i915_error_to_vmf_fault.
Earlier revert was over a false alarm -- bisection shows the new
warnings arose from linux_pci.c 1.29 here:
https://mail-index.netbsd.org/source-changes/2024/06/23/msg151929.html

linux_pci: Fix shifto in pci_get_class.
It looks like Linux's pci_get_class also matches the interface part
of the PCI class register (but not the revision part), and I hadn't
noticed that in the previous shim structured differently.

With GCC12 kernel ALL/amd64 triggers "'sor' may be used uninitialized".
If "sublinks & 3" is zero GCC is right and sor[1] may be returned unitialized.
Fix by initializing "sor" to zero to return -1 instead of uninitialized value.
Ok: Taylor R Campbell <riastradh@>

amdgpu: Map BAR 2, not BAR 5, on pre-bonaire chips.
PR kern/58384

amdgpu: Map consecutive pages, not the same one over and over again.
PR kern/58385

linux/bitops: Fix overestimate for BITS_TO_LONGS(9)
Fortunately, this seems harmless except for allocating
excessive buffer memory.
Pointed out by nonaka@, OK riastradh@.

Revision 1.28: download - view: text, markup, annotated - select for diffs
Sun Jun 23 00:49:31 2024 UTC (5 months, 2 weeks ago) by riastradh
Branches: MAIN
CVS tags: perseant-exfatfs-base-20240630, perseant-exfatfs-base, perseant-exfatfs, HEAD
Diff to: previous 1.27: preferred, colored
Changes since revision 1.27: +7 -2 lines
ttm: Add XXX about readahead fault failures.

Revision 1.27: download - view: text, markup, annotated - select for diffs
Sun Jun 23 00:49:20 2024 UTC (5 months, 2 weeks ago) by riastradh
Branches: MAIN
Diff to: previous 1.26: preferred, colored
Changes since revision 1.26: +10 -11 lines
ttm: Sync cacheability flag logic with Linux.

Revision 1.26: download - view: text, markup, annotated - select for diffs
Sun Jun 23 00:49:06 2024 UTC (5 months, 2 weeks ago) by riastradh
Branches: MAIN
Diff to: previous 1.25: preferred, colored
Changes since revision 1.25: +4 -3 lines
ttm: Respect PGO_ALLPAGES.

Not sure this is useful but it reduces XXX's and makes this match
udv_fault better so it's easier to understand.

Revision 1.25: download - view: text, markup, annotated - select for diffs
Sun Jun 23 00:48:56 2024 UTC (5 months, 2 weeks ago) by riastradh
Branches: MAIN
Diff to: previous 1.24: preferred, colored
Changes since revision 1.24: +200 -123 lines
ttm: Sync more with Linux.

Add the original copyright and attribution since this is now,
intentionally, a modified copy of the original and not just roughly
the same algorithm.

Revision 1.24: download - view: text, markup, annotated - select for diffs
Sun May 19 13:50:04 2024 UTC (6 months, 3 weeks ago) by riastradh
Branches: MAIN
Diff to: previous 1.23: preferred, colored
Changes since revision 1.23: +4 -2 lines
ttm: Undo mistake in previous.

PR xsrc/58133

Revision 1.23: download - view: text, markup, annotated - select for diffs
Sun May 19 13:28:28 2024 UTC (6 months, 3 weeks ago) by riastradh
Branches: MAIN
Diff to: previous 1.22: preferred, colored
Changes since revision 1.22: +38 -18 lines
ttm: Sync ttm_bo_uvm_fault_idle better with Linux.

PR xsrc/58133

Revision 1.22: download - view: text, markup, annotated - select for diffs
Thu Jul 21 08:07:56 2022 UTC (2 years, 4 months ago) by riastradh
Branches: MAIN
CVS tags: thorpej-ifq-base, thorpej-ifq, thorpej-altq-separation-base, thorpej-altq-separation, netbsd-10-base, netbsd-10-0-RELEASE, netbsd-10-0-RC6, netbsd-10-0-RC5, netbsd-10-0-RC4, netbsd-10-0-RC3, netbsd-10-0-RC2, netbsd-10-0-RC1, bouyer-sunxi-drm-base, bouyer-sunxi-drm
Branch point for: netbsd-10
Diff to: previous 1.21: preferred, colored
Changes since revision 1.21: +8 -8 lines
drm/ttm: Cast to potentially larger types before << PAGE_SHIFT.

Not sure if this is a problem but it might affect, e.g., i386pae.
Can't hurt, in any case, to cast to what the type will be after the
shift anyway.

Revision 1.21: download - view: text, markup, annotated - select for diffs
Wed Jul 20 01:12:14 2022 UTC (2 years, 4 months ago) by riastradh
Branches: MAIN
Diff to: previous 1.20: preferred, colored
Changes since revision 1.20: +8 -5 lines
drm/ttm: Handle io_mem_pfn, used by amdgpu.

Revision 1.20: download - view: text, markup, annotated - select for diffs
Sun Dec 19 11:34:14 2021 UTC (2 years, 11 months ago) by riastradh
Branches: MAIN
Diff to: previous 1.19: preferred, colored
Changes since revision 1.19: +25 -3 lines
drm/ttm: More careful diagnostics earlier on.

Revision 1.19: download - view: text, markup, annotated - select for diffs
Sun Dec 19 11:34:06 2021 UTC (2 years, 11 months ago) by riastradh
Branches: MAIN
Diff to: previous 1.18: preferred, colored
Changes since revision 1.18: +8 -4 lines
drm/ttm: Compare bytes to bytes, not pages to bytes.

While here, KASSERT -> KASSERTMSG for better diagnostics.

Revision 1.18: download - view: text, markup, annotated - select for diffs
Sun Dec 19 11:09:25 2021 UTC (2 years, 11 months ago) by riastradh
Branches: MAIN
Diff to: previous 1.17: preferred, colored
Changes since revision 1.17: +2 -3 lines
drm/ttm: ttm_bo_put(bo) won't bo=NULL like ttm_bo_unref(&bo) did.

Revision 1.17: download - view: text, markup, annotated - select for diffs
Sun Dec 19 09:57:33 2021 UTC (2 years, 11 months ago) by riastradh
Branches: MAIN
Diff to: previous 1.16: preferred, colored
Changes since revision 1.16: +5 -3 lines
Don't call TTM functions that were removed, try replacements


Author: Maya Rashish <maya@NetBSD.org>

Revision 1.16: download - view: text, markup, annotated - select for diffs
Sun Dec 19 09:57:17 2021 UTC (2 years, 11 months ago) by riastradh
Branches: MAIN
Diff to: previous 1.15: preferred, colored
Changes since revision 1.15: +11 -11 lines
More obvious part of TTM API changes:

- ref/unref to get/put
- some global TTM things are now global
- More indirection to get vma_node


Author: Maya Rashish <maya@NetBSD.org>

Revision 1.15: download - view: text, markup, annotated - select for diffs
Sun Dec 19 01:47:24 2021 UTC (2 years, 11 months ago) by riastradh
Branches: MAIN
Diff to: previous 1.14: preferred, colored
Changes since revision 1.14: +27 -14 lines
Sync ttm_bo_vm.c.

Revision 1.10.18.2: download - view: text, markup, annotated - select for diffs
Wed Apr 8 14:08:28 2020 UTC (4 years, 8 months ago) by martin
Branches: phil-wifi
Diff to: previous 1.10.18.1: preferred, colored; branchpoint 1.10: preferred, colored; next MAIN 1.11: preferred, colored
Changes since revision 1.10.18.1: +4 -7 lines
Merge changes from current as of 20200406

Revision 1.12.6.1: download - view: text, markup, annotated - select for diffs
Sat Feb 29 20:20:18 2020 UTC (4 years, 9 months ago) by ad
Branches: ad-namecache
Diff to: previous 1.12: preferred, colored; next MAIN 1.13: preferred, colored
Changes since revision 1.12: +4 -7 lines
Sync with head.

Revision 1.14: download - view: text, markup, annotated - select for diffs
Sun Feb 23 15:46:40 2020 UTC (4 years, 9 months ago) by ad
Branches: MAIN
CVS tags: thorpej-i2c-spi-conf2-base, thorpej-i2c-spi-conf2, thorpej-i2c-spi-conf-base, thorpej-i2c-spi-conf, thorpej-futex2-base, thorpej-futex2, thorpej-futex-base, thorpej-futex, thorpej-cfargs2-base, thorpej-cfargs2, thorpej-cfargs-base, thorpej-cfargs, phil-wifi-20200421, phil-wifi-20200411, phil-wifi-20200406, is-mlppp-base, is-mlppp, cjep_sun2x-base1, cjep_sun2x-base, cjep_sun2x, cjep_staticlib_x-base1, cjep_staticlib_x-base, cjep_staticlib_x, bouyer-xenpvh-base2, bouyer-xenpvh-base1, bouyer-xenpvh-base, bouyer-xenpvh, ad-namecache-base3
Diff to: previous 1.13: preferred, colored
Changes since revision 1.13: +3 -3 lines
UVM locking changes, proposed on tech-kern:

- Change the lock on uvm_object, vm_amap and vm_anon to be a RW lock.
- Break v_interlock and vmobjlock apart.  v_interlock remains a mutex.
- Do partial PV list locking in the x86 pmap.  Others to follow later.

Revision 1.13: download - view: text, markup, annotated - select for diffs
Tue Jan 28 23:24:09 2020 UTC (4 years, 10 months ago) by jmcneill
Branches: MAIN
Diff to: previous 1.12: preferred, colored
Changes since revision 1.12: +3 -6 lines
Do not extract mmap flags from the bus_space_mmap cookie as they may
conflict with the bo's existing protection flags. This caused VRAM to
be incorrectly mapped as Device-nGnRE on Arm64 instead of Normal-NC. Ok
riastradh@.

Revision 1.10.18.1: download - view: text, markup, annotated - select for diffs
Mon Jun 10 22:08:33 2019 UTC (5 years, 6 months ago) by christos
Branches: phil-wifi
Diff to: previous 1.10: preferred, colored
Changes since revision 1.10: +6 -12 lines
Sync with HEAD

Revision 1.10.10.1: download - view: text, markup, annotated - select for diffs
Mon Apr 22 09:03:55 2019 UTC (5 years, 7 months ago) by martin
Branches: netbsd-8
CVS tags: netbsd-8-3-RELEASE, netbsd-8-2-RELEASE, netbsd-8-1-RELEASE, netbsd-8-1-RC1
Diff to: previous 1.10: preferred, colored; next MAIN 1.11: preferred, colored
Changes since revision 1.10: +3 -3 lines
Pull up following revision(s) (requested by mrg in ticket #1239):

	sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.12

ttm_bo_uvm_fault() is a netbsd API function and thus should return
netbsd errnos.  fix the one "return -ERESTART".

Revision 1.12: download - view: text, markup, annotated - select for diffs
Sat Mar 9 01:59:47 2019 UTC (5 years, 9 months ago) by mrg
Branches: MAIN
CVS tags: phil-wifi-20191119, phil-wifi-20190609, netbsd-9-base, netbsd-9-4-RELEASE, netbsd-9-3-RELEASE, netbsd-9-2-RELEASE, netbsd-9-1-RELEASE, netbsd-9-0-RELEASE, netbsd-9-0-RC2, netbsd-9-0-RC1, netbsd-9, isaki-audio2-base, isaki-audio2, ad-namecache-base2, ad-namecache-base1, ad-namecache-base
Branch point for: ad-namecache
Diff to: previous 1.11: preferred, colored
Changes since revision 1.11: +3 -3 lines
ttm_bo_uvm_fault() is a netbsd API function and thus should return
netbsd errnos.  fix the one "return -ERESTART".

Revision 1.10.16.1: download - view: text, markup, annotated - select for diffs
Thu Sep 6 06:56:37 2018 UTC (6 years, 3 months ago) by pgoyette
Branches: pgoyette-compat
CVS tags: pgoyette-compat-merge-20190127
Diff to: previous 1.10: preferred, colored; next MAIN 1.11: preferred, colored
Changes since revision 1.10: +5 -11 lines
Sync with HEAD

Resolve a couple of conflicts (result of the uimin/uimax changes)

Revision 1.11: download - view: text, markup, annotated - select for diffs
Mon Aug 27 07:53:28 2018 UTC (6 years, 3 months ago) by riastradh
Branches: MAIN
CVS tags: pgoyette-compat-20190127, pgoyette-compat-20190118, pgoyette-compat-1226, pgoyette-compat-1126, pgoyette-compat-1020, pgoyette-compat-0930, pgoyette-compat-0906
Diff to: previous 1.10: preferred, colored
Changes since revision 1.10: +5 -11 lines
struct ttm_bo_device::fence_lock is no more.

Revision 1.3.2.3: download - view: text, markup, annotated - select for diffs
Sun Dec 3 11:38:01 2017 UTC (7 years ago) by jdolecek
Branches: tls-maxphys
Diff to: previous 1.3.2.2: preferred, colored; next MAIN 1.4: preferred, colored
Changes since revision 1.3.2.2: +25 -15 lines
update from HEAD

Revision 1.8.2.1: download - view: text, markup, annotated - select for diffs
Tue Sep 22 12:06:05 2015 UTC (9 years, 2 months ago) by skrll
Branches: nick-nhusb
Diff to: previous 1.8: preferred, colored; next MAIN 1.9: preferred, colored
Changes since revision 1.8: +6 -5 lines
Sync with HEAD

Revision 1.2.4.6: download - view: text, markup, annotated - select for diffs
Thu Jul 30 15:29:25 2015 UTC (9 years, 4 months ago) by snj
Branches: netbsd-7
CVS tags: netbsd-7-nhusb-base-20170116, netbsd-7-nhusb-base, netbsd-7-nhusb, netbsd-7-2-RELEASE, netbsd-7-1-RELEASE, netbsd-7-1-RC2, netbsd-7-1-RC1, netbsd-7-1-2-RELEASE, netbsd-7-1-1-RELEASE, netbsd-7-1, netbsd-7-0-RELEASE, netbsd-7-0-RC3, netbsd-7-0-2-RELEASE, netbsd-7-0-1-RELEASE, netbsd-7-0
Diff to: previous 1.2.4.5: preferred, colored; branchpoint 1.2: preferred, colored; next MAIN 1.3: preferred, colored
Changes since revision 1.2.4.5: +6 -5 lines
Pull up following revision(s) (requested by riastradh in ticket #894):
	sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revisions 1.9, 1.10
Fix error branch: ttm_bo_unreserve on failure after ttm_bo_reserve.
Tiny chance this will fix PR kern/49862 by not leaking a ww_mutex
lock.
--
ttm_bo_unreserve in case of ttm_bo_uvm_fault_idle restart.
Better chance of fixing PR kern/49862 by avoiding leaking a buffer
ww_mutex lock.

Revision 1.10: download - view: text, markup, annotated - select for diffs
Tue Jul 28 01:25:00 2015 UTC (9 years, 4 months ago) by riastradh
Branches: MAIN
CVS tags: tls-maxphys-base-20171202, prg-localcount2-base3, prg-localcount2-base2, prg-localcount2-base1, prg-localcount2-base, prg-localcount2, phil-wifi-base, pgoyette-localcount-base, pgoyette-localcount-20170426, pgoyette-localcount-20170320, pgoyette-localcount-20170107, pgoyette-localcount-20161104, pgoyette-localcount-20160806, pgoyette-localcount-20160726, pgoyette-localcount, pgoyette-compat-base, pgoyette-compat-0728, pgoyette-compat-0625, pgoyette-compat-0521, pgoyette-compat-0502, pgoyette-compat-0422, pgoyette-compat-0415, pgoyette-compat-0407, pgoyette-compat-0330, pgoyette-compat-0322, pgoyette-compat-0315, perseant-stdc-iso10646-base, perseant-stdc-iso10646, nick-nhusb-base-20170825, nick-nhusb-base-20170204, nick-nhusb-base-20161204, nick-nhusb-base-20161004, nick-nhusb-base-20160907, nick-nhusb-base-20160529, nick-nhusb-base-20160422, nick-nhusb-base-20160319, nick-nhusb-base-20151226, nick-nhusb-base-20150921, netbsd-8-base, netbsd-8-0-RELEASE, netbsd-8-0-RC2, netbsd-8-0-RC1, matt-nb8-mediatek-base, matt-nb8-mediatek, localcount-20160914, jdolecek-ncq-base, jdolecek-ncq, bouyer-socketcan-base1, bouyer-socketcan-base, bouyer-socketcan
Branch point for: phil-wifi, pgoyette-compat, netbsd-8
Diff to: previous 1.9: preferred, colored
Changes since revision 1.9: +4 -3 lines
ttm_bo_unreserve in case of ttm_bo_uvm_fault_idle restart.

Better chance of fixing PR kern/49862 by avoiding leaking a buffer
ww_mutex lock.

Revision 1.9: download - view: text, markup, annotated - select for diffs
Mon Jul 27 22:26:50 2015 UTC (9 years, 4 months ago) by riastradh
Branches: MAIN
Diff to: previous 1.8: preferred, colored
Changes since revision 1.8: +4 -4 lines
Fix error branch: ttm_bo_unreserve on failure after ttm_bo_reserve.

Tiny chance this will fix PR kern/49862 by not leaking a ww_mutex
lock.

Revision 1.2.4.5: download - view: text, markup, annotated - select for diffs
Fri Nov 14 14:22:41 2014 UTC (10 years ago) by martin
Branches: netbsd-7
CVS tags: netbsd-7-0-RC2, netbsd-7-0-RC1
Diff to: previous 1.2.4.4: preferred, colored; branchpoint 1.2: preferred, colored
Changes since revision 1.2.4.4: +4 -5 lines
Pull up following revision(s) (requested by snj in ticket #224):
	sys/external/bsd/drm2/dist/drm/radeon/radeon_drv.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/i915/intel_overlay.c: revision 1.6
	sys/external/bsd/drm2/dist/drm/radeon/sumo_dpm.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/radeon/atombios_dp.c: revision 1.4
	sys/external/bsd/drm2/dist/drm/i915/intel_dp.c: revision 1.9
	sys/external/bsd/drm2/dist/drm/radeon/trinity_dpm.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/radeon/r100.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/radeon/rv770_dpm.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/radeon/evergreen_cs.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/i915/i915_gem_tiling.c: revision 1.4
	sys/external/bsd/drm2/dist/drm/radeon/evergreen_cs.c: revision 1.4
	sys/external/bsd/drm2/dist/drm/i915/intel_display.c: revision 1.13
	sys/external/bsd/drm2/dist/drm/radeon/si_dpm.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/radeon/kv_dpm.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/radeon/kv_dpm.c: revision 1.4
	sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/radeon/ci_dpm.c: revision 1.4
	sys/external/bsd/drm2/dist/drm/i915/intel_tv.c: revision 1.6
	sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.8
test some pointers and return EINVAL instead of blindly assuming
they're valid.  converts kernel crashes in to app failures.
GL is still not working on evergreen for me.
Use %hhx for uint8_t, not %hx.
Mark some unused variables as such to shut up Clang.
Ifdef out nonsensical comparison until we update from upstream.
We don't use radeon_(un)register_atpx_handler at the moment.
Ifdef out another nonsensical comparison.
fix uninitialized
fix shadowing for min() and max() from libkern
Fix little C issues in i915drmkms hindering the Clang build.
- Test `x == NULL', not `&container_of(x, t, base)->base == NULL'.
- Fix format strings in intel_dp_probe_oui to use %hhx for uint8_t.
- Omit needless ioread32 in intel_overlay.c.
- Ifdef out unused definitions in intel_tv.c.
Update comment to reflect recent change to.

Revision 1.2.4.4: download - view: text, markup, annotated - select for diffs
Mon Nov 10 19:45:54 2014 UTC (10 years, 1 month ago) by martin
Branches: netbsd-7
Diff to: previous 1.2.4.3: preferred, colored; branchpoint 1.2: preferred, colored
Changes since revision 1.2.4.3: +8 -11 lines
Pull up following revision(s) (requested by snj in ticket #191):
	sys/external/bsd/drm2/include/linux/io-mapping.h: revision 1.4
	sys/external/bsd/drm2/dist/uapi/drm/drm.h: revision 1.5
	sys/external/bsd/drm2/dist/drm/i915/intel_panel.c: revision 1.5
	sys/external/bsd/drm2/dist/uapi/drm/drm.h: revision 1.6
	sys/external/bsd/drm2/dist/drm/i915/intel_drv.h: revision 1.7
	sys/external/bsd/drm2/include/linux/ww_mutex.h: revision 1.7
	sys/external/bsd/drm2/dist/drm/i915/intel_dp.c: revision 1.8
	sys/external/bsd/drm2/dist/drm/i915/i915_ums.c: revision 1.2
	sys/external/bsd/drm2/dist/drm/i915/intel_pm.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/i915/i915_debugfs.c: revision 1.2
	sys/external/bsd/drm2/dist/drm/i915/i915_drv.h: revision 1.9
	sys/external/bsd/drm2/dist/drm/i915/i915_cmd_parser.c: revision 1.4
	sys/external/bsd/drm2/dist/drm/i915/intel_dsi.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/i915/intel_display.c: revision 1.11
	sys/external/bsd/drm2/dist/drm/i915/intel_hdmi.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/i915/intel_display.c: revision 1.12
	sys/external/bsd/drm2/include/asm/processor.h: revision 1.3
	sys/external/bsd/drm2/dist/drm/i915/intel_crt.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/i915/intel_sideband.c: revision 1.2
	sys/external/bsd/drm2/dist/drm/i915/intel_ddi.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/i915/intel_tv.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/i915/i915_dma.c: revision 1.11
	sys/external/bsd/drm2/dist/drm/i915/i915_irq.c: revision 1.10
	sys/external/bsd/drm2/dist/drm/i915/i915_gem.c: revision 1.16
	sys/external/bsd/drm2/dist/drm/i915/i915_gem.c: revision 1.17
	sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.6
	sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.7
	sys/external/bsd/drm2/drm/drm_module.c: revision 1.8
	sys/external/bsd/drm2/dist/drm/i915/intel_sprite.c: revision 1.2
	sys/external/bsd/drm2/dist/drm/i915/intel_dsi_cmd.c: revision 1.2
	sys/external/bsd/drm2/i915drm/intelfb.c: revision 1.10
	sys/external/bsd/drm2/dist/drm/i915/intel_dvo.c: revision 1.2
	sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c: revision 1.6
	sys/external/bsd/drm2/dist/drm/i915/intel_lvds.c: revision 1.6
Code cleanup and minor bugfixes for drm2.

Revision 1.8: download - view: text, markup, annotated - select for diffs
Thu Nov 6 13:14:31 2014 UTC (10 years, 1 month ago) by riastradh
Branches: MAIN
CVS tags: nick-nhusb-base-20150606, nick-nhusb-base-20150406, nick-nhusb-base
Branch point for: nick-nhusb
Diff to: previous 1.7: preferred, colored
Changes since revision 1.7: +4 -5 lines
Update comment to reflect recent change to.

Revision 1.7: download - view: text, markup, annotated - select for diffs
Wed Nov 5 15:03:19 2014 UTC (10 years, 1 month ago) by riastradh
Branches: MAIN
Diff to: previous 1.6: preferred, colored
Changes since revision 1.6: +3 -3 lines
Oops -- fix call to ttm_bo_uvm_fault_idle in last commit.

Revision 1.6: download - view: text, markup, annotated - select for diffs
Wed Nov 5 14:47:16 2014 UTC (10 years, 1 month ago) by riastradh
Branches: MAIN
Diff to: previous 1.5: preferred, colored
Changes since revision 1.5: +7 -10 lines
Simplify uvmfault_unlockall use in ttm_bo_uvm_fault.

Pass NULL for uobj instead of locking uobj->vmobjlock before calling
uvmfault_unlockall.

Should fix lockdebug unlocking-unlocked-mutex crash in
ttm_bo_uvm_fault_idle.

XXX pullup to netbsd-7

Revision 1.2.4.3: download - view: text, markup, annotated - select for diffs
Sun Sep 21 18:04:38 2014 UTC (10 years, 2 months ago) by snj
Branches: netbsd-7
Diff to: previous 1.2.4.2: preferred, colored; branchpoint 1.2: preferred, colored
Changes since revision 1.2.4.2: +6 -4 lines
Pull up following revision(s) (requested by riastradh in ticket #98):
	sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.5
We dropped vmobjlock, so reacquire it before uvmfault_unlockall.

Revision 1.5: download - view: text, markup, annotated - select for diffs
Wed Sep 10 18:24:16 2014 UTC (10 years, 3 months ago) by riastradh
Branches: MAIN
Diff to: previous 1.4: preferred, colored
Changes since revision 1.4: +6 -4 lines
We dropped vmobjlock, so reacquire it before uvmfault_unlockall.

Revision 1.2.4.2: download - view: text, markup, annotated - select for diffs
Fri Aug 22 10:35:59 2014 UTC (10 years, 3 months ago) by martin
Branches: netbsd-7
Diff to: previous 1.2.4.1: preferred, colored; branchpoint 1.2: preferred, colored
Changes since revision 1.2.4.1: +7 -3 lines
Pull up following revision(s) (requested by riastradh in ticket #46):
	sys/external/bsd/drm2/dist/drm/i915/i915_gem.c: revision 1.15
	sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.4
Do not take the {ttm,gem} vmobjlock in the fault handler.
- We don't need this lock.
- uvm does nothing between taking it and calling the fault handler.
- Now that the uvm_aobj shares vmobjlock with the {ttm,gem} uvm
  object, we must not hold the lock when we call uvm_obj_wirepages on
  the uvm_aobj.

Revision 1.4: download - view: text, markup, annotated - select for diffs
Wed Aug 20 13:48:08 2014 UTC (10 years, 3 months ago) by riastradh
Branches: MAIN
Diff to: previous 1.3: preferred, colored
Changes since revision 1.3: +7 -3 lines
Drop take the {ttm,gem} vmobjlock in the fault handler.

- We don't need this lock.
- uvm does nothing between taking it and calling the fault handler.
- Now that the uvm_aobj shares vmobjlock with the {ttm,gem} uvm
  object, we must not hold the lock when we call uvm_obj_wirepages on
  the uvm_aobj.

XXX pullup to netbsd-7

Revision 1.3.2.2: download - view: text, markup, annotated - select for diffs
Wed Aug 20 00:04:22 2014 UTC (10 years, 3 months ago) by tls
Branches: tls-maxphys
Diff to: previous 1.3.2.1: preferred, colored
Changes since revision 1.3.2.1: +281 -0 lines
Rebase to HEAD as of a few days ago.

Revision 1.2.4.1: download - view: text, markup, annotated - select for diffs
Mon Aug 18 07:49:10 2014 UTC (10 years, 3 months ago) by martin
Branches: netbsd-7
Diff to: previous 1.2: preferred, colored
Changes since revision 1.2: +14 -7 lines
Pull up following revision(s) (requested by riastradh in ticket #36):
	sys/external/bsd/drm2/dist/drm/drm_gem.c: revision 1.5
	sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c: revision 1.5
	sys/external/bsd/drm2/ttm/ttm_bo_vm.c: revision 1.3
	sys/external/bsd/drm2/dist/drm/ttm/ttm_bo.c: revision 1.6
bus_space_mmap cookies are not paddrs, so don't pmap_enter them!
For gem and ttm objects backed by uvm_aobjs, share the vmobjlock.
XXX pullup to 7
Simplify previous.

Revision 1.3.2.1
Mon Aug 18 01:17:34 2014 UTC (10 years, 3 months ago) by tls
Branches: tls-maxphys
FILE REMOVED
Changes since revision 1.3: +0 -288 lines
file ttm_bo_vm.c was added on branch tls-maxphys on 2014-08-20 00:04:22 +0000

Revision 1.3: download - view: text, markup, annotated - select for diffs
Mon Aug 18 01:17:34 2014 UTC (10 years, 3 months ago) by riastradh
Branches: MAIN
Branch point for: tls-maxphys
Diff to: previous 1.2: preferred, colored
Changes since revision 1.2: +14 -7 lines
bus_space_mmap cookies are not paddrs, so don't pmap_enter them!

Revision 1.2.2.2: download - view: text, markup, annotated - select for diffs
Sun Aug 10 06:55:40 2014 UTC (10 years, 4 months ago) by tls
Branches: tls-earlyentropy
Diff to: previous 1.2.2.1: preferred, colored; branchpoint 1.2: preferred, colored; next MAIN 1.3: preferred, colored
Changes since revision 1.2.2.1: +281 -0 lines
Rebase.

Revision 1.2.2.1
Sat Aug 9 00:18:58 2014 UTC (10 years, 4 months ago) by tls
Branches: tls-earlyentropy
FILE REMOVED
Changes since revision 1.2: +0 -281 lines
file ttm_bo_vm.c was added on branch tls-earlyentropy on 2014-08-10 06:55:40 +0000

Revision 1.2: download - view: text, markup, annotated - select for diffs
Sat Aug 9 00:18:58 2014 UTC (10 years, 4 months ago) by riastradh
Branches: MAIN
CVS tags: tls-maxphys-base, tls-earlyentropy-base, netbsd-7-base
Branch point for: tls-earlyentropy, netbsd-7
Diff to: previous 1.1: preferred, colored
Changes since revision 1.1: +3 -3 lines
Multiply by PAGE_SIZE, not PAGE_SHIFT!

Revision 1.1: download - view: text, markup, annotated - select for diffs
Wed Jul 16 20:59:58 2014 UTC (10 years, 4 months ago) by riastradh
Branches: MAIN
First whack at radeon driver.

No hardware to test yet, but it builds.

Diff request

This form allows you to request diffs between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.

Log view options

CVSweb <webmaster@jp.NetBSD.org>