Messages in this thread | | | Date | Thu, 29 May 2008 06:23:35 +0200 | From | Sam Ravnborg <> | Subject | Re: in-kernel DRM tree move around.... |
| |
On Thu, May 29, 2008 at 10:46:22AM +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.
Like it. > > 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.
Makefie bits: 5 EXTRA_CFLAGS = -Iinclude/drm Use ccflags-y := -Iinclude/drm I assume this is a temporary workaround and you plan to fix up all includes to use "#include <drm/fo.h>"
6 drm-objs := drm_auth.o drm_bufs.o drm_context.o drm_dma.o drm_drawable.o \ 7 drm_drv.o drm_fops.o drm_ioctl.o drm_irq.o \ 8 drm_lock.o drm_memory.o drm_proc.o drm_stub.o drm_vm.o \ 9 drm_agpsupport.o drm_scatter.o ati_pcigart.o drm_pci.o \ 10 drm_sysfs.o drm_hashtab.o drm_sman.o drm_mm.o
Use drm-y := ....
11 12 ifeq ($(CONFIG_COMPAT),y) 13 drm-objs += drm_ioc32.o 14 endif So you can do: drm-$(CONFIG_COMPAT) += drm_ioc32.o
Take the above as general input for all your Makefiles.
| |