Re: [PATCH v1] drm/xe: Fix confusion with locals on context creation

Lis, Tomasz
2026-03-23T14:02:50Z

Thanks Raag.

As of now this fix is not yet in drm-tip.

Not a problem, as long as we will get it eventually.

-Tomasz

On 3/23/2026 5:12 AM, Raag Jadav wrote:
> On Fri, Mar 20, 2026 at 03:57:33PM +0100, Tomasz Lis wrote:
>> After setting a local variable, check that local value rather that
>> checking destination at which the value will be stored later.
>>
>> This fixes the obvious mistake in error path; without it,
>> allocation fail would lead to NULL dereference during context
>> creation.
>>
>> Fixes: 89340099c6a4 ("drm/xe/lrc: Refactor context init into xe_lrc_ctx_init()")
>> Signed-off-by: Tomasz Lis <tomasz.lis@intel.com>
>> Cc: Raag Jadav <raag.jadav@intel.com>
>> Cc: Matthew Brost <matthew.brost@intel.com>
> Already fixed[1], but not sure if it's landed yet.
>
> [1] https://lore.kernel.org/intel-xe/20260305184519.155060-1-shuicheng.lin@intel.com/
>
> Raag
>
>> ---
>> drivers/gpu/drm/xe/xe_lrc.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/xe/xe_lrc.c b/drivers/gpu/drm/xe/xe_lrc.c
>> index c5cfd8f75a94..77cd57788837 100644
>> --- a/drivers/gpu/drm/xe/xe_lrc.c
>> +++ b/drivers/gpu/drm/xe/xe_lrc.c
>> @@ -1607,8 +1607,8 @@ static int xe_lrc_init(struct xe_lrc *lrc, struct xe_hw_engine *hwe, struct xe_v
>> bo = xe_bo_create_pin_map_novm(xe, tile, bo_size,
>> ttm_bo_type_kernel,
>> bo_flags, false);
>> - if (IS_ERR(lrc->bo))
>> - return PTR_ERR(lrc->bo);
>> + if (IS_ERR(bo))
>> + return PTR_ERR(bo);
>>
>> lrc->bo = bo;
>>
>> --
>> 2.25.1
>>