radeonsi: clean up winsys creation

- unify the code
- choose radeon or amdgpu based on the DRM version, not based on which one
  succeeds first

1 files changed, 2 insertions, 11 deletions

diff --git a/src/gallium/auxiliary/target-helpers/drm_helper.h b/src/gallium/auxiliary/target-helpers/drm_helper.h
index ac891d1d307..6bdd1a008db 100644
--- a/src/gallium/auxiliary/target-helpers/drm_helper.h
+++ b/src/gallium/auxiliary/target-helpers/drm_helper.h
@@ -161,23 +161,14 @@ pipe_r600_create_screen(int fd, const struct pipe_screen_config *config)
 #endif
 
 #ifdef GALLIUM_RADEONSI
-#include "radeon/radeon_winsys.h"
-#include "radeon/drm/radeon_drm_public.h"
-#include "amdgpu/drm/amdgpu_public.h"
 #include "radeonsi/si_public.h"
 
 struct pipe_screen *
 pipe_radeonsi_create_screen(int fd, const struct pipe_screen_config *config)
 {
-   struct radeon_winsys *rw;
-
-   /* First, try amdgpu. */
-   rw = amdgpu_winsys_create(fd, config, radeonsi_screen_create);
+   struct pipe_screen *screen = radeonsi_screen_create(fd, config);
 
-   if (!rw)
-      rw = radeon_drm_winsys_create(fd, config, radeonsi_screen_create);
-
-   return rw ? debug_screen_wrap(rw->screen) : NULL;
+   return screen ? debug_screen_wrap(screen) : NULL;
 }
 
 const char *radeonsi_driconf_xml =