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

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

drm/i915: Make PAT macros more robust 



Macro params shall be wrapped into () to avoid unexpected results.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170908161130.22424-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 a2d3d265

drivers/gpu/drm/i915/i915_gem_gtt.h

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ typedef u64 gen8_ppgtt_pml4e_t; 
#define PPAT_DISPLAY_ELLC_INDEX		_PAGE_PCD /* WT eLLC */



#define CHV_PPAT_SNOOP			(1<<6)

#define GEN8_PPAT_AGE(x)		(x<<4)

#define GEN8_PPAT_AGE(x)		((x)<<4)

#define GEN8_PPAT_LLCeLLC		(3<<2)

#define GEN8_PPAT_LLCELLC		(2<<2)

#define GEN8_PPAT_LLC			(1<<2)

drivers/gpu/drm/i915/i915_reg.h

+1 −1
Original line number Diff line number Diff line
@@ -2336,7 +2336,7 @@ enum i915_power_well_id { 
#define DONE_REG		_MMIO(0x40b0)

#define GEN8_PRIVATE_PAT_LO	_MMIO(0x40e0)

#define GEN8_PRIVATE_PAT_HI	_MMIO(0x40e0 + 4)

#define GEN10_PAT_INDEX(index)	_MMIO(0x40e0 + index*4)

#define GEN10_PAT_INDEX(index)	_MMIO(0x40e0 + (index)*4)

#define BSD_HWS_PGA_GEN7	_MMIO(0x04180)

#define BLT_HWS_PGA_GEN7	_MMIO(0x04280)

#define VEBOX_HWS_PGA_GEN7	_MMIO(0x04380)