On Wed, 04 Jan 2012 14:48:37 -0800 Eric Anholt <eric at anholt.net> wrote: > On Wed, 4 Jan 2012 08:52:34 -0800, Jesse Barnes <jbarnes at virtuousgeek.org> wrote: > > On Tue, 3 Jan 2012 19:10:00 -0800 > > Eric Anholt <eric at anholt.net> wrote: > > > > > --- > > > > > > This syncs the code up to the kernel as of the gen7 SOL changes. It > > > would be nice if doing this was just a straight copy of the kernel > > > code -- there are two diffs left out. One is this hunk: > > > > > > -#ifdef __KERNEL__ > > > -/* For use by IPS driver */ > > > -extern unsigned long i915_read_mch_val(void); > > > -extern bool i915_gpu_raise(void); > > > -extern bool i915_gpu_lower(void); > > > -extern bool i915_gpu_busy(void); > > > -extern bool i915_gpu_turbo_disable(void); > > > -#endif > > > > > > Does anyone see any real reason to be dropping this? > > > > > > The other is removing the sparse __user annotations on the structs. > > > Could we just patch the kernel to #define it away for userland, so we > > > could make updating this file just a matter of "cp"? > > > > Having just done this locally, I'm in favor. The stuff under > > __KERNEL__ should be harmless; don't see why we can't just copy it. > > > > For the __user define, we must be missing a compiler.h include > > somewhere in the libdrm case. If you explicitly include it do the > > errors go away? > > What version of POSIX is compiler.h part of? Remember that this is > userland code built across OSes (as much as we try to forget that). It's one of the Linux kernel headers. I'm such a Linux-ist I didn't even consider an OS that might not have it. We can just #define away __user in drm.h or something to avoid adding OS deps. Or use the header install target like Daniel said and copy from that. -- Jesse Barnes, Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: not available URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20120104/512982ae/attachment.pgp>
