Move some drm2 module make goo into a drm2/Makefile.inc.

(riastradh)

Hook drm_stub.c into the drm2 module build again.

(riastradh)

Tweak an error branch in drm_fill_in_dev a little.

Destroy the spin locks and mutices.

Other error branches require closer scrutiny.

(riastradh)

Adapt drm_fill_in_dev to use linux_mutex_init.

(riastradh)

Make drm_master_destroy destroy the spinlock and waitqueues too.

(riastradh)

Adapt drm_master_create to use DRM_INIT_WAITQUEUE.

(riastradh)

Adapt drm_err to NetBSD kernel printf.

(riastradh)

Omit minor allocation, procfs, debugfs, and more from drm_stub.c.

Might be better split into two files, one for handling DRM data
structures (masters, devices, &c.) and one for gluing them to Linux
KPIs, but this is expedient for now.

(riastradh)

drm_stub.c needs <linux/export.h> and <linux/printk.h>.

(riastradh)

Add fields to struct drm_sg_mem for NetBSD bus_dma.

(riastradh)

Ifdef out declaration of drm_agp_bind_pages in drmP.h.

Nothing seems to use it, and it uses Linux's struct page anyway, so
if anything did use it it would need to be adapted.

(riastradh)

Add drm_pci_alloc/drm_pci_free to local drm_memory.c.

Moved here from upstream's drm_pci.c because they don't actually
depend on anything of PCI; they just invoke the bus-independent
bus_dma abstraction.

(riastradh)

Add a bus_dma tag to struct drm_device.

Old drm got at this through the struct pci_attach_args sequestered
away somewhere in struct drm_device, but this way access to the dma
tag is bus-independent.

(riastradh)

Add fields to struct drm_dma_handle for NetBSD bus_dma.

(riastradh)

drm_mm.c needs <linux/printk.h> and <asm/bug.h>.

(riastradh)

Add comment explaining why drm_idlelock_* are not yet implemented.

(riastradh)

Expose drm_lastclose from (our local) drm_fops.c.

Linux drm_stub.c wants it.

(riastradh)

Rename fields of struct list_head to match Linux.

Linux code uses the fields by name, not by list_next and list_prev
accessors, so we'd better match.

hlist may need this too.

(riastradh)

Add <linux/printk.h>.

(riastradh)

Add GFP_ATOMIC, meaning M_NOWAIT, to <linux/slab.h>.

(riastradh)

Add linux_mutex_destroy to <linux/mutex.h>.

(riastradh)

Add some Linuxy MODULE_* stubs to <linux/module.h>.

(riastradh)

Add DRM_DESTROY_WAITQUEUE to drm_wait_netbsd.h.

(riastradh)

Add list_prev to <linux/list.h>.

(riastradh)

Add list_move and list_replace to <linux/list.h>.

(riastradh)

Include <sys/types.h> before <sys/device_if.h> in <linux/i2c.h>.

(riastradh)

Implement drm_lock_free and drm_i_have_hw_lock.

(riastradh)

Unhook drm_pci.c from drm2 module, to moved to a drm2pci module.

(riastradh)

First draft of a local drm_pci.c.

(riastradh)

Unhook drm_stub.c, most of which is irrelevant.

(riastradh)

Unhook drm_vm.c until rewritten for uvm.

(riastradh)

Unhook drm_scatter.c until rewritten with bus_dma(9).

(riastradh)

Unhook drm_proc.c; we shall use sysctl instead later.

(riastradh)

Unhook drm_platform.c; we have a different idea of platform devices.

(riastradh)

Unhook drm_modes.c until deemed necessary.

(riastradh)

Add a local drm_lock.c, since I can't make sense of Linux's.

This leaves drm_idlelock_take and drm_idlelock_release unimplemented
until I can figure out the intended semantics.  Linux's code doesn't
guarantee that the lock is taken when drm_idlelock_take returns, and
provides no way to check whether the current lwp/thread/whatever owns
the lock as intended, so there's no way to add diagnostic checks for
the correct use of the API.

(riastradh)

Tweak struct drm_lock_data.

(riastradh)

Define IPL_DRM to be IPL_TTY in drm_irq_netbsd.h.

This is not clearly the right definition, but it's what the old drm
code used.  This is not clearly the right place, but it will do for
now.

(riastradh)

Convert drm_irq.c to use drm_bus irq_install/irq_uninstall.

(riastradh)

Add a drm bus irq cookie to struct drm_device.

(riastradh)

Extend struct drm_bus with irq_install and irq_uninstall operations.

These allow us to pass an intr handler cookie from install to
uninstall, which Linux doesn't do in its request_irq/free_irq but
which we need for pci_intr_establish/pci_intr_disestablish.

(riastradh)

Convert drm_irq.c to use the drm_wait compatibility API.

(riastradh)

Avoid sizeof(wait_queue_head_t) in drm_irq.c.

Use sizeof(*dev->vbl_queue_head) instead to ease transition to
drm_wait compatibility API.

(riastradh)

Add timespec_to_ns and timeval_to_ns to <linux/ktime.h>.

Not quite the right place, but this'll do for now.

(riastradh)

Replace current->pid by curproc->pid in drm_irq.c.  (Kludge...)

(riastradh)

drm_irq.c needs a bunch of header files.

(riastradh)

Define DRM_INFO appropriately for NetBSD in drmP.h.

(riastradh)

Add <linux/preempt.h> for drm2.

(riastradh)

Add <linux/math64.h> for drm2.

(riastradh)

Add <linux/ktime.h> for drm2.

(riastradh)

Add dummy vga_client_register stub to <linux/vgaarb.h>.

(riastradh)

Fix mod_timer to use absolute timeouts in <linux/timer.h>.

(riastradh)

Add Linux SMP atomic inc/dec memory barriers to <linux/atomic.h>.

(riastradh)

Define jiffies to be hardclock_ticks in <linux/jiffies.h>.

(riastradh)

Implement abs64 in <linux/kernel.h>.

(riastradh)

Add atomic_add and atomic_add_return to <linux/atomic.h>.

(riastradh)

Separate `struct atomic { ... }' from typedef for greppability.

(riastradh)

Add empty trace_drm_vblank_* stubs to drm_trace.h.

(riastradh)

Define DRM_HZ to be hz (super-kludgey!) in drm_wait_netbsd.h.

(riastradh)

Define IRQF_SHARED to be 0 in drm_irq_netbsd.h.

(riastradh)

Define WARN_ON_SMP to be the same as WARN_ON in Linux <asm/bug.h>.

(riastradh)

Disable DRM_IOCTL_GET_CLIENT (drmGetClient in libdrm) for now.

It does not appear to be needed by anything but diagnostic tools, and
it requires bogus kernel state to be maintained.

(riastradh)

Unhook drm_ioc32.c; worry about 32-bit compat later.

(riastradh)

Build drm2 module with DIAGNOSTIC.

(riastradh)

Unhook drm_info.c -- Linux sysfs stuff.

(riastradh)

Unhook drm_gem.c until rewritten with uvm cruft.

(riastradh)

Add vzalloc to <linux/vmalloc.h>.

(riastradh)

Add (unauthentic) spin_lock_destroy to <linux/spinlock.h>.

(riastradh)

Add kcalloc to <linux/slab.h>.

(riastradh)

Add some hlist operations to <linux/list.h>.

Also add some bogus `rcu-safe' operations, to be filled in with the
right memory barriers later.

(riastradh)

Implement unlikely as __predict_false in <linux/kernel.h>.

(riastradh)

Implement hash_long in <linux/hash.h>.

Uses the same hash function as in Linux, implemented differently.

(riastradh)

Avoid INT_MAX in PTR_ERR; check for truncation instead.

(riastradh)

In drm_global_release, declare item ignored.

(riastradh)

drm_global.c needs <linux/kernel.h>, <linux/export.h>, and <asm/bug.h>.

(riastradh)

Add local drm_memory.c to implement drm_ioremap and drm_iounmap.

(riastradh)

drm_gem.c needs <linux/err.h>, <linux/export.h>, and <asm/bug.h>.

(riastradh)

Convert mutex_init to linux_mutex_init in drm_global.c.

(riastradh)

drm_crtc_helper.c needs <asm/bug.h>.

(riastradh)

drm_crtc.c needs <asm/bug.h>.

(riastradh)

Move WARN and WARN_ON to <asm/bug.h> and add BUG_ON.

(riastradh)

Fix up drm_read and drm_poll a little.

Still #ifdef'd out because it needs some selnotify calls to actually
work, but the #ifdef'd code now compiles and looks more plausible --
doesn't hold onto spin locks during loops and uiomoves.

(riastradh)

Tag the XXX's in drm_drv.c for enhanced greppability.

(riastradh)

Name fp->f_data in drm_close for clarity.

(riastradh)

Add variants of drm wait/wakeup for spin locks in drm_wait_netbsd.h.

(riastradh)

Define list_first_entry in <linux/list.h>.

(riastradh)

Define spin_is_locked in <linux/spinlock.h>.

(riastradh)

Move OS-independent cruft from drm_drv.c to a new drm_fops.c.

(riastradh)

Use only C99-style initializers in DRM_MODE in drm_crtc.h.

(riastradh)

Unhook drm_encoder_slave.c until rewritten with NetBSD i2c.

(riastradh)

Fix copypasto in commit ffe8f68e48d8cfe8d22a8f2bea1ea5825e8d5b49.

Diff of sys/external/bsd/drm2/dist between vendor/LINUX_DRM2 and HEAD
is supposed to be only additions.

(riastradh)

First draft of NetBSD drm(4) driver attachment goop.

- Attachments will look like: drm0 at i915drm0 at pci0.  In the
future, we may have wsdisplay0 at (drmfb0 at) drm0 at pci0.  The
intent is to avoid having vga0, radeonfb0, &c., attach at pci0, and
then having drm0 parasitically sucking their memory as we currently
do with old drm.  The drm0 device exists only so that we can have a
unified /dev/drm device node exposed to userland (i.e., a single drm
device major).

- There are some OS-independent subroutines here that don't belong.
I wrote them by
  . studying the Linux driver attachment goop in dist/drm/drm_drv.c,
    drm_fops.c, and drm_stub.c;
  . identifying what logic is about DRM rather than about Linux's
    driver KPI; and
  . writing NetBSD driver attachment goop based on that information,
    with the logic that is about DRM and independent of driver KPI
    separated out into separate subroutines (drm_open_file, &c.).

- Initialization of struct drm_device is missing.  It's not clear yet
whether this should be done by i915drm_attach &c., perhaps using some
utility (say, drm_device_initialize) defined here, or whether this
should be done mostly by drm_attach.

- Poll and read are missing.  I suspect they will have to be filled
in at some point, in spite of comments in the old drm code to the
effect that they exist only for legacy X servers -- it looks like
more recent libdrms rely on them.

- Compile-tested only so far; this code is far from running.

(riastradh)

Reorder .PATH in drm2 module so we can have local overrides.

(riastradh)

Unhook drm_fb_helper.c from the build for now.

Needs to be rewritten as a wsdisplay attachment or something.

(riastradh)

Unhook drm_edid.c from the build for now.

Needs to be rewritten with NetBSD's edid KPI.

(riastradh)

Unhook drm_dp_helper.c from the build for now.

Needs to be rewritten with NetBSD's i2c KPI.

(riastradh)

Need to mask off IOC_DIRMASK too in DRM_IOCTL_NR.

(riastradh)

Ifdef out unused and now uninitialized fields of drm_agp_head.

(riastradh)

Define DRM_IOCTL_NR and DRM_MAJOR appropriately for NetBSD.

(riastradh)

drm_crtc_helper.c does not need drm_fb_helper.h.

(riastradh)

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

(riastradh)

Add Linuxoid <asm/param.h> with hokey HZ.

(riastradh)

Avoid arithmetic on void * in drm_crtc.c.

(riastradh)

Work around global definitions of min and max in drm_crtc.c.

(riastradh)

Use list_next(&list), not list.next, in drm_crtc.c.

(riastradh)

Avoid empty-brace initializer in drm_mode_addfb in drm_crtc.c.

(riastradh)

Define swap in <linux/kernel.h>.

Kinda hokey definition, but this avoids typeof.

(riastradh)

Make drm_mode_group_init static in drm_crtc.c.

(riastradh)

Replace mutex_init by linux_mutex_init in drm_crtc.c.

(riastradh)

Sprinkle const into drm_crtc.c where string literals are involved.

Omit unused drm_get_connector_status_name (was used only by sysfs)
and drm_get_dirty_info_name (seems to have been completely unused).

(riastradh)

drm_crtc.c needs <linux/err.h> and <linux/spinlock.h>.

(riastradh)

Add some expedient __UNCONST workarounds to drm_crtc_helper.h.

(riastradh)

Add __le16, __le32, and __le64 to <linux/types.h>.

As far as I'm aware, these aliases are correct, and the type doesn't
actually have any effect on the byte order of reads and writes.

(riastradh)

Add hokey (but typeof-free) get_user and put_user to <asm/uaccess.h>.

(riastradh)

Add WARN and WARN_ON to <linux/kernel.h>.

(riastradh)

Fix some typos and add some stuff to <linux/list.h>.

(riastradh)

Define empty module_init and module_exit stubs in <linux/module.h>.

(riastradh)

Define empty module_param_named stub in <linux/moduleparam.h>.

(riastradh)

Define linux_mutex_init in <linux/mutex.h> to make its uses greppable.

(riastradh)

It's spin_unlock_irqrestore, not spin_lock_irqrestore.

(riastradh)

Fix signature of INIT_DELAYED_WORK.

(riastradh)

Disconnect drm_cache.c from drm2 module.  Needs to be rewritten.

(riastradh)

Replace wake_up by DRM_WAKEUP_ONE in drm_context.c.

(riastradh)

drm_context.c needs <linux/err.h>.

(riastradh)

Ifdef out the one reference to (assignment of) drm_context last_switch.

(riastradh)

Remove apparently unused struct drm_context::last_switch.

(riastradh)

Add some bit-toggling atomics to <linux/atomic.h>.

(riastradh)

Implement idr_replace.

(riastradh)

Implement Linux's kludgerous pointers-as-errors in <linux/err.h>.

(riastradh)

Implement idr_remove_all.

(riastradh)

Replace capable(CAP_SYS_ADMIN) by DRM_SUSER() in drm_bufs.c.

(riastradh)

Implement DRM_SUSER compatibility kludge.

(riastradh)

Replace wake_up_interruptible_all by DRM_WAKEUP_ALL in drm_bufs.c.

(riastradh)

Replace ioremap/iounmap by drm_ioremap/drm_iounmap in drm_bufs.c.

(riastradh)

Declare compatibility frobs drm_ioremap and drm_iounmap in drmP.h.

To be implemented later.

(riastradh)

Unifdef declaration of drm_global_mutex in drmP.h.

XXX Should probably be declared as drm_interlock_t instead.

(riastradh)

Avoid arithmetic on void * in drm_bufs.c.

(riastradh)

agp_info.ai_aperture_size, not agp_info.aper_size << 20, in drm_bufs.c.

(riastradh)

drm_bufs.c needs <linux/sched.h>, <linux/mm.h>, and <asm/mtrr.h>.

(riastradh)

First stab at vm_mmap in <linux/mm.h>.  Also PAGE_SIZE & round_page.

(riastradh)

Mark NetBSD->Linux errno translations in copy_{to,from}_user.

(riastradh)

Define MTRR when building the drm2 module on x86.

(riastradh)

Partially implement Linux <asm/mtrr.h>.

(riastradh)

#define current curproc, and add task_pid_nr, in <linux/sched.h>.

(riastradh)

Tweak drm waitqueue compatibility interface.

Use (Linux) struct mutex for drm_interlock_t, and split DRM_WAKEUP
into DRM_WAKEUP_ONE (cv_signal) and DRM_WAKEUP_ALL (cv_broadcast).

(riastradh)

Include <sys/bitops.h> in <linux/log2.h> for ilog2.

(riastradh)

Implement vmalloc_user and vfree with malloc(9) in <linux/vmalloc.h>.

XXX Probably not the right thing here -- uvm_km_alloc is probably
more appropriate, but Linux doesn't pass the size to vfree, so this
is more expedient for now.

(riastradh)

Implement list_empty and list_for_each_entry_safe in <linux/list.h>.

Also fix the list operations to be consistent about using the head,
rather than NULL, as the sentinel.

(riastradh)

Use a union rather than casts in <linux/atomic.h>.  Add atomic_dec.

(riastradh)

Define copy_{to,from}_user in <linux/uaccess.h> & <asm/uaccess.h>.

(riastradh)

Negate error code in DRM_COPY_{TO,FROM}_USER in drm_copy_netbsd.h.

(riastradh)

Implement krealloc in <linux/slab.h>.

(riastradh)

Define SHMLBA to be PAGE_SIZE in <asm/shmparam.h>.

XXX Wait, what?

(riastradh)

Avoid pointer arithmetic on void * in drm_buffer.c.

(riastradh)

Implement DRM_COPY_FROM_USER and DRM_COPY_FROM_USER.

(riastradh)

Replace trivial spinlock by atomics in drm_getmagic.

(This whole drm_getmagic thing smells awfully fishy...)

(riastradh)

Hack up drm_agpsupport.c.

It's a miserable bastard hybrid of NetBSD's and Linux's AGP KPIs, but
it's good enough to make drm_agpsupport.o the first successfully
compiled file in this drm2 mess!

(riastradh)

Fill in drm_agp_netbsd.h a little.

There are some horrible but expedient hacks in here.  Sorry.

(riastradh)

Kill some #ifs in drmP.h by adding Linuxoid PCI goo to <linux/pci.h>.

(riastradh)

Add INIT_LIST_HEAD, list_add, list_add_tail, and list_del.

(riastradh)

Add Linux-style kmalloc &c. to <linux/slab.h>.

Defined in terms of malloc(9) with M_TEMP for now, since Linux's
kfree doesn't pass the size, so using kmem(9) is inexpedient.

(riastradh)

drm_agpsupport.c needs <linux/export.h>.

(riastradh)

Implement drm_can_sleep by always returning false.

Not quite correct, but all we have in the kernel is assert_sleepable,
no sleepable_p, and it's not obvious to me that asking whether it's
kosher to sleep is ever a sensible thing to do.

(riastradh)

Provisionally remove ati_pcigart.c from the drm2 module.

We'll need it later for ATI support, but for now it is in the way of
progress toward Intel support.

(riastradh)

Provisionally forward-declare struct pci_dev in drmP.h.

(riastradh)

Include <sys/errno.h> in <linux/errno.h>.

(riastradh)

Include <linux/errno.h> in drm_agpsupport.c.

(riastradh)

Implement Linux's struct mutex less sleazily.

Can't recall why I did it sleazily in the first place.

(riastradh)

Dribble some PCI device goo into drmP.h.

(riastradh)

In linux_idr, move idr_temp access under the write lock.

The atomic swaps were missing memory barriers, but using the rwlock
is easier to understand for now.  This should probably use passive
serialization eventually anyway.

(riastradh)

Include "opt_multiprocessor.h" for MULTIPROCESSOR in <asm/barrier.h>.

(riastradh)

Rewrite <drm/drm_mem_util.h> in terms of kmem.

This requires passing the sizes to drm_free_large, which will require
some changes to the code that uses this abstraction, but they look
like they will be easy changes.

(riastradh)

Add some atomic operations to <linux/atomic.h>.

(riastradh)

Reimplement (partial) Linux list abstraction directly.

TAILQ_* won't work easily because Linux doesn't distinguish heads from
noses.

(riastradh)

Ifdef out a bunch of stuff in <drm/drmP.h>.

Some of it is for debugs/sysfs/procfs and not fit for NetBSD.
Some of it is to be revisited later and adapted to NetBSD.

(riastradh)

Include <asm/barrier.h> in <drm/drmP.h>.

(riastradh)

Implement Linux memory barriers in <asm/barrier.h>.

(riastradh)

Include <linux/timer.h> in <drm/drmP.h>.

(riastradh)

Define cycles_t to be unsigned long long for now in <linux/types.h>.

(riastradh)

Implement a subset of Linux's struct timer_list with callouts.

(riastradh)

Little pseudo-fixes for untested bogus delayed_work implementation.

(riastradh)

Add DRM IRQ shims.

(riastradh)

Add shim pm_message_t in crude imitation of Linux.

(riastradh)

Define struct i2c_adapter as a device_t wrapper in <linux/i2c.h>.

(riastradh)

Add callout-based delayed_work implementation to <linux/workqueue.h>.

(riastradh)

Include <sys/systm.h> in <linux/kernel.h> for offsetof.

(riastradh)

Include <linux/kref.h> in <drm/drmP.h>.

(riastradh)

Implement krefs in <linux/kref.h>.

(riastradh)

Fill <linux/mutex.h> with aliases for our mutex abstraction.

mutex_lock_interruptible isn't; this may require revisiting.

(riastradh)

Define resource_size_t to be bus_size_t in <linux/types.h>.

(riastradh)

Add u64, s8, s16, s32, and s64 to <linux/types.h>.

(riastradh)

Add drm_agp_netbsd.h and include it in drm_os_netbsd.h.

(riastradh)

Convert drmP.h to use drm_waitqueue_t instead of wait_queue_head_t.

(riastradh)

Remove Linuxoid definitions of __OS_HAS_{AGP,MTRR} from drmP.h.

(riastradh)

Implement drm waitqueues with condvars.  Include in drm_os_netbsd.h.

(riastradh)

Remove now unused <drm/drm_os_linux.h> shim.

(riastradh)

Include <linux/atomic.h> and <linux/uidgid.h> in <drm/drmP.h>.

(riastradh)

Add shim <linux/uidgid.h>.

(riastradh)

Omit unused drm_mm_initialized, which uses list internals.

(riastradh)

Include <linux/spinlock.h> in <drm/drm_mm.h>.

(riastradh)