|
@@ -30,6 +30,8 @@
|
|
#ifndef _I915_DRV_H_
|
|
#ifndef _I915_DRV_H_
|
|
#define _I915_DRV_H_
|
|
#define _I915_DRV_H_
|
|
|
|
|
|
|
|
+#include <uapi/drm/i915_drm.h>
|
|
|
|
+
|
|
#include "i915_reg.h"
|
|
#include "i915_reg.h"
|
|
#include "intel_bios.h"
|
|
#include "intel_bios.h"
|
|
#include "intel_ringbuffer.h"
|
|
#include "intel_ringbuffer.h"
|
|
@@ -1614,6 +1616,14 @@ i915_gem_object_create_stolen(struct drm_device *dev, u32 size);
|
|
void i915_gem_object_release_stolen(struct drm_i915_gem_object *obj);
|
|
void i915_gem_object_release_stolen(struct drm_i915_gem_object *obj);
|
|
|
|
|
|
/* i915_gem_tiling.c */
|
|
/* i915_gem_tiling.c */
|
|
|
|
+inline static bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_object *obj)
|
|
|
|
+{
|
|
|
|
+ drm_i915_private_t *dev_priv = obj->base.dev->dev_private;
|
|
|
|
+
|
|
|
|
+ return dev_priv->mm.bit_6_swizzle_x == I915_BIT_6_SWIZZLE_9_10_17 &&
|
|
|
|
+ obj->tiling_mode != I915_TILING_NONE;
|
|
|
|
+}
|
|
|
|
+
|
|
void i915_gem_detect_bit_6_swizzle(struct drm_device *dev);
|
|
void i915_gem_detect_bit_6_swizzle(struct drm_device *dev);
|
|
void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj);
|
|
void i915_gem_object_do_bit_17_swizzle(struct drm_i915_gem_object *obj);
|
|
void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj);
|
|
void i915_gem_object_save_bit_17_swizzle(struct drm_i915_gem_object *obj);
|