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

Commit 38fb6a40 authored by Damien Lespiau's avatar Damien Lespiau Committed by Daniel Vetter
Browse files

drm/i915: Hide the per forcewake-engine register ranges 



These defines are only used in intel_uncore.c.

Signed-off-by: default avatarDamien Lespiau <damien.lespiau@intel.com>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent b88b23d9

drivers/gpu/drm/i915/i915_drv.h

+0 −11
Original line number Diff line number Diff line
@@ -2538,17 +2538,6 @@ void vlv_flisdsi_write(struct drm_i915_private *dev_priv, u32 reg, u32 val); 
int vlv_gpu_freq(struct drm_i915_private *dev_priv, int val);

int vlv_freq_opcode(struct drm_i915_private *dev_priv, int val);



#define FORCEWAKE_VLV_RENDER_RANGE_OFFSET(reg) \

	(((reg) >= 0x2000 && (reg) < 0x4000) ||\

	((reg) >= 0x5000 && (reg) < 0x8000) ||\

	((reg) >= 0xB000 && (reg) < 0x12000) ||\

	((reg) >= 0x2E000 && (reg) < 0x30000))



#define FORCEWAKE_VLV_MEDIA_RANGE_OFFSET(reg)\

	(((reg) >= 0x12000 && (reg) < 0x14000) ||\

	((reg) >= 0x22000 && (reg) < 0x24000) ||\

	((reg) >= 0x30000 && (reg) < 0x40000))



#define FORCEWAKE_RENDER	(1 << 0)

#define FORCEWAKE_MEDIA		(1 << 1)

#define FORCEWAKE_ALL		(FORCEWAKE_RENDER | FORCEWAKE_MEDIA)

drivers/gpu/drm/i915/intel_uncore.c

+11 −0
Original line number Diff line number Diff line
@@ -484,6 +484,17 @@ void assert_force_wake_inactive(struct drm_i915_private *dev_priv) 
#define NEEDS_FORCE_WAKE(dev_priv, reg) \

	 ((reg) < 0x40000 && (reg) != FORCEWAKE)



#define FORCEWAKE_VLV_RENDER_RANGE_OFFSET(reg) \

	(((reg) >= 0x2000 && (reg) < 0x4000) ||\

	((reg) >= 0x5000 && (reg) < 0x8000) ||\

	((reg) >= 0xB000 && (reg) < 0x12000) ||\

	((reg) >= 0x2E000 && (reg) < 0x30000))



#define FORCEWAKE_VLV_MEDIA_RANGE_OFFSET(reg)\

	(((reg) >= 0x12000 && (reg) < 0x14000) ||\

	((reg) >= 0x22000 && (reg) < 0x24000) ||\

	((reg) >= 0x30000 && (reg) < 0x40000))



static void

ilk_dummy_write(struct drm_i915_private *dev_priv)

{