From 2a1c464735a7a14b0e30f2ca108d4ff63ff02304 Mon Sep 17 00:00:00 2001 From: "Sergey Semyonov (Serge)" Date: Sat, 21 Dec 2013 11:40:10 +0000 Subject: [PATCH] ddk includes: i915-v3.12.5-v1 git-svn-id: svn://kolibrios.org@4393 a494cfbc-eb01-0410-851d-a64ba20cac60 --- drivers/include/drm/drmP.h | 2 +- drivers/include/linux/uapi/drm/i915_drm.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/include/drm/drmP.h b/drivers/include/drm/drmP.h index 77fa3aa39e..69a483c52f 100644 --- a/drivers/include/drm/drmP.h +++ b/drivers/include/drm/drmP.h @@ -185,7 +185,7 @@ int drm_err(const char *func, const char *format, ...); /** \name Begin the DRM... */ /*@{*/ -#define DRM_DEBUG_CODE 2 /**< Include debugging code if > 1, then +#define DRM_DEBUG_CODE 0 /**< Include debugging code if > 1, then also include looping detection. */ #define DRM_MAGIC_HASH_ORDER 4 /**< Size of key hash table. Must be power of 2. */ diff --git a/drivers/include/linux/uapi/drm/i915_drm.h b/drivers/include/linux/uapi/drm/i915_drm.h index 45887236e7..8dc18ab3c8 100644 --- a/drivers/include/linux/uapi/drm/i915_drm.h +++ b/drivers/include/linux/uapi/drm/i915_drm.h @@ -1046,6 +1046,8 @@ struct drm_i915_fb_info { __u32 height; __u32 pitch; __u32 tiling; + __u32 crtc; + __u32 pipe; }; #endif /* _UAPI_I915_DRM_H_ */