diff options
Diffstat (limited to 'kernel/include/drm')
| -rw-r--r-- | kernel/include/drm/drmP.h | 3 | ||||
| -rw-r--r-- | kernel/include/drm/drm_cache.h | 2 | ||||
| -rw-r--r-- | kernel/include/drm/i915_pciids.h | 6 | ||||
| -rw-r--r-- | kernel/include/drm/ttm/ttm_bo_api.h | 14 |
4 files changed, 23 insertions, 2 deletions
diff --git a/kernel/include/drm/drmP.h b/kernel/include/drm/drmP.h index 0a271ca1f..a31976c86 100644 --- a/kernel/include/drm/drmP.h +++ b/kernel/include/drm/drmP.h @@ -1029,7 +1029,8 @@ static inline int drm_debugfs_remove_files(const struct drm_info_list *files, #endif extern struct dma_buf *drm_gem_prime_export(struct drm_device *dev, - struct drm_gem_object *obj, int flags); + struct drm_gem_object *obj, + int flags); extern int drm_gem_prime_handle_to_fd(struct drm_device *dev, struct drm_file *file_priv, uint32_t handle, uint32_t flags, int *prime_fd); diff --git a/kernel/include/drm/drm_cache.h b/kernel/include/drm/drm_cache.h index 461a0558b..cebecff53 100644 --- a/kernel/include/drm/drm_cache.h +++ b/kernel/include/drm/drm_cache.h @@ -39,6 +39,8 @@ static inline bool drm_arch_can_wc_memory(void) { #if defined(CONFIG_PPC) && !defined(CONFIG_NOT_COHERENT_CACHE) return false; +#elif defined(CONFIG_MIPS) && defined(CONFIG_CPU_LOONGSON3) + return false; #else return true; #endif diff --git a/kernel/include/drm/i915_pciids.h b/kernel/include/drm/i915_pciids.h index 17c445612..2cdc723d7 100644 --- a/kernel/include/drm/i915_pciids.h +++ b/kernel/include/drm/i915_pciids.h @@ -277,7 +277,9 @@ INTEL_VGA_DEVICE(0x191D, info) /* WKS GT2 */ #define INTEL_SKL_GT3_IDS(info) \ + INTEL_VGA_DEVICE(0x1923, info), /* ULT GT3 */ \ INTEL_VGA_DEVICE(0x1926, info), /* ULT GT3 */ \ + INTEL_VGA_DEVICE(0x1927, info), /* ULT GT3 */ \ INTEL_VGA_DEVICE(0x192B, info), /* Halo GT3 */ \ INTEL_VGA_DEVICE(0x192A, info) /* SRV GT3 */ \ @@ -289,6 +291,8 @@ #define INTEL_BXT_IDS(info) \ INTEL_VGA_DEVICE(0x0A84, info), \ INTEL_VGA_DEVICE(0x1A84, info), \ - INTEL_VGA_DEVICE(0x5A84, info) + INTEL_VGA_DEVICE(0x1A85, info), \ + INTEL_VGA_DEVICE(0x5A84, info), /* APL HD Graphics 505 */ \ + INTEL_VGA_DEVICE(0x5A85, info) /* APL HD Graphics 500 */ #endif /* _I915_PCIIDS_H */ diff --git a/kernel/include/drm/ttm/ttm_bo_api.h b/kernel/include/drm/ttm/ttm_bo_api.h index c768ddfbe..b7bfa513e 100644 --- a/kernel/include/drm/ttm/ttm_bo_api.h +++ b/kernel/include/drm/ttm/ttm_bo_api.h @@ -316,6 +316,20 @@ ttm_bo_reference(struct ttm_buffer_object *bo) */ extern int ttm_bo_wait(struct ttm_buffer_object *bo, bool lazy, bool interruptible, bool no_wait); + +/** + * ttm_bo_mem_compat - Check if proposed placement is compatible with a bo + * + * @placement: Return immediately if buffer is busy. + * @mem: The struct ttm_mem_reg indicating the region where the bo resides + * @new_flags: Describes compatible placement found + * + * Returns true if the placement is compatible + */ +extern bool ttm_bo_mem_compat(struct ttm_placement *placement, + struct ttm_mem_reg *mem, + uint32_t *new_flags); + /** * ttm_bo_validate * |