Skip to content

Commit 7054b55

Browse files
mlankhorstMaarten Lankhorst
authored andcommitted
drm/i915/display: Use i915_gem_object_get_dma_address to get dma address
Works better for xe like that. obj is no longer const. Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231204134946.16219-1-maarten.lankhorst@linux.intel.com Reviewed-by: Jouni Högander <jouni.hogander@intel.com>
1 parent f270b70 commit 7054b55

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

drivers/gpu/drm/i915/display/intel_cursor.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
#include "intel_psr_regs.h"
2525
#include "skl_watermark.h"
2626

27+
#include "gem/i915_gem_object.h"
28+
2729
/* Cursor formats */
2830
static const u32 intel_cursor_formats[] = {
2931
DRM_FORMAT_ARGB8888,
@@ -34,11 +36,11 @@ static u32 intel_cursor_base(const struct intel_plane_state *plane_state)
3436
struct drm_i915_private *dev_priv =
3537
to_i915(plane_state->uapi.plane->dev);
3638
const struct drm_framebuffer *fb = plane_state->hw.fb;
37-
const struct drm_i915_gem_object *obj = intel_fb_obj(fb);
39+
struct drm_i915_gem_object *obj = intel_fb_obj(fb);
3840
u32 base;
3941

4042
if (DISPLAY_INFO(dev_priv)->cursor_needs_physical)
41-
base = sg_dma_address(obj->mm.pages->sgl);
43+
base = i915_gem_object_get_dma_address(obj, 0);
4244
else
4345
base = intel_plane_ggtt_offset(plane_state);
4446

0 commit comments

Comments
 (0)