Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

drm/i915: Make PAT macros more robust

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

Signed-off-by: Michal 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: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Michal Wajdeczko 8 years ago
parent
a2d3d2655e
commit
1790625b1d
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      drivers/gpu/drm/i915/i915_gem_gtt.h
  2. 1 1
      drivers/gpu/drm/i915/i915_reg.h

+ 1 - 1
drivers/gpu/drm/i915/i915_gem_gtt.h
View File 

@@ -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)

+ 1 - 1
drivers/gpu/drm/i915/i915_reg.h
View File 

@@ -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)