[Intel-gfx] [PATCH 2/2] drm/i915/gen8: Flip the 48b switch

[Michel Thierry]

On 10/1/2015 2:16 PM, Daniel Vetter wrote:
> On Wed, Sep 30, 2015 at 03:36:19PM +0100, Michel Thierry wrote:
>> Use 48b addresses if hw supports it (i915.enable_ppgtt=3).
>> Update the sanitize_enable_ppgtt for 48 bit PPGTT mode.
>>
>> Note, aliasing PPGTT remains 32b only.
>>
>> v2: s/full_64b/full_48b/. (Akash)
>> v3: Add sanitize_enable_ppgtt changes until here. (Akash)
>> v4: Update param description (Chris)
>>
>> Cc: Akash Goel <akash.goel at intel.com>
>> Cc: Chris Wilson <chris at chris-wilson.co.uk>
>> Signed-off-by: Michel Thierry <michel.thierry at intel.com>
>
> Queued for -next, thanks for the patch. Can you please ping someone from
> mesa to push the libdrm/mesa patches too?
>
> Cheers, Daniel
>

Sorry I didn't report this earlier, but I just realized I can't find 
this patch in the tree.

There's still the discussion of where to apply the 32-bit workaround and 
the different behavior seen in mesa (not if it isn't needed)... but the 
code was written to not require that flag in order to start using the 
4-level page translation.

Thanks,

-Michel

>> ---
>>   drivers/gpu/drm/i915/i915_gem_gtt.c | 7 ++++++-
>>   drivers/gpu/drm/i915/i915_params.c  | 2 +-
>>   2 files changed, 7 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
>> index 47344d0..2d964a7 100644
>> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
>> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
>> @@ -104,9 +104,11 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)
>>   {
>>   	bool has_aliasing_ppgtt;
>>   	bool has_full_ppgtt;
>> +	bool has_full_48bit_ppgtt;
>>
>>   	has_aliasing_ppgtt = INTEL_INFO(dev)->gen >= 6;
>>   	has_full_ppgtt = INTEL_INFO(dev)->gen >= 7;
>> +	has_full_48bit_ppgtt = IS_BROADWELL(dev) || INTEL_INFO(dev)->gen >= 9;
>>
>>   	if (intel_vgpu_active(dev))
>>   		has_full_ppgtt = false; /* emulation is too hard */
>> @@ -125,6 +127,9 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)
>>   	if (enable_ppgtt == 2 && has_full_ppgtt)
>>   		return 2;
>>
>> +	if (enable_ppgtt == 3 && has_full_48bit_ppgtt)
>> +		return 3;
>> +
>>   #ifdef CONFIG_INTEL_IOMMU
>>   	/* Disable ppgtt on SNB if VT-d is on. */
>>   	if (INTEL_INFO(dev)->gen == 6 && intel_iommu_gfx_mapped) {
>> @@ -141,7 +146,7 @@ static int sanitize_enable_ppgtt(struct drm_device *dev, int enable_ppgtt)
>>   	}
>>
>>   	if (INTEL_INFO(dev)->gen >= 8 && i915.enable_execlists)
>> -		return 2;
>> +		return has_full_48bit_ppgtt ? 3 : 2;
>>   	else
>>   		return has_aliasing_ppgtt ? 1 : 0;
>>   }
>> diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c
>> index ca9b8f6..368df67 100644
>> --- a/drivers/gpu/drm/i915/i915_params.c
>> +++ b/drivers/gpu/drm/i915/i915_params.c
>> @@ -111,7 +111,7 @@ MODULE_PARM_DESC(enable_hangcheck,
>>   module_param_named_unsafe(enable_ppgtt, i915.enable_ppgtt, int, 0400);
>>   MODULE_PARM_DESC(enable_ppgtt,
>>   	"Override PPGTT usage. "
>> -	"(-1=auto [default], 0=disabled, 1=aliasing, 2=full)");
>> +	"(-1=auto [default], 0=disabled, 1=aliasing, 2=full, 3=full with extended address space)");
>>
>>   module_param_named_unsafe(enable_execlists, i915.enable_execlists, int, 0400);
>>   MODULE_PARM_DESC(enable_execlists,
>> --
>> 2.6.0
>>
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>