Fix return value of wait_for_completion_interruptible_timeout.

(riastradh)

Make gem mmappings shared, not copy-on-write, like Linux.

(riastradh)

Take the vmobjlock in i915_gem_release_mmap around pmap_page_protect.

(riastradh)

Fix up i915_gem_gtt for agp-style gen<6 devices.

- Set the DMA mask correctly: gen<4 needs 32-bit; gen4+, 36-bit.
- Use agp_i810_write_gtt_entry, not AGP_BIND_PAGE.
- Do a posting read after changing all the GTT entries.

(riastradh)

Expose agp_i810_write_gtt_entry for drm2.

Also add an agp_i810_post_gtt_entry to do a posting read for that GTT
entry.

(riastradh)

Implement and use non-interruptible DRM_WAIT_* gizmos.

(riastradh)

Kludgey attempt to fill in intel_gtt stubs.

(riastradh)

Oops -- define struct intel_gtt::do_idle_maps.

Missed this in last commit.

(riastradh)

First draft of i915_gem_gtt.c for pre-Sandy Bridge (gen<6) devices.

These go through the legacy AGP cruft to get at the GTT.

(riastradh)

Expose the agp_i810 softc.

This is an Intel-specific kludge so that i915drmkms can get at the
GTT, graphics translation table, for pre-Sandy Bridge Intel graphics
devices.

(riastradh)

Handle attach failure and don't try a framebuffer in i915 on failure.

(riastradh)

revert to bogus assertion, as requested by riastradh@ to ease forecoming commit

(aymeric)

do not KASSERT out on Sandy Bridge

(aymeric)

Remove drm2 and i915drm2 modules.

(riastradh)

Rework drm2 configuration and modularization.

- Split drm2.kmod into drmkms_linux, drmkms, drmkms_pci.
- Split up drmkms-related files.* similarly.
- Make drm_agp_* routines hooks that the drmkms_pci module installs.
- Reuse drm device major 180 for (old) drm and drmkms.

Now old drm and new drmkms can coexist happily in the same tree, with
or without PCI, and require no changes to userland.

(riastradh)

Make wsdisplay_vcons likelier to be modularizable too.

(riastradh)

Redo amd64/NO_DRM config and add amd64/DRMKMS.

(riastradh)

Tweak genfb tweaks so they work.

(riastradh)

Make genfb a little friendlier to modules.

This is not enough to make it actually work as a module itself, but
it's enough to make the i915drm module use genfb.

(riastradh)

Make genfb replay the msgbuf only if it's becoming the console.

(riastradh)

Make genfb_attach configure the wsemuldisplaydev attribute.

(riastradh)

Make i915drm_match return 6 to beat genfb_pci no matter what.

(riastradh)

Give drmkms its own device major so it doesn't compete with old drm.

(riastradh)

First draft of in-kernel drm2 attachment.

The drm2 `drm' device is now called `drmkms' (likewise `i915drmkms',
&c.) so that it can coexist with the old drm code to reduce diffs
from HEAD.  (Can't call a device `drm2'.)

(riastradh)

Defer i915drm_attach_framebuffer until interrupts are running.

The i915 code initialization relies on counting hardclock ticks for a
delay (ugh).

Not an issue for modules, but it will matter when we build drm2 into
the kernel proper.

(riastradh)

Include genfb in NO_DRM kernel rather than modularizing.

Modularizing required a bunch of hacks (wscons/genfb/&c. is not ready
for modules) and failed to pull in rasops dependencies, so rasops
never worked correctly.

(riastradh)

Little reference counting fix in drm_mmap.

(riastradh)

Tidy up and reuse the code I had already written for gem mmapping.

(riastradh)

Implement mmap on a drm device by a new kludgey ioctl.

There is currently no way to set up a custom choice of uvm object and
uvm pager ops for mmap: struct fileops has no fo_mmap, and device
nodes get to say only what paddr each offset maps to, not what uvm
object to use.  For now, to avoid kernel changes outside the drm2
tree, we'll use a non-standard drm ioctl that calls uvm_map.  This
requires source patches to userland programs, but for the most part
they can simply be converted from calling mmap to drmMap, which will
be adapted to use the ioctl.

This is not necessarily a permanent solution.

(riastradh)

Label fail4 is now used, so don't mark it __unused.

(riastradh)

Remove spurious newline to reduce diff from upstream.

(riastradh)

Fix queue_delayed_work edge cases.

- Copy the relevant part of queue_work in-line for ticks == 0, since
  queue_work itself will choke on a delayed work.

- Don't reschedule the callout if it is already scheduled -- let it
  fire when it was already scheduled to fire.

(riastradh)

Take irq_lock before waking up irq_queue in i915_handle_error.

(riastradh)

Return EINTR too in __wait_seqno.

(riastradh)

Call uvm_vm_page_to_phys before taking a spin lock to ease debugging.

(riastradh)

Call drm_mode_group_init_legacy_group in drm_attach like Linux does.

(riastradh)

Adjust errno from dev->driver->load.

(riastradh)

Initialize the right minor numbers...arghhhh.

(riastradh)

uobj->pgops->pgo_put requires uobj->vmobjlock.

(riastradh)

Remove vestige of wsdisplay XXX from drm_drv.c.

wsdisplay stuff happens in the parent driver now.

(riastradh)

Oops -- unifdef <sys/select.h> and <sys/poll.h> in drm_drv.c.

(riastradh)

Report st_rdev in stat on a drm device.

(riastradh)

Just use kcalloc in drm_malloc_ab.

(riastradh)

Fix order of arguments in DRM_COPY_TO_USER.

...

(riastradh)

Make Linux kmalloc handle a few more gfp flags.

(riastradh)

i915_gem_object_get_page takes a page number, not byte offset.

(riastradh)

Fix i915_genfb_mmap base addresses and offsets.

(riastradh)

Initialize the nsec correctly in ktime_get.

(riastradh)

Use nanouptime, not nanotime, for ktime_get.

As far as I can tell, ktime_get is supposed to provide monotonic
time, not a clock synchronized to TAI.

(riastradh)

Hack up vblank events and make them work.

(riastradh)

Unconditionalize the genfb attachment.

(riastradh)

Pesky ampersands!

(riastradh)

Take master->lock.spinlock to read master->lock.hw_lock.

(riastradh)

Clean up initialization failures in drm2_modcmd.

(riastradh)

Rewrite drm locking support for NetBSD.

(riastradh)

Clean up the still-not-yet-functional genfb attachment cruft a bit.

(riastradh)

Use dev_priv->irq_lock for ring->irq_queue, not dev->struct_mutex.

We need to use a spin lock here, because we need to exclude interrupt
handlers.

(riastradh)

Implement drm_pci_set_busid and drm_pci_set_unique.

(riastradh)

Drop another reference in do_destroy if the context is current.

(riastradh)

Make it a bug to drm_mm_takedown when there remain allocated blocks.

(riastradh)

Destroy the waitqueue ring->irq_queue in intel_cleanup_ring_buffer.

(riastradh)

Add open drm files to the device file list.

(riastradh)

Fix copyoutstr usage in drm_version_string.

(riastradh)

Make DRM_IOCTL_GET_CLIENT work except for pid and uid.

The pid and uid don't make sense because the client is associated
with a file descriptor, which may be held by multiple processes, and
even if only one holds it (which is probably the only sensible state
of affairs), there's no index.

(riastradh)

Lock the right uvmobject for uvm_pagelookup.

(riastradh)

Convert linux_idr(9) to use spin locks.

idr_for_each is unlocked; caller must exclude modifications.

Eventually this should be rewritten with pserialize and a fancy
bitmap algorithm, but this *actually* works for now.

(riastradh)

Revert "Rewrite idr to use a dumber algorithm that admits pserialized use."

This reverts commit 3a389a1cb20777fb73575f0514b96265052ac1ea.

I don't know what I was smoking with this; just need to change the
rwlock to a spin lock and we'll be good!

(riastradh)

Don't put work flush items on the stack; worker kmem_frees them.

(riastradh)

Rewrite idr to use a dumber algorithm that admits pserialized use.

drm2 doesn't use them with RCU, but it does use them under spin locks,
so an rwlock is not kosher.

This algorithm is super-dumb, but the idr API has changed upstream,
and this is not performance-critical, so it's not worth investing
time in a better algorithm at the moment.

(riastradh)

flush_workqueue should work now, so don't work around it i915 unload.

(riastradh)

i915_gem_context_close destroys the idr; i915_driver_postclose needn't.

(riastradh)

Detach framebuffer stuff before drm device in i915drm_detach.

Detaching the drm device calls the i915_driver_unload routine, which
nukes the i915 private data structures, so that we can't use them any
more to detach the framebuffer.

Now i915drm2 unloads!

(riastradh)

Initialize and destroy the pending flip lock.

(riastradh)

Avoid dividing by zero when allocating empty array in kcalloc.

(riastradh)

Tweak drm_fb_helper_single_fb_probe so we needn't reconnect the screen.

(riastradh)

Initialize the workqueue flush structures correctly.

(riastradh)

Make Linux workqueues at IPL_VM for now.

(riastradh)

Pass the wq to linux_worker as it expects, not NULL.

(riastradh)

Actually insert the delayed work into the workqueue.

(riastradh)

Helps to actually allocate and free the workqueue memory!

(riastradh)

Add flush_scheduled_work back.

(riastradh)

First (plausible) draft of Linux workqueue implementation rework.

Untested, but this looks better than what was there before, or any of
the drafts leading up to this which got torn out of the typewriter,
crumpled up, and crudely tossed in frustration toward the wastepaper
basket by my desk alongside the empty bottles of Jack Daniels that
fueled them, or something like that.

Can't use multiple CPUs per workqueue.  That requires some explicit
management of per-CPU workqueue state, since NetBSD's workqueue(9)
doesn't provide that or cancellation or flushing.  Oops.

(riastradh)

First draft of genfb attachment for i915.

(riastradh)

Rework Linux `work' to use NetBSD workqueues, not callouts.

Callers expect to be able to allocate in the workers, which callouts
don't allow.

Delayed work uses callouts only to delay enqueueing work.

Linux `workqueues' are still stubs.

(riastradh)

Round of hacking on i915 framebuffers.

(riastradh)

Omit more needless #ifdef __NetBSD__.

(riastradh)

Fix DRM_WAIT_UNTIL to initialize (RET) on every exit.

(riastradh)

Miscellaneous Linux header file crud.

(riastradh)

Create Linux spin locks at IPL_VM for now.

(riastradh)

Simplify drm_ioremap and map only what is requested, exclusively.

(riastradh)

Still more error branch cleanup.

(riastradh)

Hook up some GTT logic again in i915_driver_load.

(riastradh)

Use the cached mmio bar information to map the GTT.

(riastradh)

i915_gem_cleanup_stolen need not take down mm.stolen after all.

The one caller, i915_driver_unload, already takes care of this.
Having i915_gem_cleanup_stolen do it is obviously the right thing,
but this state of affairs reduces diffs to upstream.

(riastradh)

Just use bus_space_map for io-mapping, and limit to one at a time.

Reserving the whole region interferes with other parts of the driver
which want to map it in different ways.  It also horrifically wastes
space when actually mapped, because there's no way to map a subregion
of a reservation.  And the bus_space_reservation API is x86-only at
the moment.

(riastradh)

linux_ namespace for kmap and kunmap.

(riastradh)

Fix kunmap: unlike kunmap_atomic, it takes a page, not a vaddr.

Unmapping the vaddr where the struct vm_page is stored makes for a
rather confusing state of affairs!

(riastradh)

Use the 64-bit PCI DMA tag if available.

Otherwise, it can't handle >32-bit physical addresses, which
uvm_obj_wirepages seems to have a tendency to return.

(riastradh)

Fix arithmetic in gen6_ggtt_bind_object.

(riastradh)

Sprinkle some kasserts into i915_gem_gtt.c.

(riastradh)

Specify the ring map type as _DRM_REGISTERS.

(riastradh)

Remove some more needless #ifdef __NetBSD__.

(riastradh)

Unconditionally avoid arithmetic on void * in drm_bufs.c.

(riastradh)

Unconditionally avoid arithmetic on void * in drm_buffer.c.

(riastradh)

Use Linux atomics, not spinlocks or NetBSD atomics in drm_auth.c.

Removes an #ifdef __NetBSD__.

(riastradh)

Add Linux ATOMIC_INIT, atomic_inc_return, and atomic_dec_return.

(riastradh)

Remove #ifdef __NetBSD__ from const fixes in dvo_ch7xxx.c.

(riastradh)

Check that GEM wired pages use at most 40 bits of physical addresses.

Can't express this constraint to uvm_obj_wirepages at the moment, so
at least fail early and noisily if we violate it.

(riastradh)

The bus_dmamap_load_raw got moved to i915_gem_gtt but not committed.

(riastradh)

Use dev->struct_mutex, not drm_global_mutex, for ring->irq_queue.

(riastradh)

Fix result of DRM_TIMED_WAIT_UNTIL.

This has to return a positive number of ticks left if we haven't
timed out in order to match the semantics of Linux waitqueues.

This also fixes the amount of time for timeout if we ever wait for
more than one iteration.

Now we can actually wait for results from the ring buffers!

(riastradh)

More error branch cleanup.

(riastradh)

Destroy the mutex too in destroy_completion.

(riastradh)

More little error branch cleanup.

(riastradh)

Implement destroy_completion in <linux/completion.h>.

(riastradh)

Fix a bunch of i915 error branches.

Some of these fixes are necessary only on NetBSD because we require
mutex_destroy, while Linux doesn't.

(riastradh)

Adapt intel_pm.c to NetBSD.  Drop stubs.

(riastradh)

Add missing includes to intel_pm.c.

(riastradh)

Buncha new cruft for <linux/*.h>.

(riastradh)

Use -Wno-shadow, not a cpp kludge, for drm_crtc.c's local min/max.

(riastradh)

Shift the GTT size by twenty only once.

(riastradh)

Use the _unlocked variant of unreference in drm_gem_pager_detach.

(riastradh)

Hook up the i915_gem uvm pager ops.

(riastradh)

Use pmap_enter_default, not pmap_enter.

Seems to be a problem with modules referring to weak aliases?

(riastradh)

Helps to commit all my changes to drm_cache.c.

(riastradh)

Adapt the Intel ringbuffer code to NetBSD.

(riastradh)

Adapt the i915 GEM code to NetBSD.

(riastradh)

Simplify drm_mem_util.h; fix source compatibility for drm_free_large.

(riastradh)

Add missing initialization of dev->dmat in drm_pci_attach.

(riastradh)

Avoid the PAGE_MASK mess in drm_gem_vm.c, drm_scatter.c, & drm_vm.c.

(riastradh)

intel_ringbuffer.c needs <asm/param.h> for HZ.

(riastradh)

Add missing includes to i915_gem_execbuffer.c.

(riastradh)

Add missing includes to i915_gem.c.

(riastradh)

Implement drm_cache.c, for x86 only at the moment.

(riastradh)

Rework Intel GTT abstraction to use bus_dma.

(riastradh)

Implement a bus_dmamem_wire_uvm_object hack.

This is fit only for x86 at the moment -- it parrots the x86
bus_dmamem_alloc code but with uvm_obj_wirepages instead of
uvm_pglistalloc.

XXX THIS IS A MEGA-KLUDGE THAT NEEDS TO BE DONE PROPERLY.

(riastradh)

Rename delayed_work::dw_work to delayed_work::work for Linux source.

(riastradh)

Fix definition of Linux PAGE_ALIGN in <linux/mm.h>.

Can't use uvm round_page because that depends on PAGE_MASK, whose
sense we have to invert for Linux!  Plurgh.

(riastradh)

More miscellaneous Linux header cruft.  See patch for details.

(riastradh)

Add Linuxoid non-atomic __set/clear_bit to <linux/bitops.h>.

(riastradh)

Fix Linux atomic set/clear/change_bit to work on arrays.

(riastradh)

Add ERESTARTSYS as a Linuxoid alias for ERESTART.

(riastradh)

Add trace_i915_gem_object_unbind.

(riastradh)

Add some copy_to/from_user variants to Linux <asm/uaccess.h>.

(riastradh)

Define page_to_phys in Linux <asm/io.h>.

(riastradh)

Decrement sc_opencount on drm_close.

(riastradh)

Destroy context_idr and mm.lock in i915_driver_postclose.

(riastradh)

Fix sense of atomic_cas loop condition and use kassertmsg for krefs.

(riastradh)

Restore config `drm' attribute in sys/conf/files.

Not sure why this started to be necessary after the merge, but
whatever...

(riastradh)

Initialize and destroy drm_global_mutex on module init/fini.

(riastradh)

Use PCI_BAR(m), not PCI_MAPREG_START + m, which is wrong.

(riastradh)

Don't cancel rps.work or hotplug_work in i915_driver_unload.

These are cancelled in intel_modeset_cleanup.

(riastradh)

Call drm_vblank_cleanup in drm_detach.

(riastradh)

Initialize mm.retire_work in i915_gem_load stub.

(riastradh)

Use mdelay for msleep of less than one tick.

(riastradh)

Destroy locks in i915_driver_unload.

(riastradh)

Ifdef out gtt unmapping for now in i915_driver_unload.

(riastradh)

Enable drm_debug by default for now.

(riastradh)

Clean up the waitqueue and locks in drm_vblank_cleanup.

(riastradh)

Destroy mode config locks in drm_mode_config_cleanup.

(riastradh)

Rework error branches of idr_get_new_above.

Return ENOSPC if we're about to overflow int.

(riastradh)

Actually return the new id in idr_get_new_above.

(riastradh)

Don't redundantly cancel mm.retire_work or error_work.

(riastradh)

Kludge up i915 stubs and start using the real i915_irq.c.

(riastradh)

Allow kfree(NULL).

(riastradh)

Initialize dev->dev, dev->primary, and dev->control in drm_attach.

(riastradh)

Convert i915_irq.c to use DRM_IRQ_ARGS in irq handlers.

(riastradh)

Add assert_spin_locked to <linux/spinlock.h>.

(riastradh)

Stub out intel_gtt initialization until we' ready for gem stuff.

(riastradh)

Stub out the content, not definition, of intel_console_resume.

(riastradh)

Fix sense of kassert in kcalloc.

(riastradh)

Add i915_hangcheck_elapsed stub.

(riastradh)

Add intel_irq_init stub.

(riastradh)

Add intel_gt_init stub.

(riastradh)

Add i1915_setup_sysfs stub.

(riastradh)

Use a non-NULL value for bogus <linux/workqueue.h> stubs.

(riastradh)

Initialize PCI memory maps and bus space/dma tags in drm_pci_attach.

(riastradh)

Let drm_fill_in_dev initialize dev->driver after all.

(riastradh)

Little stab at making drm_attach fail more gracefully.

(riastradh)

Mega-kludge: reverse sense of PAGE_MASK in <linux/mm.h>.

(riastradh)

Offset mmio_bar by PCI_MAPREG_START in i915_dma_attach.

(riastradh)

Set num_ioctls and enable DRIVER_MODESET in i915 module init.

(riastradh)

Call drm_pci_init/exit on i915drm2 module load/unload.

(riastradh)

Move driver->bus setting to drm_pci_init.

(riastradh)

Fill in files.drm2 a little.

(riastradh)

Call dev->driver->load in drm_attach.

(riastradh)

Pass drm_config_found arguments via explicit struct drm_attach_args.

(riastradh)

Fill in drm_detach some more.

(riastradh)

Destroy the idr in drm_ctxbitmap_cleanup.

(riastradh)

Destroy mm->unused_lock in drm_mm_takedown.

(riastradh)

Manage an opencount for each drm device to block drm_detach.

(riastradh)

Initialize sc->sc_drm_dev in drm_attach.

(riastradh)

Fix up drm attachment code.

(riastradh)

Destroy gmbus_mutex in intel_teardown_gmbus.

(riastradh)

Make drm_pci_agp_init succeed for now.

(riastradh)

Initialize sc->sc_drm_dev->driver = i915_drm_driver in i915drm_attach.

(riastradh)

Constify bus member of struct drm_driver.

(riastradh)

Initialize dev->driver->bus in drm_pci_attach.

(riastradh)

Provisional NO_DRM config for testing with a module.

Too much trouble to keep this as an uncommitted change...

(riastradh)

Stub out ironlake_teardown_rc6 in intel_pm.c too.

(riastradh)