[Mesa-dev] [PATCH 1/3] ilo: EOL unplumb unmaintained gallium drv from winsys

[Chia-I Wu]

All three are

Acked-by:Chia-I Wu <olvaffe at gmail.com>

On Thu, Feb 2, 2017 at 12:15 AM, Edward O'Callaghan
<funfunctor at folklore1984.net> wrote:
> This is no longer actively maintained and is just
> accumulating bitrot.
>
> Signed-off-by: Edward O'Callaghan <funfunctor at folklore1984.net>
> ---
>  .../auxiliary/pipe-loader/pipe_loader_drm.c        |  5 ---
>  src/gallium/auxiliary/target-helpers/drm_helper.h  | 29 -------------
>  src/gallium/targets/dri/target.c                   |  3 --
>  src/gallium/targets/pipe-loader/pipe_i965.c        | 47 ----------------------
>  src/gallium/winsys/intel/drm/intel_drm_winsys.c    |  1 -
>  5 files changed, 85 deletions(-)
>  delete mode 100644 src/gallium/targets/pipe-loader/pipe_i965.c
>
> diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
> index 6c89fe5..09549e5 100644
> --- a/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
> +++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
> @@ -105,11 +105,6 @@ static const struct drm_driver_descriptor driver_descriptors[] = {
>      },
>  #endif
>      {
> -        .driver_name = "i965",
> -        .create_screen = pipe_ilo_create_screen,
> -        .configuration = configuration_query,
> -    },
> -    {
>          .driver_name = "nouveau",
>          .create_screen = pipe_nouveau_create_screen,
>          .configuration = configuration_query,
> diff --git a/src/gallium/auxiliary/target-helpers/drm_helper.h b/src/gallium/auxiliary/target-helpers/drm_helper.h
> index f847b17..3159df6 100644
> --- a/src/gallium/auxiliary/target-helpers/drm_helper.h
> +++ b/src/gallium/auxiliary/target-helpers/drm_helper.h
> @@ -34,35 +34,6 @@ pipe_i915_create_screen(int fd)
>
>  #endif
>
> -#ifdef GALLIUM_ILO
> -#include "intel/drm/intel_drm_public.h"
> -#include "ilo/ilo_public.h"
> -
> -struct pipe_screen *
> -pipe_ilo_create_screen(int fd)
> -{
> -   struct intel_winsys *iws;
> -   struct pipe_screen *screen;
> -
> -   iws = intel_winsys_create_for_fd(fd);
> -   if (!iws)
> -      return NULL;
> -
> -   screen = ilo_screen_create(iws);
> -   return screen ? debug_screen_wrap(screen) : NULL;
> -}
> -
> -#else
> -
> -struct pipe_screen *
> -pipe_ilo_create_screen(int fd)
> -{
> -   fprintf(stderr, "ilo: driver missing\n");
> -   return NULL;
> -}
> -
> -#endif
> -
>  #ifdef GALLIUM_NOUVEAU
>  #include "nouveau/drm/nouveau_drm_public.h"
>
> diff --git a/src/gallium/targets/dri/target.c b/src/gallium/targets/dri/target.c
> index 441a27f..dba18cc 100644
> --- a/src/gallium/targets/dri/target.c
> +++ b/src/gallium/targets/dri/target.c
> @@ -151,9 +151,6 @@ const __DRIextension **__driDriverGetExtensions_i965(void);
>   * i965 driver so that you can just make a directory with a link from
>   * i965_dri.so to the built vc4_dri.so, and point LIBGL_DRIVERS_PATH to that
>   * on your i965-using host to run the driver under simulation.
> - *
> - * This is, of course, incompatible with building with the ilo driver, but you
> - * shouldn't be building that anyway.
>   */
>  PUBLIC const __DRIextension **__driDriverGetExtensions_i965(void)
>  {
> diff --git a/src/gallium/targets/pipe-loader/pipe_i965.c b/src/gallium/targets/pipe-loader/pipe_i965.c
> deleted file mode 100644
> index a2d8deb..0000000
> --- a/src/gallium/targets/pipe-loader/pipe_i965.c
> +++ /dev/null
> @@ -1,47 +0,0 @@
> -#include "target-helpers/inline_debug_helper.h"
> -#include "state_tracker/drm_driver.h"
> -#include "intel/drm/intel_drm_public.h"
> -#include "ilo/ilo_public.h"
> -
> -static struct pipe_screen *
> -create_screen(int fd)
> -{
> -   struct intel_winsys *iws;
> -   struct pipe_screen *screen;
> -
> -   iws = intel_winsys_create_for_fd(fd);
> -   if (!iws)
> -      return NULL;
> -
> -   screen = ilo_screen_create(iws);
> -   if (!screen)
> -      return NULL;
> -
> -   screen = debug_screen_wrap(screen);
> -
> -   return screen;
> -}
> -static const struct drm_conf_ret throttle_ret = {
> -   .type = DRM_CONF_INT,
> -   .val.val_int = 2,
> -};
> -
> -static const struct drm_conf_ret share_fd_ret = {
> -   .type = DRM_CONF_BOOL,
> -   .val.val_int = true,
> -};
> -
> -static const struct drm_conf_ret *drm_configuration(enum drm_conf conf)
> -{
> -   switch (conf) {
> -   case DRM_CONF_THROTTLE:
> -      return &throttle_ret;
> -   case DRM_CONF_SHARE_FD:
> -      return &share_fd_ret;
> -   default:
> -      break;
> -   }
> -   return NULL;
> -}
> -PUBLIC
> -DRM_DRIVER_DESCRIPTOR("i965", create_screen, drm_configuration)
> diff --git a/src/gallium/winsys/intel/drm/intel_drm_winsys.c b/src/gallium/winsys/intel/drm/intel_drm_winsys.c
> index d3bc430..63c5c8b 100644
> --- a/src/gallium/winsys/intel/drm/intel_drm_winsys.c
> +++ b/src/gallium/winsys/intel/drm/intel_drm_winsys.c
> @@ -41,7 +41,6 @@
>  #include "util/u_inlines.h"
>  #include "util/u_memory.h"
>  #include "util/u_debug.h"
> -#include "ilo/core/intel_winsys.h"
>  #include "intel_drm_public.h"
>
>  struct intel_winsys {
> --
> 2.9.3
>