Re: in-kernel DRM tree move around....

[Eric Anholt <eric@anholt.net>]

[-- Attachment #1: Type: text/plain, Size: 1787 bytes --]

On Thu, 2008-05-29 at 10:46 +1000, Dave Airlie wrote:
> Hi,
> 
> So I've been growing more annoyed with the current layout of the drm
> tree in the kernel,
> 
> a) it lives under char.
> b) everything in one directory.
> c) header files in one directory.
> d) no header files exposed to userspace.
> 
> http://git.kernel.org/?p=linux/kernel/git/airlied/drm-2.6.git;a=commitdiff;h=7df9a948d0f849466e3de259cccb49bc54cbad68
> 
> is a proposal to create drivers/gpu/drm, (I may move AGP in there as
> well later). It also creates per-driver subdirs.
> 
> This to me solves the a-d problems.
> 
> There is also an out-of-tree kernel drm which I'll probably give some
> more thought later.

I like it.

For upstream DRM, my first thought was something like:

drm/src/i915/i915_*.[ch]
drm/src/r128/r128_*.[ch]
drm/src/drm.h
drm/src/bsd/drm_*.[ch]
drm/src/bsd/Makefile
drm/src/bsd/i915/Makefile
drm/src/bsd/r128/Makefile
drm/src/linux/drm_*.[ch]
drm/src/linux/Makefile

Get rid of the -core absurdity, and move the shared code to top-level of
the kernel instead of alongside other kernel code.

But maybe nicer for merging on both of our parts would be:

drm/linux/Makefile
drm/linux/drm*.[ch]
drm/linux/i915/Makefile
drm/linux/i915/i915_*.[ch]
drm/linux/i915/Makefile
drm/linux/r128/r128_*.[ch]
drm/bsd/drm.h -> ../linux/drm.h
drm/bsd/drm*.[ch]
drm/bsd/Makefile
drm/bsd/i915/Makefile
drm/bsd/i915/i915_drv.c
drm/bsd/i915/i915_*.[ch] -> ../../linux/i915/i915_*.[ch]
drm/bsd/r128/Makefile
drm/bsd/r128/r128_drv.c
drm/bsd/r128/r128_*.[ch] -> ../../linux/r128/r128_*.[ch]

-- 
Eric Anholt                             anholt@FreeBSD.org
eric@anholt.net                         eric.anholt@intel.com


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 195 bytes --]