On Tue, Jan 03, 2012 at 07:10:00PM -0800, Eric Anholt 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"? $ make headers_install in the kernel tree should do all this preprocessing for you and drop a sanitized header into usr/include/drm/i915_drm.h. Lazy me hasn't checked whether that would match up perfectly with what's in libdrm though ... -Daniel -- Daniel Vetter Mail: daniel at ffwll.ch Mobile: +41 (0)79 365 57 48
