Merge tag 'drm-intel-next-2023-11-23' of git://anongit.freedesktop.org/drm/drm-intel...

[linux-2.6-block.git] / drivers / gpu / drm / i915 / display / intel_fb.c

diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index 19b35ece31f1b7b245681ea7f58d75a4417b5668..6d48aa3af95a314c4f431c427084006994da9c49 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -764,7 +764,7 @@ bool intel_fb_modifier_uses_dpt(struct drm_i915_private *i915, u64 modifier)
 
 bool intel_fb_uses_dpt(const struct drm_framebuffer *fb)
 {
-       return fb && to_i915(fb->dev)->params.enable_dpt &&
+       return fb && to_i915(fb->dev)->display.params.enable_dpt &&
                intel_fb_modifier_uses_dpt(to_i915(fb->dev), fb->modifier);
 }
 
@@ -1930,10 +1930,10 @@ static int intel_user_framebuffer_dirty(struct drm_framebuffer *fb,
        if (!atomic_read(&front->bits))
                return 0;
 
-       if (dma_resv_test_signaled(obj->base.resv, dma_resv_usage_rw(false)))
+       if (dma_resv_test_signaled(intel_bo_to_drm_bo(obj)->resv, dma_resv_usage_rw(false)))
                goto flush;
 
-       ret = dma_resv_get_singleton(obj->base.resv, dma_resv_usage_rw(false),
+       ret = dma_resv_get_singleton(intel_bo_to_drm_bo(obj)->resv, dma_resv_usage_rw(false),
                                     &fence);
        if (ret || !fence)
                goto flush;
@@ -2093,7 +2093,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
                        }
                }
 
-               fb->obj[i] = &obj->base;
+               fb->obj[i] = intel_bo_to_drm_bo(obj);
        }
 
        ret = intel_fill_fb_info(dev_priv, intel_fb);