From 1ccb3c79a84455cf05de5d6207e7576047d7db51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <maraeo@gmail.com>
Date: Thu, 7 May 2026 11:41:44 -0400
Subject: [PATCH] winsys/amdgpu: revert invalid changes from CS functions

It may have been accidentally left in the code.

If there is any doubt about this, then the reason is the same
as accepting screen=NULL in context_create or any other function.
---
 src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp | 14 +++++---------
 src/gallium/winsys/amdgpu/drm/amdgpu_cs.h   |  5 +----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp
index b513647502d..5c64ada7371 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.cpp
@@ -254,8 +254,9 @@ amdgpu_cs_get_next_fence(struct radeon_cmdbuf *rcs)
 {
    struct amdgpu_cs *acs = amdgpu_cs(rcs);
    struct pipe_fence_handle *fence = NULL;
+   assert(acs);
 
-   if (!acs || acs->noop)
+   if (acs->noop)
       return NULL;
 
    if (acs->next_fence) {
@@ -665,8 +666,6 @@ static unsigned amdgpu_cs_add_buffer(struct radeon_cmdbuf *rcs,
     */
    struct amdgpu_cs *acs = amdgpu_cs(rcs);
    assert(acs);
-   if (!acs)
-      return 0;
 
    struct amdgpu_cs_context *csc = amdgpu_csc_get_current(acs);
    struct amdgpu_winsys_bo *bo = (struct amdgpu_winsys_bo*)buf;
@@ -815,7 +814,7 @@ static void amdgpu_set_ib_size(struct radeon_cmdbuf *rcs, struct amdgpu_ib *ib)
       *ib->ptr_ib_size = rcs->current.cdw | S_3F3_CHAIN(1) | S_3F3_VALID(1);
 
       struct amdgpu_cs *acs = amdgpu_cs(rcs);
-      if (acs && !rcs->gang && acs->preamble_ib_bo)
+      if (!rcs->gang && acs->preamble_ib_bo)
          *ib->ptr_ib_size |= S_3F3_PRE_ENA(1);
    } else {
       *ib->ptr_ib_size = rcs->current.cdw;
@@ -902,7 +901,7 @@ static enum amd_ip_type amdgpu_cs_get_ip_type(struct radeon_cmdbuf *rcs)
 {
    struct amdgpu_cs *acs = amdgpu_cs(rcs);
    assert(acs);
-   return (rcs->gang || !acs) ? AMD_IP_COMPUTE : acs->ip_type;
+   return rcs->gang ? AMD_IP_COMPUTE : acs->ip_type;
 }
 
 static bool ip_uses_alt_fence(enum amd_ip_type ip_type)
@@ -1035,8 +1034,6 @@ amdgpu_cs_setup_preemption(struct radeon_cmdbuf *rcs, const uint32_t *preamble_i
    uint32_t *map;
 
    assert(acs);
-   if (!acs)
-      return false;
    aws = acs->aws;
    size = align(preamble_num_dw * 4, aws->info.ip[AMD_IP_GFX].ib_alignment);
 
@@ -2420,8 +2417,7 @@ static bool amdgpu_cs_create_compute_gang(struct radeon_cmdbuf *rcs)
 {
    struct amdgpu_cs *acs = amdgpu_cs(rcs);
    struct radeon_cmdbuf *gang;
-   if (!acs)
-      return false;
+   assert(acs);
 
    gang = CALLOC_STRUCT(radeon_cmdbuf);
    if (!gang)
diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h
index 56485f75ede..1d5fe96d7f3 100644
--- a/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h
+++ b/src/gallium/winsys/amdgpu/drm/amdgpu_cs.h
@@ -249,7 +249,6 @@ amdgpu_lookup_buffer_any_type(struct amdgpu_cs_context *csc, struct amdgpu_winsy
 static inline struct amdgpu_cs *
 amdgpu_cs(struct radeon_cmdbuf *rcs)
 {
-   /* acs can be NULL if rcs wasn't initialized. */
    struct amdgpu_cs *acs = (struct amdgpu_cs*)rcs->priv;
    return acs;
 }
@@ -277,9 +276,7 @@ amdgpu_bo_is_referenced_by_cs_with_usage(struct amdgpu_cs *acs,
                                          unsigned usage)
 {
    struct amdgpu_cs_buffer *buffer;
-
-   if (!acs)
-      return false;
+   assert(acs);
 
    buffer = amdgpu_lookup_buffer_any_type(amdgpu_csc_get_current(acs), bo);