[PATCH] drm/i915/display: Use i915_gem_object_get_dma_address to get dma address

Hogander, Jouni jouni.hogander at intel.com
Tue Dec 5 09:29:54 UTC 2023


On Mon, 2023-12-04 at 14:49 +0100, Maarten Lankhorst wrote:
> Works better for xe like that. obj is no longer const.
> 
> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>

Reviewed-by: Jouni Högander <jouni.hogander at intel.com>

> ---
>  drivers/gpu/drm/i915/display/intel_cursor.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_cursor.c
> b/drivers/gpu/drm/i915/display/intel_cursor.c
> index a515ae2831f8..926e2de00eb5 100644
> --- a/drivers/gpu/drm/i915/display/intel_cursor.c
> +++ b/drivers/gpu/drm/i915/display/intel_cursor.c
> @@ -24,6 +24,8 @@
>  #include "intel_psr_regs.h"
>  #include "skl_watermark.h"
>  
> +#include "gem/i915_gem_object.h"
> +
>  /* Cursor formats */
>  static const u32 intel_cursor_formats[] = {
>         DRM_FORMAT_ARGB8888,
> @@ -34,11 +36,11 @@ static u32 intel_cursor_base(const struct
> intel_plane_state *plane_state)
>         struct drm_i915_private *dev_priv =
>                 to_i915(plane_state->uapi.plane->dev);
>         const struct drm_framebuffer *fb = plane_state->hw.fb;
> -       const struct drm_i915_gem_object *obj = intel_fb_obj(fb);
> +       struct drm_i915_gem_object *obj = intel_fb_obj(fb);
>         u32 base;
>  
>         if (DISPLAY_INFO(dev_priv)->cursor_needs_physical)
> -               base = sg_dma_address(obj->mm.pages->sgl);
> +               base = i915_gem_object_get_dma_address(obj, 0);
>         else
>                 base = intel_plane_ggtt_offset(plane_state);
>  



More information about the dri-devel mailing list