tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm/i915: move intel_hws_csb_write_index() out of i915_drv.h

Underscore prefix the index macros, and place
INTEL_HWS_CSB_WRITE_INDEX() as a macro next to them, to declutter
i915_drv.h.

v2: Don't underscore the index macros (Tvrtko)

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220209131143.3365230-1-jani.nikula@intel.com

Jani Nikula df62ae6f 98476876

+4 -10
+2
drivers/gpu/drm/i915/gt/intel_engine.h
··· 182 182 #define I915_HWS_CSB_BUF0_INDEX 0x10 183 183 #define I915_HWS_CSB_WRITE_INDEX 0x1f 184 184 #define ICL_HWS_CSB_WRITE_INDEX 0x2f 185 + #define INTEL_HWS_CSB_WRITE_INDEX(__i915) \ 186 + (GRAPHICS_VER(__i915) >= 11 ? ICL_HWS_CSB_WRITE_INDEX : I915_HWS_CSB_WRITE_INDEX) 185 187 186 188 void intel_engine_stop(struct intel_engine_cs *engine); 187 189 void intel_engine_cleanup(struct intel_engine_cs *engine);
+1 -1
drivers/gpu/drm/i915/gt/intel_execlists_submission.c
··· 3465 3465 (u64 *)&engine->status_page.addr[I915_HWS_CSB_BUF0_INDEX]; 3466 3466 3467 3467 execlists->csb_write = 3468 - &engine->status_page.addr[intel_hws_csb_write_index(i915)]; 3468 + &engine->status_page.addr[INTEL_HWS_CSB_WRITE_INDEX(i915)]; 3469 3469 3470 3470 if (GRAPHICS_VER(i915) < 11) 3471 3471 execlists->csb_size = GEN8_CSB_ENTRIES;
+1 -1
drivers/gpu/drm/i915/gvt/execlist.c
··· 163 163 hwsp_gpa + I915_HWS_CSB_BUF0_INDEX * 4 + write_pointer * 8, 164 164 status, 8); 165 165 intel_gvt_hypervisor_write_gpa(vgpu, 166 - hwsp_gpa + intel_hws_csb_write_index(execlist->engine->i915) * 4, 166 + hwsp_gpa + INTEL_HWS_CSB_WRITE_INDEX(execlist->engine->i915) * 4, 167 167 &write_pointer, 4); 168 168 } 169 169
-8
drivers/gpu/drm/i915/i915_drv.h
··· 1696 1696 return (struct intel_device_info *)INTEL_INFO(dev_priv); 1697 1697 } 1698 1698 1699 - static inline int intel_hws_csb_write_index(struct drm_i915_private *i915) 1700 - { 1701 - if (GRAPHICS_VER(i915) >= 11) 1702 - return ICL_HWS_CSB_WRITE_INDEX; 1703 - else 1704 - return I915_HWS_CSB_WRITE_INDEX; 1705 - } 1706 - 1707 1699 static inline enum i915_map_type 1708 1700 i915_coherent_map_type(struct drm_i915_private *i915, 1709 1701 struct drm_i915_gem_object *obj, bool always_coherent)