Merge drm/drm-next into drm-intel-next-queued

[platform/kernel/linux-rpi.git] / drivers / gpu / drm / i915 / i915_drv.h

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 7ea4420..8624b4b 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -87,8 +87,8 @@
 
 #define DRIVER_NAME            "i915"
 #define DRIVER_DESC            "Intel Graphics"
-#define DRIVER_DATE            "20180906"
-#define DRIVER_TIMESTAMP       1536242083
+#define DRIVER_DATE            "20180921"
+#define DRIVER_TIMESTAMP       1537521997
 
 /* Use I915_STATE_WARN(x) and I915_STATE_WARN_ON() (rather than WARN() and
  * WARN_ON()) for hw state sanity checks to check for unexpected conditions
@@ -1946,6 +1946,20 @@ struct drm_i915_private {
                bool distrust_bios_wm;
        } wm;
 
+       struct dram_info {
+               bool valid;
+               bool valid_dimm;
+               bool is_16gb_dimm;
+               u8 num_channels;
+               enum dram_rank {
+                       I915_DRAM_RANK_INVALID = 0,
+                       I915_DRAM_RANK_SINGLE,
+                       I915_DRAM_RANK_DUAL
+               } rank;
+               u32 bandwidth_kbps;
+               bool symmetric_memory;
+       } dram_info;
+
        struct i915_runtime_pm runtime_pm;
 
        struct {
@@ -2159,6 +2173,15 @@ struct drm_i915_private {
         */
 };
 
+struct dram_channel_info {
+       struct info {
+               u8 size, width;
+               enum dram_rank rank;
+       } l_info, s_info;
+       enum dram_rank rank;
+       bool is_16gb_dimm;
+};
+
 static inline struct drm_i915_private *to_i915(const struct drm_device *dev)
 {
        return container_of(dev, struct drm_i915_private, drm);
@@ -2284,7 +2307,7 @@ static inline struct scatterlist *__sg_next(struct scatterlist *sg)
 #define for_each_sgt_dma(__dmap, __iter, __sgt)                                \
        for ((__iter) = __sgt_iter((__sgt)->sgl, true);                 \
             ((__dmap) = (__iter).dma + (__iter).curr);                 \
-            (((__iter).curr += PAGE_SIZE) >= (__iter).max) ?           \
+            (((__iter).curr += I915_GTT_PAGE_SIZE) >= (__iter).max) ?  \
             (__iter) = __sgt_iter(__sg_next((__iter).sgp), true), 0 : 0)
 
 /**
@@ -3074,6 +3097,12 @@ enum i915_map_type {
        I915_MAP_FORCE_WC = I915_MAP_WC | I915_MAP_OVERRIDE,
 };
 
+static inline enum i915_map_type
+i915_coherent_map_type(struct drm_i915_private *i915)
+{
+       return HAS_LLC(i915) ? I915_MAP_WB : I915_MAP_WC;
+}
+
 /**
  * i915_gem_object_pin_map - return a contiguous mapping of the entire object
  * @obj: the object to map into kernel address space
@@ -3311,7 +3340,7 @@ int i915_gem_stolen_insert_node_in_range(struct drm_i915_private *dev_priv,
 void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv,
                                 struct drm_mm_node *node);
 int i915_gem_init_stolen(struct drm_i915_private *dev_priv);
-void i915_gem_cleanup_stolen(struct drm_device *dev);
+void i915_gem_cleanup_stolen(struct drm_i915_private *dev_priv);
 struct drm_i915_gem_object *
 i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,
                              resource_size_t size);