Commit 5299c9cb authored by Caio Oliveira's avatar Caio Oliveira
Browse files

anv: skip bit6 swizzle detection in Gen8+



It is always false on Gen8+.  Also, move the variable definition near
its use.
Reviewed-by: Jordan Justen's avatarJordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Jason Ekstrand's avatarJason Ekstrand <jason@jlekstrand.net>
parent 60740ead
...@@ -419,8 +419,6 @@ anv_physical_device_init(struct anv_physical_device *device, ...@@ -419,8 +419,6 @@ anv_physical_device_init(struct anv_physical_device *device,
device->has_context_isolation = device->has_context_isolation =
anv_gem_get_param(fd, I915_PARAM_HAS_CONTEXT_ISOLATION); anv_gem_get_param(fd, I915_PARAM_HAS_CONTEXT_ISOLATION);
bool swizzled = anv_gem_get_bit6_swizzle(fd, I915_TILING_X);
/* Starting with Gen10, the timestamp frequency of the command streamer may /* Starting with Gen10, the timestamp frequency of the command streamer may
* vary from one part to another. We can query the value from the kernel. * vary from one part to another. We can query the value from the kernel.
*/ */
...@@ -473,6 +471,20 @@ anv_physical_device_init(struct anv_physical_device *device, ...@@ -473,6 +471,20 @@ anv_physical_device_init(struct anv_physical_device *device,
device->info.gen < 8 || !device->has_context_isolation; device->info.gen < 8 || !device->has_context_isolation;
device->compiler->supports_shader_constants = true; device->compiler->supports_shader_constants = true;
/* Broadwell PRM says:
*
* "Before Gen8, there was a historical configuration control field to
* swizzle address bit[6] for in X/Y tiling modes. This was set in three
* different places: TILECTL[1:0], ARB_MODE[5:4], and
* DISP_ARB_CTL[14:13].
*
* For Gen8 and subsequent generations, the swizzle fields are all
* reserved, and the CPU's memory controller performs all address
* swizzling modifications."
*/
bool swizzled =
device->info.gen < 8 && anv_gem_get_bit6_swizzle(fd, I915_TILING_X);
isl_device_init(&device->isl_dev, &device->info, swizzled); isl_device_init(&device->isl_dev, &device->info, swizzled);
result = anv_physical_device_init_uuids(device); result = anv_physical_device_init_uuids(device);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment