drm/i915: make reserved struct resource centric

Now that we are using struct resource to track the stolen region, it is
more convenient if we track the reserved portion of that region in a
resource as well.

v2: s/<= end + 1/< end/ (Chris)
v3: prefer DEFINE_RES_MEM

Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171211151822.20953-7-matthew.auld@intel.com

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 1677b7e0d671e0bc4764b5e6c2e56d3689745623..7945af0037f89cd37320a75278f373a5029e5795 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2259,6 +2259,10 @@ struct drm_i915_private {
         * some portion of it is in fact reserved for use by hardware functions.
         */
        struct resource dsm;
+       /**
+        * Reseved portion of Data Stolen Memory
+        */
+       struct resource dsm_reserved;
 
        void __iomem *regs;
 

diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.h b/drivers/gpu/drm/i915/i915_gem_gtt.h
index 30a2920b12911bdfb38060e0b4325294ceb47ce4..db20c72ecfc8aeff7d8146015f4da3bddf8da3bb 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_gtt.h
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.h
@@ -382,8 +382,6 @@ struct i915_ggtt {
         * hardware functions and similarly removed from the accessible range.
         */
        u32 stolen_usable_size; /* Total size minus reserved ranges */
-       u32 stolen_reserved_base;
-       u32 stolen_reserved_size;
 
        /** "Graphics Stolen Memory" holds the global PTEs */
        void __iomem *gsm;

diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index 5b5558fe70cca23e6091bd56d2bb321bcc6f31c3..b6cca0d4ecd3d818110ee7acf9c23507b1963cf2 100644 (file)
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -394,17 +394,15 @@ int i915_gem_init_stolen(struct drm_i915_private *dev_priv)
                reserved_base = stolen_top;
        }
 
-       if (reserved_base < dev_priv->dsm.start ||
-           reserved_base + reserved_size > stolen_top) {
-               dma_addr_t reserved_top = reserved_base + reserved_size;
-               DRM_ERROR("Stolen reserved area [%pad - %pad] outside stolen memory %pR\n",
-                         &reserved_base, &reserved_top, &dev_priv->dsm);
+       dev_priv->dsm_reserved =
+               (struct resource) DEFINE_RES_MEM(reserved_base, reserved_size);
+
+       if (!resource_contains(&dev_priv->dsm, &dev_priv->dsm_reserved)) {
+               DRM_ERROR("Stolen reserved area %pR outside stolen memory %pR\n",
+                         &dev_priv->dsm_reserved, &dev_priv->dsm);
                return 0;
        }
 
-       ggtt->stolen_reserved_base = reserved_base;
-       ggtt->stolen_reserved_size = reserved_size;
-
        /* It is possible for the reserved area to end before the end of stolen
         * memory, so just consider the start. */
        reserved_total = stolen_top - reserved_base;

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 79b3fd617de0fc1827239e725b0663b47409bf51..57dcf8e1ff30e281dd8c7b02fd788f4275bf1395 100644 (file)
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -6416,7 +6416,6 @@ static void valleyview_disable_rps(struct drm_i915_private *dev_priv)
 
 static bool bxt_check_bios_rc6_setup(struct drm_i915_private *dev_priv)
 {
-       struct i915_ggtt *ggtt = &dev_priv->ggtt;
        bool enable_rc6 = true;
        unsigned long rc6_ctx_base;
        u32 rc_ctl;
@@ -6441,9 +6440,8 @@ static bool bxt_check_bios_rc6_setup(struct drm_i915_private *dev_priv)
         * for this check.
         */
        rc6_ctx_base = I915_READ(RC6_CTX_BASE) & RC6_CTX_BASE_MASK;
-       if (!((rc6_ctx_base >= ggtt->stolen_reserved_base) &&
-             (rc6_ctx_base + PAGE_SIZE <= ggtt->stolen_reserved_base +
-                                       ggtt->stolen_reserved_size))) {
+       if (!((rc6_ctx_base >= dev_priv->dsm_reserved.start) &&
+             (rc6_ctx_base + PAGE_SIZE < dev_priv->dsm_reserved.end))) {
                DRM_DEBUG_DRIVER("RC6 Base address not as expected.\n");
                enable_rc6 = false;
        }