Merge tag 'drm-intel-gt-next-2023-03-16' of git://anongit.freedesktop.org/drm/drm...

[linux-block.git] / drivers / gpu / drm / i915 / gt / intel_rc6.c

diff --git a/drivers/gpu/drm/i915/gt/intel_rc6.c b/drivers/gpu/drm/i915/gt/intel_rc6.c
index 6184fcc169877d6287150ec24a78286c1d0bf0a6..f4150f61f39c0be7cae48e67fc3430a7640ce0c1 100644 (file)
--- a/drivers/gpu/drm/i915/gt/intel_rc6.c
+++ b/drivers/gpu/drm/i915/gt/intel_rc6.c
@@ -301,7 +301,7 @@ static int chv_rc6_init(struct intel_rc6 *rc6)
        pcbr = intel_uncore_read(uncore, VLV_PCBR);
        if ((pcbr >> VLV_PCBR_ADDR_SHIFT) == 0) {
                drm_dbg(&i915->drm, "BIOS didn't set up PCBR, fixing up\n");
-               paddr = i915->dsm.end + 1 - pctx_size;
+               paddr = i915->dsm.stolen.end + 1 - pctx_size;
                GEM_BUG_ON(paddr > U32_MAX);
 
                pctx_paddr = (paddr & ~4095);
@@ -325,7 +325,7 @@ static int vlv_rc6_init(struct intel_rc6 *rc6)
                /* BIOS set it up already, grab the pre-alloc'd space */
                resource_size_t pcbr_offset;
 
-               pcbr_offset = (pcbr & ~4095) - i915->dsm.start;
+               pcbr_offset = (pcbr & ~4095) - i915->dsm.stolen.start;
                pctx = i915_gem_object_create_region_at(i915->mm.stolen_region,
                                                        pcbr_offset,
                                                        pctx_size,
@@ -354,10 +354,10 @@ static int vlv_rc6_init(struct intel_rc6 *rc6)
        }
 
        GEM_BUG_ON(range_overflows_end_t(u64,
-                                        i915->dsm.start,
+                                        i915->dsm.stolen.start,
                                         pctx->stolen->start,
                                         U32_MAX));
-       pctx_paddr = i915->dsm.start + pctx->stolen->start;
+       pctx_paddr = i915->dsm.stolen.start + pctx->stolen->start;
        intel_uncore_write(uncore, VLV_PCBR, pctx_paddr);
 
 out:
@@ -448,8 +448,8 @@ static bool bxt_check_bios_rc6_setup(struct intel_rc6 *rc6)
         */
        rc6_ctx_base =
                intel_uncore_read(uncore, RC6_CTX_BASE) & RC6_CTX_BASE_MASK;
-       if (!(rc6_ctx_base >= i915->dsm_reserved.start &&
-             rc6_ctx_base + PAGE_SIZE < i915->dsm_reserved.end)) {
+       if (!(rc6_ctx_base >= i915->dsm.reserved.start &&
+             rc6_ctx_base + PAGE_SIZE < i915->dsm.reserved.end)) {
                drm_dbg(&i915->drm, "RC6 Base address not as expected.\n");
                enable_rc6 = false;
        }