From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4D3823E92BB for ; Thu, 25 Jun 2026 17:08:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782407324; cv=none; b=KDM+awklGc7wIegWoLkRfLcrPEJamHFCrxWkzP5GczVumcDMTBcrZxhcPWQeE+Xr9nVABAvDUqDrrbuyGJuQwbYfSlW+R70AYgvgGCmSzTB8mBAyN9MNMI6fq7a1NVjRKjxhUJTD/YJPSih7YIRMTJyLVKhTEmDfdk9tgh21Jio= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782407324; c=relaxed/simple; bh=nmtoyZopcrvDa9Je5mQkIAnzsF4/HXum8f9yf35NCkQ=; h=Date:Mime-Version:Message-ID:Subject:From:To:Cc:Content-Type; b=AFmPwGRwsAjWaKhY7uCWQ5AWQ58uPsmxDniewQejHomfKTg46s7iLtm2z7dUnHM9IZqZVXnz/Uv0LW8TbU3vW/sifzwYsZKl7Wrj15vtveR/cUYeVVN7jVr5ReUSqH9HVGLqsVHz9no1YIzGm2QO9PZ3baBmLs7z8NIvSG0v5SU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--natsu.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=dJ/rUgzm; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--natsu.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="dJ/rUgzm" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-37c9d82cd57so57642a91.1 for ; Thu, 25 Jun 2026 10:08:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1782407322; x=1783012122; darn=vger.kernel.org; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=lga7Yq072G4mYoR4ZYRzQRKAQbvBlbeEWBDVrXci4B0=; b=dJ/rUgzmiEh4iECYWW37L7WV5fm0lOfDfrx+EHm8bEfjXOyU7VERlItyIt9zD7Ocgn Yj6FNbyjcOI/kNUyp9U6gd3lI8cCInOyUvREPQtZrkb9y+D0MuM7VFA4BGlmA0g2ySij Qn0zaofhACXkykIaimuQJ48P1Asar9hf55GbFrHxJ6kC4+L7D0Gclvo9FlehKHR70Cy8 0Ahl2ufV8hakRiEdV41x1sSoJ5wyFvdq85ovRFpAuTHsKWRqjwRysa/DGv3805myyuFQ mPu5wsVRh2DwTSqn58cyj5dsmnqxA+wStckHpnu05xBr2UWs2yTvmXbZcxxyteviPnnY 5C2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782407322; x=1783012122; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=lga7Yq072G4mYoR4ZYRzQRKAQbvBlbeEWBDVrXci4B0=; b=jSn20HDVkFCSrPqibZ8f/B0NJbll3u6crHbAIftBI2JdoY2sQ/z/sLlYCeLnlVr9s+ PjI3NiWWr97cWiOg5f3awejaJwVegQUI8jS8PjVBWyIY/mLKGpyErJQJFMOJ8wkijjrK Qld7OlvKs16dxxe4z8Q45B6WobGwsD4FruSMHz3V3Eyqcx2CK5oE7DMCFTq4xr3Jksgs 0VygVshW3IBG25QhBsBdCmTXNk940edom5ETabHm2gj24UO7RcwsfZgPgpMrEvAZbjxP 05BDQooqxCBQFGS3e5MdMlvLUp2rpaOC11ygVkfxDxMXf+e+Vi/13VccWgE9ptXYwltr bHOw== X-Forwarded-Encrypted: i=1; AHgh+RqnxL4o0cX/9/8XEd0yrSTrsnkMjOj5i8qHV9m275UNrlAUXyY3n+e/AnhX1+UCSwJou6xp16SxkZag7CA=@vger.kernel.org X-Gm-Message-State: AOJu0YzLLKlwG+l6UkZLvBR8aelsM/KgkyYcQTONhRSv9CuBCwXamSfh A2YtBwJOzUhHOhN4br334EorT7nMoAeixGc2JT6TlKYXqgs40X06N4MDje3J7FPNxGtgaDkIMoC 7CQ== X-Received: from pgbn20.prod.google.com ([2002:a63:5914:0:b0:c8b:1d37:c0f6]) (user=natsu job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:180b:b0:36d:ee3b:fcae with SMTP id 98e67ed59e1d1-37dfa1b664cmr3246028a91.6.1782407322191; Thu, 25 Jun 2026 10:08:42 -0700 (PDT) Date: Thu, 25 Jun 2026 10:08:28 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 X-Mailer: git-send-email 2.55.0.rc0.799.gd6f94ed593-goog Message-ID: <20260625170828.3335431-1-natsu@google.com> Subject: [PATCH] drm/virtio: Don't detach GEM from a non-created context From: Jason Macnak To: David Airlie , Gerd Hoffmann , Dmitry Osipenko , Gurchetan Singh Cc: dri-devel@lists.freedesktop.org, virtualization@lists.linux.dev, linux-kernel@vger.kernel.org, Jason Macnak , stable@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Applies the same treatment as commit 7cf6dd467e87 ("drm/virtio: Don't attach GEM to a non-created context in gem_object_open()") to virtio_gpu_gem_object_close() to avoid trying to detach a resource that was never attached due to a context never being created when context_init is supported. Fixes: 086b9f27f0ab ("drm/virtio: Don't create a context with default param if context_init is supported") Cc: # v6.14+ Signed-off-by: Jason Macnak --- drivers/gpu/drm/virtio/virtgpu_gem.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_gem.c b/drivers/gpu/drm/virtio/virtgpu_gem.c index 435d37d36034..66c3f6f74e9c 100644 --- a/drivers/gpu/drm/virtio/virtgpu_gem.c +++ b/drivers/gpu/drm/virtio/virtgpu_gem.c @@ -139,13 +139,15 @@ void virtio_gpu_gem_object_close(struct drm_gem_object *obj, if (!vgdev->has_virgl_3d) return; - objs = virtio_gpu_array_alloc(1); - if (!objs) - return; - virtio_gpu_array_add_obj(objs, obj); + if (vfpriv->context_created) { + objs = virtio_gpu_array_alloc(1); + if (!objs) + return; + virtio_gpu_array_add_obj(objs, obj); - virtio_gpu_cmd_context_detach_resource(vgdev, vfpriv->ctx_id, - objs); + virtio_gpu_cmd_context_detach_resource(vgdev, vfpriv->ctx_id, + objs); + } virtio_gpu_notify(vgdev); } -- 2.55.0.rc0.799.gd6f94ed593-goog