Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.2.2; 1.2.6;
merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Move files which are gone upstream out of dist/.

Move some drm PCI stuff off drmP.h


Author: Maya Rashish <maya@NetBSD.org>

Avoid declarations that appear in drm_debugfs.h


Author: Maya Rashish <maya@NetBSD.org>

Move drm_cdevsw out of drmP.h which should eventually be removed

drm_device.h seems like an OK spot.


Author: Maya Rashish <maya@NetBSD.org>

remove declarations now in drm_irq.h


Author: Maya Rashish <maya@NetBSD.org>

delete defines now in drm_pci.h and drm_internal.h


Author: Maya Rashish <maya@NetBSD.org>

remove unused definitions


Author: Maya Rashish <maya@NetBSD.org>

Remove more things defined in headers off drmP.h

(either drm_internal.h, drm_drv.h, drm_debugfs.h)


Author: Maya Rashish <maya@NetBSD.org>

Move more ifdef NetBSD goo from drmP.h to new headers


Author: Maya Rashish <maya@NetBSD.org>

move ifdef goo from drmP.h to drm_file.h

Remove declarations already appearing in other headers


Author: Maya Rashish <maya@NetBSD.org>

Delete structs that got moved off to different files.


Author: Maya Rashish <maya@NetBSD.org>

Move drm_file ifdef goo to the one defined in drm_file.h.

drm_lock_data is defined in drm_auth.h and already has the
ifdef goo.


Author: Maya Rashish <maya@NetBSD.org>

Remove declarations that appear in other headers or are unused


Author: Maya Rashish <maya@NetBSD.org>

Move drm_device ifdef goo to drm_drv.h

And drm vblank stuff to drm_vblank.h


Author: Maya Rashish <maya@NetBSD.org>

Remove drm_device_is_unplugged from drmP.h

Now defined in drm_drv.h.


Author: Maya Rashish <maya@NetBSD.org>

Remove unused function (local diff)


Author: Maya Rashish <maya@NetBSD.org>

move drmP drm_ioctl stuff to drm_ioctl.h

including ifdef goo


Author: Maya Rashish <maya@NetBSD.org>

drm_can_sleep now lives in drm_util.h, move ifdef goo there.


Author: Maya Rashish <maya@NetBSD.org>

struct drm_device is now in drm_device.h. move netbsd ifdef goo there


Author: Maya Rashish <maya@NetBSD.org>

Remove duplicate drm debug prints (now moved to debug_print.h)


Author: Maya Rashish <maya@NetBSD.org>

These declarations moved to drm_cache.h, move them along.


Author: Maya Rashish <maya@NetBSD.org>

drm_io_mapping_init_wc

No more <drm/drm.h>.

drm: Temporarily restore some local files deleted upstream.

These had local changes which needed to be distributed into other
files upstream, but that didn't happen in the merge commit. It will
happen, and the files will be deleted, in a later commit.

Merge linux-drm-v5-6-rc3

Include dev/sysmon/sysmonvar.h for sysmon_pswitch.

Somehow only triggered by the compat build (which shouldn't have been
enabled!)

For drm drivers and on monitor hotplug, report a 'display-cycle' hotkey click

If powerd is running, it will invoke the script
/etc/powerd/actions/display-cycle

branches: 1.39.2;
Hackily rename enum pipe for drm, without patching.

The patch we used to maintain to do this rename doubled the pain
of merging drm updates. But ctf gets confused if we have a struct
and an enum both called `pipe', and it's technically against C99
to do so. So #define it in all drm code for now to fix dtrace.

Avoid struct inode.

This is an fs-independent structure in Linux. We don't actually use
it as such; it's just a dummy struct tag. But we do have an actual
struct inode in ufs and in lfs, and using the same struct tag here
confuses ctf leading to four copies of pretty much every drm data
structure.

Reduce diffs by side-loading some header files like Linux.

From riastradh

branches: 1.36.2;
Add support for DRM GEM/CMA helpers using a driver provided vmem arena.

branches: 1.35.4;
Expose nvif ioctl interface.

nvif is a variable length (nested..) ioctl, so it doesn't match the
usual drm_ioctl interface. linux uses a shim to override the ioctl
function for nouveau to allow this, do the same.

fixes 3D acceleration with nouveau.

from riastradh.

Rework PCI and AGP conditionalization.

- Push drm_pci_set_unique into driver callback.
- Eliminate drm_pci_set_unique_hook.
- Gather all drm_agp_* functions into struct drm_agp_hooks.
- Replace the nonsensical old atomic garbage by serious locking.
- Make drm_agpsupport.c its own module.
- Eliminate NDRMKMS_PCI.
- Use NAGP from "agp.h" only in drm_module.c for horrible hack.
=> See comment in file for rationale.
- Always define CONFIG_PCI=1 and CONFIG_AGP=1.
- Always go through the drm_agp_* function hooks.
- Ifdef out nouveau agp stuff that doesn't go through drm_agp_*
for reasons that I'm too frustrated to figure out tonight.
- pci_iomap no longer automagically does agp_i810_borrow.
=> Use drm_agp_borrow instead.

Move decl of drm_guarantee_initialized to drmP.h.

Check for DMA-safe addresses before allowing DRM prime import.

Tread carefully around DMA subregions.

Not all platforms support it.

- If we want to limit to 32-bit DMA, just use a known 32-bit DMA tag.
- If we want to limit to >32-bit DMA, but the host only has a known
32-bit DMA tag, then just use that anyway.
- If we want to limit to >32-bit DMA, but the host doesn't support
bus_dmatag_subregion, then just use the 32-bit DMA tag anyway.

Gives powerpc, sparc a chance of working.

Clarify what bus_dmat and dmat are.

Rework drm prime guts.

- Our faux struct sg_table is now just an array of _pages_, not of
bus dma segments.

- We handle bus dma segments only in the presence of an adult bus dma
tag.

- All bus dma hacks are once again confined to bus_dma_hacks.h, and
more neatly organized:
. bus_dmamem_export_pages translates bus dma segs to vm_page array
. bus_dmamem_import_pages translates vm_page array to bus dma segs

Fill out drm_prime_* API a little more for NetBSD.

Add comment explaining our use of struct sg_table.

Draft support for drm prime.

Rework vblank locking. New drm_vblank_get/put_locked subroutines.

Put file, line, func in DRM_ERROR messages.

Update comment to reflect reality.

Move drm_limit_dma_space to drmP.h -- not legacy, used by drivers.

struct drm_bus abstraction is no more. Cope.

struct drm_driver now has the bus-specific intr establish routine
(called request_irq/free_irq to match Linux's style).

Massage drm_drv.c into usability.

- expose drm_minor_lock/drm_minors_idr for drm_init in drm_module.c
- ifdef out Linux driver attachment goo

Move drm_ioctl to drm_ioctl.c.

Previously it was in drm_drv.c upstream, which we overrode; then it
got moved to drm_ioctl.c and drm_drv.c got deleted, so we no longer
need to maintain a separate copy of the table in what we now call
drm_cdevsw.c.

just include linux/err.h instead of matching side loading

(it's included by fence.h, for example)

switch void* -> char* because of void pointer arithmetic.


Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

Include drm_os_* earlier.

Ifdef out gem_prime_mmap for now.

drm_crtc_vblank_waitqueue has to have a sane type.

begin fixing -Werror build:

Provide missing declarations from older drm
provide more definitions used by code
no idea what might_lock is, but it might be some error-checking
lockdep thing.


Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

merge linux-drm-v4-4-143

branches: 1.13.12; 1.13.14;
Revert "drmkms_pci: use MSI if available."

Fix PR/51997.

drmkms_pci: use MSI if available.

Replace drm_ioremap by drm_core_ioremap, reducing diff a little.

Adapt drmkms_pci module initialization to work as builtin, for agp.

fix debugging compilation (ALL kernel)

branches: 1.8.2;
Move all PCI/AGP code back to drmkms_pci module where it belongs.

branches: 1.7.2; 1.7.4;
Let the drm driver decide what part of what object gets mmapped.

Pass the file around too so radeon/ttm can get at it to verify access.

Add drm_gem_or_legacy_mmap_object for drivers to choose the previous
behaviour, like i915.

Make it build and boot on my test machines.

Screen blanks on boot on the Ivy Bridge system with

DRM error in cpt_serr_int_handler: PCH transcoder A FIFO underrun

But after that everything is OK. Appears to be an upstream problem.
To investigate...

I think there's a cache flushing issue somewhere -- there are little
display artefacts on my T60.

fix merge conflicts

branches: 1.4.2;
Tweak some DRM GEM page indexing crap.

- Fix order of subtraction in drm_mmap_paddr_locked.
- Address GEM objects' pages from 0, not from the mmap cookie.
- Check page alignment earlier in mmap code paths.
- Sprinkle kasserts throughout.

Still doesn't fix the garbage that is sometimes being scribbled all
over kernel memory!

branches: 1.3.2;
Miscellaneous fixes for drm2 on i386.

Merge riastradh-drm2 to HEAD.

branches: 1.1.1;
Initial revision

drm: Nix drm_agp_borrow.

This horrible kludge dates from before I understood the relation of
genfb_pci and pci drm drivers in the old and new worlds of drm.

The only user of it, in i915, was changed to use agp_i810_borrow
directly in the last drm update, so this hack can die.

Merge linux-drm-v5-6-rc3

Rework PCI and AGP conditionalization.

- Push drm_pci_set_unique into driver callback.
- Eliminate drm_pci_set_unique_hook.
- Gather all drm_agp_* functions into struct drm_agp_hooks.
- Replace the nonsensical old atomic garbage by serious locking.
- Make drm_agpsupport.c its own module.
- Eliminate NDRMKMS_PCI.
- Use NAGP from "agp.h" only in drm_module.c for horrible hack.
=> See comment in file for rationale.
- Always define CONFIG_PCI=1 and CONFIG_AGP=1.
- Always go through the drm_agp_* function hooks.
- Ifdef out nouveau agp stuff that doesn't go through drm_agp_*
for reasons that I'm too frustrated to figure out tonight.
- pci_iomap no longer automagically does agp_i810_borrow.
=> Use drm_agp_borrow instead.

Include order got shuffled. Include drm_agp_netbsd.h explicitly.

merge linux-drm-v4-4-143

branches: 1.5.16; 1.5.18;
fix __OS_HAS_AGP=0 build

branches: 1.4.2;
Move all PCI/AGP code back to drmkms_pci module where it belongs.

add drm_agp_destroy

branches: 1.2.2; 1.2.6;
Make it build and boot on my test machines.

Screen blanks on boot on the Ivy Bridge system with

DRM error in cpt_serr_int_handler: PCH transcoder A FIFO underrun

But after that everything is OK. Appears to be an upstream problem.
To investigate...

I think there's a cache flushing issue somewhere -- there are little
display artefacts on my T60.

branches: 1.1.1;
Initial revision

Give up and include linux/completion.h

instead of figuring out how it's supposed to be side-loaded


Author: Maya Rashish <maya@NetBSD.org>

Merge linux-drm-v5-6-rc3

branches: 1.2.2; 1.2.6;
merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.2.2; 1.2.6;
merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

linux/compiler.h for __must_check


Author: Maya Rashish <maya@NetBSD.org>

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Use the netbsd-ish drm_waitqueue_t


Author: Maya Rashish <maya@NetBSD.org>

Sprinkle some necessary includes and forward decls.

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

drm_cache.h: fix a merge error

this reverts revision 1.3 which should have been reverted when it got
introduced by upstream through revision 1.5.

drm: Another pass over i915 and some supporting logic.

This makes a shim around sg_table, which essentially represents two
things:

1. an array of pages (roughly corresponding to bus_dma_segment_t[])
2. an array of DMA addresses stored in a bus_dmamap_t

Both parts are optional; different parts of i915 use sg_tables to
pass around one or both of the two parts. This helps to reduce the
ifdefs by quite a bit, although it's not always clear which part of
an sg_table any particular interface is actually using which is why I
was reluctant to do this before.

drm: Nix use of uvm pglist. Just use arrays of page pointers.

drm_os_netbsd.h is no more

Forward-declare some structs.

These declarations moved to drm_cache.h, move them along.


Author: Maya Rashish <maya@NetBSD.org>

Merge linux-drm-v5-6-rc3

Pull in drm_os_netbsd.h for CONFIG_<arch> defines

Disable the use of WC memory on Arm and Arm64. From Linux:

* The DRM driver stack is designed to work with cache coherent devices
* only, but permits an optimization to be enabled in some cases, where
* for some buffers, both the CPU and the GPU use uncached mappings,
* removing the need for DMA snooping and allocation in the CPU caches.
*
* The use of uncached GPU mappings relies on the correct implementation
* of the PCIe NoSnoop TLP attribute by the platform, otherwise the GPU
* will use cached mappings nonetheless. On x86 platforms, this does not
* seem to matter, as uncached CPU mappings will snoop the caches in any
* case. However, on ARM and arm64, enabling this optimization on a
* platform where NoSnoop is ignored results in loss of coherency, which
* breaks correct operation of the device. Since we have no way of
* detecting whether NoSnoop works or not, just disable this
* optimization entirely for ARM and arm64.

branches: 1.2.6;
merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

drm: Restore local patch for struct drm_connector::physical_address.

bus_formats seems to be passed to kfere, de-constify


Author: Maya Rashish <maya@NetBSD.org>

Constify some pointer arguments.

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

Initialize drm_bridge and drm_panel locks.

branches: 1.7.4;
Unconstify a kmemduped thing.

merge linux-drm-v4-4-143

branches: 1.5.16; 1.5.18;
parse_hdmi_vsdb: read the HDMI physical address from the HDMI VSDB and store it on the connector

Include some necessary header files and forward declarations.

branches: 1.3.2; 1.3.4; 1.3.6;
fix merge conflicts

branches: 1.2.2; 1.2.4;
Merge riastradh-drm2 to HEAD.

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.3.4; 1.3.28; 1.3.30;
fix merge conflicts

branches: 1.2.2; 1.2.4;
Merge riastradh-drm2 to HEAD.

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

spinlock_t needs <linux/spinlock.h>; need forward decl of drm_crtc.

Disable waitqueue for now. We won't be using the .c code; we just
need the .h file to compile.

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

drm: New mechanism to suspend ioctls during system suspend.

drm drivers must opt into this by calling drm_suspend_ioctl in their
driver suspend routine, and drm_resume_ioctl in their driver resume
routine.

This is a stop-gap measure -- it would be better to fill in the
pm_runtime_* API with new pmf(9) hooks to acquire/release references
to devices for coordinating with suspend/resume, but getting the
details right is tricky, and this stop-gap is enough to get i915
suspend/resume to work reliably on my Kaby Lake laptop. Rather than
wait until I've got all the details right, let's just go with this
stop-gap for now.

drm: Omit local diff -- vmem is entirely a NetBSDism.

Use struct vmem rather than vmem_t to obviate need for header file
dependency.

drm_device.h: don't redefine vmem_t

drm: Merge vbl_lock into event_lock.

These aren't functionally very different, and most uses of vbl_lock
were inserted as local changes to make proper condition variables
anyway. Requiring both locks made cv_wait difficult because it only
unlocks and relocks one at a time, and this also led to annoying lock
order reversal.

Fix up includes of <sys/vmem.h>.

Give some more declarations a new home.

We need these struct members for a couple of local drm files.

XXX: We might want to enable config legacy drm or adapt the local drm
files.


Author: Maya Rashish <maya@NetBSD.org>

Move drm_cdevsw out of drmP.h which should eventually be removed

drm_device.h seems like an OK spot.


Author: Maya Rashish <maya@NetBSD.org>

struct drm_device is now in drm_device.h. move netbsd ifdef goo there


Author: Maya Rashish <maya@NetBSD.org>

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

const const const const


Author: Maya Rashish <maya@NetBSD.org>

Merge linux-drm-v5-6-rc3

branches: 1.2.2; 1.2.6;
merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

drm: add drm_dp_aux_fini; use it in i915 to fix missing mutex destroy.


Author: chuq <chs@NetBSD.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

Forward declaration for struct seq_file.

No idea what side-loading will provide this.

Revert "Give up on finding how linux side-loads these"

Found it.

Give up on finding how linux side-loads these

linux/ktime.h for ktime_t
linux/seq_file.h for seq_file


Author: Maya Rashish <maya@NetBSD.org>

Add some necessry header files.

Merge linux-drm-v5-6-rc3

Include some necessary header files.

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.6.2; 1.6.6;
Rework drm_dp_mst_topology.c.

- Need <linux/device.h> for dev_name.
- Need <linux/export.h> for EXPORT_*.
- Need <linux/module.h> for THIS_MODULE.
- Ifdef out debugfs stuff.
- Mark unused variables as such.
- Convert to drm waitqueue. (There's even a lock here already...)
- Initialize and destroy mutexes appropriately.
- Ifdef out of_node. Hope nobody needed it!

Include some necessary header files.

ifdef CONFIG_DEBUG_FS

match linux side loading of headers

more bring in OLD drm code to unbreak the build
matching netbsd types etc. to get the build going


Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

drm: Remove local diffs for drm_pci_set_busid.

Instead, move it to its own file that can be safely used without
bringing in a link/run-time dependency on pci.

Restore set_busid callback.

This local change is intentional to keep pci tentacles out of the
main drm.

Constify


Author: Maya Rashish <maya@NetBSD.org>

DRM_IRQ_ARGS


Author: Maya Rashish <maya@NetBSD.org>

Move drm_device ifdef goo to drm_drv.h

And drm vblank stuff to drm_vblank.h


Author: Maya Rashish <maya@NetBSD.org>

ktime_t needs <linux/ktime.h>; need struct drm_unique forward decl.

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

ERR_PTR needs <linux/err.h>.

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Narrow scope of exclusions in drm_fb_helper.c; reduce diffs.

Restore drm_fb_helper_debug_{enter,leave}_fb

the non-fbinfo versions of the same function now that I see why
they exist, and that they are not a mangled diff


Author: Maya Rashish <maya@NetBSD.org>

Ifdef out linux framebuffer stuff in drm_fb_helper.

Ifdef out drm_fb_helper_ioctl too.

Forward decl to minimize patch.

Merge linux-drm-v5-6-rc3

Remove temporary drm_fb_helper_set_config stub from old code.

merge linux-drm-v4-4-143

branches: 1.6.4; 1.6.28; 1.6.30;
Expose drm fb helpers for ddb enter/exit.

Rework Intel framebuffer attachment.

Turns out genfb_softc must be at the start of its own device_private,
so we can't have it in the middle of a structure, and certainly can't
have potentially multiple genfbs per graphics device. Failing to do
this is why entering ddb didn't work with an i915drmkms console.

Instead of putting a genfb_softc into each drm_fb_helper, put a
device_t into each drm_fb_helper and create a new intelfb(4) device
for each Intel framebuffer. This will be more flexible, too, in case
we want accelerated framebuffers later on. (XXX Need to adapt the
radeon code, which I'm disabling until that happens to avoid breaking
the build.)

While here, defer disabling VGA, vga_cndetach, and genfb_attach until
we're actually ready to do them all together along with the mode
switch. This should reduce the amount of time during which the
screen is blanked, in case it hangs.

Make it build and boot on my test machines.

Screen blanks on boot on the Ivy Bridge system with

DRM error in cpt_serr_int_handler: PCH transcoder A FIFO underrun

But after that everything is OK. Appears to be an upstream problem.
To investigate...

I think there's a cache flushing issue somewhere -- there are little
display artefacts on my T60.

fix merge conflicts

branches: 1.2.2; 1.2.4;
Merge riastradh-drm2 to HEAD.

branches: 1.1.1;
Initial revision

amdgpu: Make amdgpu_file_to_fpriv work.

Move more ifdef NetBSD goo from drmP.h to new headers


Author: Maya Rashish <maya@NetBSD.org>

move ifdef goo from drmP.h to drm_file.h

Remove declarations already appearing in other headers


Author: Maya Rashish <maya@NetBSD.org>

Move drm_file ifdef goo to the one defined in drm_file.h.

drm_lock_data is defined in drm_auth.h and already has the
ifdef goo.


Author: Maya Rashish <maya@NetBSD.org>

Sync drm_file.c. Prepare to convert event read lock to cv.

drm_waitqueue_t needs <drm/drm_wait_netbsd>.

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

Use unsigned to avoid undefined behavior. Found by kUBSan.

branches: 1.2.4;
merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

linux/bug.h for WARN_ON, linux/list.h for list functions


Author: Maya Rashish <maya@NetBSD.org>

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Fix up drm_prime.c.

Reset after #undef free. This will surely come to bite us later, too.


Author: Maya Rashish <maya@NetBSD.org>

avoid malloc.h macro pollution.

free is a function in drm_gem_object_funcs


Author: Maya Rashish <maya@NetBSD.org>

forward declaration of xarray instead of figuring out how it's side-loaded


Author: Maya Rashish <maya@NetBSD.org>

Put a guess for what the netbsd mmap type will be.

Probably the same as drm_gem_mmap_object?


Author: Maya Rashish <maya@NetBSD.org>

u32 needs <linux/types.h>.

Merge linux-drm-v5-6-rc3

branches: 1.5.2; 1.5.6;
Draft support for drm prime.

Need <uvm/uvm.h> for struct uvm_object.

Rename drm_gem_object::gemo_shm_uao -> drm_gem_object::filp.

The Linux member that is basically analogous to this is named so,
which means we can eliminate a few diffs this way.

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Move files which are gone upstream out of dist/.

drm: Temporarily restore some local files deleted upstream.

These had local changes which needed to be distributed into other
files upstream, but that didn't happen in the merge commit. It will
happen, and the files will be deleted, in a later commit.

Merge linux-drm-v5-6-rc3

Add support for DRM GEM/CMA helpers using a driver provided vmem arena.

branches: 1.5.4;
Implement remainder of drm_gem_cma_helper API.

Fix up drm_gem_cma_helper.

merge linux-drm-v4-4-143

branches: 1.2.2; 1.2.4;
Implement the DRM GEM/CMA helpers. The implementation has been extracted
from our tegra DRM driver, but generalized for use with other drivers.

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.2.4; 1.2.8; 1.2.32; 1.2.34;
Merge riastradh-drm2 to HEAD.

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

drm: New mechanism to suspend ioctls during system suspend.

drm drivers must opt into this by calling drm_suspend_ioctl in their
driver suspend routine, and drm_resume_ioctl in their driver resume
routine.

This is a stop-gap measure -- it would be better to fill in the
pm_runtime_* API with new pmf(9) hooks to acquire/release references
to devices for coordinating with suspend/resume, but getting the
details right is tricky, and this stop-gap is enough to get i915
suspend/resume to work reliably on my Kaby Lake laptop. Rather than
wait until I've got all the details right, let's just go with this
stop-gap for now.

move drmP drm_ioctl stuff to drm_ioctl.h

including ifdef goo


Author: Maya Rashish <maya@NetBSD.org>

Restore netbsd definition of drm_ioctl


Author: Maya Rashish <maya@NetBSD.org>

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Empty out drm_os_netbsd.h.

Provide our own declaration of drm_irq_install


Author: Maya Rashish <maya@NetBSD.org>

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.7.2; 1.7.6;
Rename drm_mmap_* -> drm_legacy_mmap_* like upstream.

Move drm_limit_dma_space to drmP.h -- not legacy, used by drivers.

Include the legacy DRM_READ/WRITE in drm_legacy.h, not drm_os_*.h.

Apparently <drm/drm_legacy.h> needs <drm/drmP.h> for struct drm_device.

provide missing declarations
add missing headers


Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Get drm_mm.c building.

Just replace the interval tree lookup by a linear search for now.

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.4.4; 1.4.28; 1.4.30;
fix merge conflicts

branches: 1.3.2; 1.3.4;
Nix accidental whitespace to reduce diff from Linux.

Merge riastradh-drm2 to HEAD.

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Provide a forward declaration for a struct.

It's used in some function declarations here, easier than figuring
out where it belongs.

we don't have a definition of this, might need it later.


Author: Maya Rashish <maya@NetBSD.org>

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.3.16; 1.3.18;
Include some necessary header files and forward declarations.

branches: 1.2.2; 1.2.4; 1.2.6; 1.2.8;
fix merge conflicts

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.4.2; 1.4.6;
Call ww_mutex_destroy in drm_modeset_lock_fini.

From mrg@.

directly include asm/bug.h for WARN_ON instead of fighting
to match side-loading.

include drm_legacy.h as needed


Author: coypu <coypu@sdf.org>
Committer: Taylor R Campbell <riastradh@NetBSD.org>

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.2.2; 1.2.6;
merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

Initialize drm_bridge and drm_panel locks.

branches: 1.2.4;
merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

drm: Omit needless pci_attach_args from our drm_pci_attach.

Can already get it from the struct pci_dev, and this way we can more
easily call it from patched upstream code as i915 will need to do.

drm: Remove local diffs for drm_pci_set_busid.

Instead, move it to its own file that can be safely used without
bringing in a link/run-time dependency on pci.

Split drm_dev_alloc/register out of drm_pci_attach.

Needed by nouveau which needs to do

drm_dev_alloc
drm_pci_attach
nouveau_drm_device_init
drm_dev_register

Restore set_busid callback.

This local change is intentional to keep pci tentacles out of the
main drm.

drm_os_netbsd.h is no more

Move some drm PCI stuff off drmP.h


Author: Maya Rashish <maya@NetBSD.org>

Make ourselves less dependent on drmP.h, removed upstream.

This causes some trouble as CONFIG_* lines might not be appropriately
defined. A few declarations remain in drmP.h so it's not gone.


Author: Maya Rashish <maya@NetBSD.org>

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

viadrmums(4): build legacy VIA DRM UMS driver module for amd64.

This driver is not built-in by default, thus loadable module can help (un)lucky
owners of 64-bit capable VIA (Nano/Eden) systems or early AMD/Intel systems
with some VIA chipsets, which include VIA integrated graphics.
I also boldly added product IDs for few later models from VX8xx/VX9xx chipsets
without 3D support (DX9_0) to "expand" the driver support to more systems.
Tested successfully basic functionality on VX800, and partially successfully
on VX900 (on VX900 Xorg failed to initialize due to openchrome related issues,
viadrmums attaches and it is by used the driver).
Didn't test on VX855, I don't have one.

Pull up to netbsd-10 is needed.

branches: 1.4.4;
Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.2.16; 1.2.18;
Add Chrome9 HC IGP to viadrm device ids.

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.2.2; 1.2.6; 1.2.30; 1.2.32;
Make it build and boot on my test machines.

Screen blanks on boot on the Ivy Bridge system with

DRM error in cpt_serr_int_handler: PCH transcoder A FIFO underrun

But after that everything is OK. Appears to be an upstream problem.
To investigate...

I think there's a cache flushing issue somewhere -- there are little
display artefacts on my T60.

branches: 1.1.1;
Initial revision

drm: Another pass over i915 and some supporting logic.

This makes a shim around sg_table, which essentially represents two
things:

1. an array of pages (roughly corresponding to bus_dma_segment_t[])
2. an array of DMA addresses stored in a bus_dmamap_t

Both parts are optional; different parts of i915 use sg_tables to
pass around one or both of the two parts. This helps to reduce the
ifdefs by quite a bit, although it's not always clear which part of
an sg_table any particular interface is actually using which is why I
was reluctant to do this before.

drm: Nix use of uvm pglist. Just use arrays of page pointers.

Fix up drm_prime.c.

Move more ifdef NetBSD goo from drmP.h to new headers


Author: Maya Rashish <maya@NetBSD.org>

Provide our own drm mmap declarations.


Author: Maya Rashish <maya@NetBSD.org>

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Comment out drm_print_regset32, not used in any of the drivers

we use.


Author: Maya Rashish <maya@NetBSD.org>

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Empty out drm_os_netbsd.h.

drm_can_sleep now lives in drm_util.h, move ifdef goo there.


Author: Maya Rashish <maya@NetBSD.org>

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

drm: Apply the Intel pipe_drmhack in more places.

See sys/external/bsd/drm2/dist/drm/i915/intel/intel_display.h for
details. Should reduce ctf type duplication a fair bit, maybe even
enough to get us under the 2^15 type limit.

drm: Merge vbl_lock into event_lock.

These aren't functionally very different, and most uses of vbl_lock
were inserted as local changes to make proper condition variables
anyway. Requiring both locks made cv_wait difficult because it only
unlocks and relocks one at a time, and this also led to annoying lock
order reversal.

drm: Simplify condvar conditionals in drm_vblank

drm: Restore drm_crtc_vblank_put_locked

make this a real function declaration


Author: Maya Rashish <maya@NetBSD.org>

Move drm_device ifdef goo to drm_drv.h

And drm vblank stuff to drm_vblank.h


Author: Maya Rashish <maya@NetBSD.org>

ktime_t needs <linux/ktime.h>

drm_waitqueue_t needs <drm/drm_wait_netbsd>.

struct timer_list needs <linux/timer.h>.

drm_waitqueue_t needs <drm/drm_wait_netbsd>.

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

amdgpu: Stub out irq domain stuff with a finer grain.

First whack at amdgpu. Long way to go.

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.2.2; 1.2.6;
merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

add support for kabylake and skylake GT4 (untested) GPUs.
largely taken from openbsd and linux 4.13 trees (which
have this code identical), with mimimal porting to netbsd.

i have not installed (and thus tested) the newer referenced
firmware files.

only real local change is to fix IS_BROXTON() macro to check
the things valid in this era of drm. previous match would
attach on KBL, and then a loop would never exit.

tested on kabylake P630. needs mesa 11.x or newer for GL
to work.

ok @riastradh.

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

drm: Apply the Intel pipe_drmhack in more places.

See sys/external/bsd/drm2/dist/drm/i915/intel/intel_display.h for
details. Should reduce ctf type duplication a fair bit, maybe even
enough to get us under the 2^15 type limit.

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

drm: Switch sense of #if __linux__ conditionals to use __NetBSD__.

Keep it consistent with the rest of drm.

ifdef out things using vm_fault_t


Author: Maya Rashish <maya@NetBSD.org>

Move #endif earlier to avoid excluding useful prototypes.

Merge linux-drm-v5-6-rc3

Reduce some logic duplication and just use vmap/kmap here.

merge linux-drm-v4-4-143

branches: 1.2.4; 1.2.28; 1.2.30;
First whack at radeon driver.

No hardware to test yet, but it builds.

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.3.16; 1.3.18;
Rework ttm tt swapin/swapout logic.

Rather than handling `swapping in/out' here, per se, we let uvm do
that, we interpret `swap out' as `deactivate pages', and we add
generic ttm operations to wire and unwire pages, for the ttm_tt
driver to use.

This fixes certain graphics buffer eviction logic, which enables
nouveau to suspend/resume on one of my machines. (The machine
doesn't resume overall for other reasons, but the nouveau device
suspends and resumes in isolation.)

XXX pullup to netbsd-7 after a couple weeks

branches: 1.2.2; 1.2.4; 1.2.6; 1.2.10;
First whack at radeon driver.

No hardware to test yet, but it builds.

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.2.4; 1.2.28; 1.2.30;
First whack at radeon driver.

No hardware to test yet, but it builds.

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.2.4; 1.2.28; 1.2.30;
First whack at radeon driver.

No hardware to test yet, but it builds.

branches: 1.1.1;
Initial revision

Merge linux-drm-v5-6-rc3

merge linux-drm-v4-4-143

branches: 1.1.1;
Initial revision

drm: Switch sense of #if __linux__ conditionals to use __NetBSD__.

Keep it consistent with the rest of drm.

Avoid the set_pages_array_wc/wb paths in TTM for now

we did this before. maybe we'll eventually want to stop for
performance reasons?


Author: Maya Rashish <maya@NetBSD.org>

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision

drm/ttm: Fix ttm_tt pages and DMA map allocation.

drm: Nix use of uvm pglist. Just use arrays of page pointers.

Re-introduce lost local diff.

We want declarations for ttm_tt_{,un}wire, and some different
members on struct ttm_tt


Author: Maya Rashish <maya@NetBSD.org>

constify


Author: Maya Rashish <maya@NetBSD.org>

Restore local diff


Author: Maya Rashish <maya@NetBSD.org>

Merge linux-drm-v5-6-rc3

branches: 1.1.1;
Initial revision