Commit 7054b551 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Maarten Lankhorst
Browse files

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: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231204134946.16219-1-maarten.lankhorst@linux.intel.com


Reviewed-by: default avatarJouni Högander <jouni.hogander@intel.com>
parent f270b708

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

+4 −2
Original line number Diff line number Diff line
@@ -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);