st/egl: s/kms/drm/ on the drm backend.

s/kms/drm/, s/kdpy/drmdpy/, and so forth.

1 files changed, 47 insertions, 47 deletions

diff --git a/src/gallium/state_trackers/egl/drm/native_drm.c b/src/gallium/state_trackers/egl/drm/native_drm.c
index 8ffdde66ba..f6dc558437 100644
--- a/src/gallium/state_trackers/egl/drm/native_drm.c
+++ b/src/gallium/state_trackers/egl/drm/native_drm.c
@@ -37,7 +37,7 @@
 #include "radeon/drm/radeon_drm.h"
 
 static boolean
-kms_display_is_format_supported(struct native_display *ndpy,
+drm_display_is_format_supported(struct native_display *ndpy,
                                 enum pipe_format fmt, boolean is_color)
 {
    return ndpy->screen->is_format_supported(ndpy->screen,
@@ -47,48 +47,48 @@ kms_display_is_format_supported(struct native_display *ndpy,
 }
 
 static const struct native_config **
-kms_display_get_configs(struct native_display *ndpy, int *num_configs)
+drm_display_get_configs(struct native_display *ndpy, int *num_configs)
 {
-   struct kms_display *kdpy = kms_display(ndpy);
+   struct drm_display *drmdpy = drm_display(ndpy);
    const struct native_config **configs;
 
    /* first time */
-   if (!kdpy->config) {
+   if (!drmdpy->config) {
       struct native_config *nconf;
       enum pipe_format format;
 
-      kdpy->config = CALLOC(1, sizeof(*kdpy->config));
-      if (!kdpy->config)
+      drmdpy->config = CALLOC(1, sizeof(*drmdpy->config));
+      if (!drmdpy->config)
          return NULL;
 
-      nconf = &kdpy->config->base;
+      nconf = &drmdpy->config->base;
 
       nconf->buffer_mask =
          (1 << NATIVE_ATTACHMENT_FRONT_LEFT) |
          (1 << NATIVE_ATTACHMENT_BACK_LEFT);
 
       format = PIPE_FORMAT_B8G8R8A8_UNORM;
-      if (!kms_display_is_format_supported(&kdpy->base, format, TRUE)) {
+      if (!drm_display_is_format_supported(&drmdpy->base, format, TRUE)) {
          format = PIPE_FORMAT_A8R8G8B8_UNORM;
-         if (!kms_display_is_format_supported(&kdpy->base, format, TRUE))
+         if (!drm_display_is_format_supported(&drmdpy->base, format, TRUE))
             format = PIPE_FORMAT_NONE;
       }
       if (format == PIPE_FORMAT_NONE) {
-         FREE(kdpy->config);
-         kdpy->config = NULL;
+         FREE(drmdpy->config);
+         drmdpy->config = NULL;
          return NULL;
       }
 
       nconf->color_format = format;
 
       /* support KMS */
-      if (kdpy->resources)
+      if (drmdpy->resources)
          nconf->scanout_bit = TRUE;
    }
 
    configs = MALLOC(sizeof(*configs));
    if (configs) {
-      configs[0] = &kdpy->config->base;
+      configs[0] = &drmdpy->config->base;
       if (num_configs)
          *num_configs = 1;
    }
@@ -97,7 +97,7 @@ kms_display_get_configs(struct native_display *ndpy, int *num_configs)
 }
 
 static int
-kms_display_get_param(struct native_display *ndpy,
+drm_display_get_param(struct native_display *ndpy,
                       enum native_param_type param)
 {
    int val;
@@ -112,22 +112,22 @@ kms_display_get_param(struct native_display *ndpy,
 }
 
 static void
-kms_display_destroy(struct native_display *ndpy)
+drm_display_destroy(struct native_display *ndpy)
 {
-   struct kms_display *kdpy = kms_display(ndpy);
+   struct drm_display *drmdpy = drm_display(ndpy);
 
-   if (kdpy->config)
-      FREE(kdpy->config);
+   if (drmdpy->config)
+      FREE(drmdpy->config);
 
-   kms_display_fini_modeset(&kdpy->base);
+   drm_display_fini_modeset(&drmdpy->base);
 
-   if (kdpy->base.screen)
-      kdpy->base.screen->destroy(kdpy->base.screen);
+   if (drmdpy->base.screen)
+      drmdpy->base.screen->destroy(drmdpy->base.screen);
 
-   if (kdpy->fd >= 0)
-      close(kdpy->fd);
+   if (drmdpy->fd >= 0)
+      close(drmdpy->fd);
 
-   FREE(kdpy);
+   FREE(drmdpy);
 }
 
 static const char *
@@ -155,26 +155,26 @@ get_drm_screen_name(int fd, drmVersionPtr version)
  * Initialize KMS and pipe screen.
  */
 static boolean
-kms_display_init_screen(struct native_display *ndpy)
+drm_display_init_screen(struct native_display *ndpy)
 {
-   struct kms_display *kdpy = kms_display(ndpy);
+   struct drm_display *drmdpy = drm_display(ndpy);
    drmVersionPtr version;
    const char *name;
 
-   version = drmGetVersion(kdpy->fd);
+   version = drmGetVersion(drmdpy->fd);
    if (!version) {
-      _eglLog(_EGL_WARNING, "invalid fd %d", kdpy->fd);
+      _eglLog(_EGL_WARNING, "invalid fd %d", drmdpy->fd);
       return FALSE;
    }
 
-   name = get_drm_screen_name(kdpy->fd, version);
+   name = get_drm_screen_name(drmdpy->fd, version);
    if (name) {
-      kdpy->base.screen =
-         kdpy->event_handler->new_drm_screen(&kdpy->base, name, kdpy->fd);
+      drmdpy->base.screen =
+         drmdpy->event_handler->new_drm_screen(&drmdpy->base, name, drmdpy->fd);
    }
    drmFreeVersion(version);
 
-   if (!kdpy->base.screen) {
+   if (!drmdpy->base.screen) {
       _eglLog(_EGL_WARNING, "failed to create DRM screen");
       return FALSE;
    }
@@ -183,31 +183,31 @@ kms_display_init_screen(struct native_display *ndpy)
 }
 
 static struct native_display *
-kms_create_display(int fd, struct native_event_handler *event_handler,
+drm_create_display(int fd, struct native_event_handler *event_handler,
                    void *user_data)
 {
-   struct kms_display *kdpy;
+   struct drm_display *drmdpy;
 
-   kdpy = CALLOC_STRUCT(kms_display);
-   if (!kdpy)
+   drmdpy = CALLOC_STRUCT(drm_display);
+   if (!drmdpy)
       return NULL;
 
-   kdpy->fd = fd;
-   kdpy->event_handler = event_handler;
-   kdpy->base.user_data = user_data;
+   drmdpy->fd = fd;
+   drmdpy->event_handler = event_handler;
+   drmdpy->base.user_data = user_data;
 
-   if (!kms_display_init_screen(&kdpy->base)) {
-      kms_display_destroy(&kdpy->base);
+   if (!drm_display_init_screen(&drmdpy->base)) {
+      drm_display_destroy(&drmdpy->base);
       return NULL;
    }
 
-   kdpy->base.destroy = kms_display_destroy;
-   kdpy->base.get_param = kms_display_get_param;
-   kdpy->base.get_configs = kms_display_get_configs;
+   drmdpy->base.destroy = drm_display_destroy;
+   drmdpy->base.get_param = drm_display_get_param;
+   drmdpy->base.get_configs = drm_display_get_configs;
 
-   kms_display_init_modeset(&kdpy->base);
+   drm_display_init_modeset(&drmdpy->base);
 
-   return &kdpy->base;
+   return &drmdpy->base;
 }
 
 static struct native_display *
@@ -225,7 +225,7 @@ native_create_display(void *dpy, struct native_event_handler *event_handler,
    if (fd < 0)
       return NULL;
 
-   return kms_create_display(fd, event_handler, user_data);
+   return drm_create_display(fd, event_handler, user_data);
 }
 
 static const struct native_platform drm_platform = {