Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb8920f5 authored by Michal Wajdeczko's avatar Michal Wajdeczko Committed by Chris Wilson
Browse files

drm/i915: Fix pointer-to-int conversion 



Commit faf65486 ("drm/i915: Unify uC variable types to avoid
flooding checkpatch.pl") breaks 32-bit kernel builds. Lets use
cast helper to make compiler happy.

v2: introduce ptr_to_u64 (Chris)

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20171006130844.49012-1-michal.wajdeczko@intel.com


Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
parent ead92edb

drivers/gpu/drm/i915/i915_guc_submission.c

+2 −2
Original line number Diff line number Diff line
@@ -388,13 +388,13 @@ static void guc_stage_desc_init(struct intel_guc *guc, 
	gfx_addr = guc_ggtt_offset(client->vma);

	desc->db_trigger_phy = sg_dma_address(client->vma->pages->sgl) +

				client->doorbell_offset;

	desc->db_trigger_cpu = (u64)__get_doorbell(client);

	desc->db_trigger_cpu = ptr_to_u64(__get_doorbell(client));

	desc->db_trigger_uk = gfx_addr + client->doorbell_offset;

	desc->process_desc = gfx_addr + client->proc_desc_offset;

	desc->wq_addr = gfx_addr + GUC_DB_SIZE;

	desc->wq_size = GUC_WQ_SIZE;



	desc->desc_private = (u64)client;

	desc->desc_private = ptr_to_u64(client);

}



static void guc_stage_desc_fini(struct intel_guc *guc,

drivers/gpu/drm/i915/i915_utils.h

+5 −0
Original line number Diff line number Diff line
@@ -99,6 +99,11 @@ 
	__T;								\

})



static inline u64 ptr_to_u64(const void *ptr)

{

	return (uintptr_t)ptr;

}



#define u64_to_ptr(T, x) ({						\

	typecheck(u64, x);						\

	(T *)(uintptr_t)(x);						\