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? -- 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/01db30a6/attachment.pgp>