Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18;
Message-ID: <2f71160e-01cc-40a5-4661-b998b3acd153@collabora.com>
Date:   Thu, 14 Apr 2022 18:29:03 +0100
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.7.0
Subject: Re: [PATCH v3 5/5] drm/i915: stolen memory use ttm backend
Content-Language: en-US
To:     =?UTF-8?Q?Thomas_Hellstr=c3=b6m?= 
        <thomas.hellstrom@linux.intel.com>,
        dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org,
        Jani Nikula <jani.nikula@linux.intel.com>,
        Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
        Rodrigo Vivi <rodrigo.vivi@intel.com>,
        Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>,
        David Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel@ffwll.ch>
Cc:     Matthew Auld <matthew.auld@intel.com>, linux-kernel@vger.kernel.org
References: <20220412193817.2098308-1-bob.beckett@collabora.com>
 <20220412193817.2098308-6-bob.beckett@collabora.com>
 <94ddf51a-90ae-dee8-5d6a-45ee2cd1e584@linux.intel.com>
From:   Robert Beckett <bob.beckett@collabora.com>
In-Reply-To: <94ddf51a-90ae-dee8-5d6a-45ee2cd1e584@linux.intel.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Precedence: bulk


On 14/04/2022 15:41, Thomas Hellström wrote:
> Hi,
> 
> 
> On 4/12/22 21:38, Robert Beckett wrote:
>> +struct ttm_resource *
>> +i915_gem_stolen_reserve_range(struct drm_i915_private *i915,
>> +                  resource_size_t size,
>> +                  u64 start, u64 end)
>>   {
>> -    int ret;
>> +    struct intel_memory_region *mem = i915->mm.stolen_region;
>> -    if (!drm_mm_initialized(&i915->mm.stolen))
>> -        return -ENODEV;
>> -
>> -    /* WaSkipStolenMemoryFirstPage:bdw+ */
>> -    if (GRAPHICS_VER(i915) >= 8 && start < 4096)
>> -        start = 4096;
> 
> Did we lose this Workaround?

woops, looks like we did. Nice catch.
I'll add a reservation at start of day if wa is needed when I issue v4.

> 
> Need to continue reviewing this patchnext week.
> 
> 
> Thx,
> 
> Thomas
> 
> 
> 
> 
>> -
>> -    mutex_lock(&i915->mm.stolen_lock);
>> -    ret = drm_mm_insert_node_in_range(&i915->mm.stolen, node,
>> -                      size, alignment, 0,
>> -                      start, end, DRM_MM_INSERT_BEST);
>> -    mutex_unlock(&i915->mm.stolen_lock);
>> +    if (!mem)
>> +        return ERR_PTR(-ENODEV);
>> +    return intel_region_ttm_resource_alloc(mem, size, start, end, 
>> I915_BO_ALLOC_CONTIGUOUS);
>> +}
>> -