gallium/radeon: inline the r600_rings structure
[mesa.git] / src / gallium / drivers / r600 / r600_pipe.c
index e7d586223fd1f77a5e7f47f67ef3d9cab2ac4252..bd00dcb642c53045e504f29eeba376c5e8b3bbe8 100644 (file)
@@ -30,7 +30,6 @@
 
 #include <errno.h>
 #include "pipe/p_shader_tokens.h"
-#include "util/u_blitter.h"
 #include "util/u_debug.h"
 #include "util/u_memory.h"
 #include "util/u_simple_shaders.h"
 #include "util/u_math.h"
 #include "vl/vl_decoder.h"
 #include "vl/vl_video_buffer.h"
+#include "radeon/radeon_video.h"
 #include "radeon/radeon_uvd.h"
 #include "os/os_time.h"
 
 static const struct debug_named_value r600_debug_options[] = {
        /* features */
 #if defined(R600_USE_LLVM)
-       { "nollvm", DBG_NO_LLVM, "Disable the LLVM shader compiler" },
+       { "llvm", DBG_LLVM, "Enable the LLVM shader compiler" },
 #endif
        { "nocpdma", DBG_NO_CP_DMA, "Disable CP DMA" },
-       { "nodma", DBG_NO_ASYNC_DMA, "Disable asynchronous DMA" },
 
        /* shader backend */
        { "nosb", DBG_NO_SB, "Disable sb backend for graphics shaders" },
@@ -66,88 +65,6 @@ static const struct debug_named_value r600_debug_options[] = {
  * pipe_context
  */
 
-static void r600_flush(struct pipe_context *ctx, unsigned flags)
-{
-       struct r600_context *rctx = (struct r600_context *)ctx;
-       struct pipe_query *render_cond = NULL;
-       unsigned render_cond_mode = 0;
-       boolean render_cond_cond = FALSE;
-
-       if (rctx->b.rings.gfx.cs->cdw == rctx->initial_gfx_cs_size)
-               return;
-
-       rctx->b.rings.gfx.flushing = true;
-       /* Disable render condition. */
-       if (rctx->current_render_cond) {
-               render_cond = rctx->current_render_cond;
-               render_cond_cond = rctx->current_render_cond_cond;
-               render_cond_mode = rctx->current_render_cond_mode;
-               ctx->render_condition(ctx, NULL, FALSE, 0);
-       }
-
-       r600_context_flush(rctx, flags);
-       rctx->b.rings.gfx.flushing = false;
-       r600_begin_new_cs(rctx);
-
-       /* Re-enable render condition. */
-       if (render_cond) {
-               ctx->render_condition(ctx, render_cond, render_cond_cond, render_cond_mode);
-       }
-
-       rctx->initial_gfx_cs_size = rctx->b.rings.gfx.cs->cdw;
-}
-
-static void r600_flush_from_st(struct pipe_context *ctx,
-                              struct pipe_fence_handle **fence,
-                              unsigned flags)
-{
-       struct r600_context *rctx = (struct r600_context *)ctx;
-       unsigned fflags;
-
-       fflags = flags & PIPE_FLUSH_END_OF_FRAME ? RADEON_FLUSH_END_OF_FRAME : 0;
-       if (fence) {
-               *fence = rctx->b.ws->cs_create_fence(rctx->b.rings.gfx.cs);
-       }
-       /* flush gfx & dma ring, order does not matter as only one can be live */
-       if (rctx->b.rings.dma.cs) {
-               rctx->b.rings.dma.flush(rctx, fflags);
-       }
-       rctx->b.rings.gfx.flush(rctx, fflags);
-}
-
-static void r600_flush_gfx_ring(void *ctx, unsigned flags)
-{
-       r600_flush((struct pipe_context*)ctx, flags);
-}
-
-static void r600_flush_dma_ring(void *ctx, unsigned flags)
-{
-       struct r600_context *rctx = (struct r600_context *)ctx;
-       struct radeon_winsys_cs *cs = rctx->b.rings.dma.cs;
-
-       if (!cs->cdw) {
-               return;
-       }
-
-       rctx->b.rings.dma.flushing = true;
-       rctx->b.ws->cs_flush(cs, flags, 0);
-       rctx->b.rings.dma.flushing = false;
-}
-
-static void r600_flush_from_winsys(void *ctx, unsigned flags)
-{
-       struct r600_context *rctx = (struct r600_context *)ctx;
-
-       rctx->b.rings.gfx.flush(rctx, flags);
-}
-
-static void r600_flush_dma_from_winsys(void *ctx, unsigned flags)
-{
-       struct r600_context *rctx = (struct r600_context *)ctx;
-
-       rctx->b.rings.dma.flush(rctx, flags);
-}
-
 static void r600_destroy_context(struct pipe_context *context)
 {
        struct r600_context *rctx = (struct r600_context *)context;
@@ -191,10 +108,12 @@ static void r600_destroy_context(struct pipe_context *context)
        FREE(rctx);
 }
 
-static struct pipe_context *r600_create_context(struct pipe_screen *screen, void *priv)
+static struct pipe_context *r600_create_context(struct pipe_screen *screen,
+                                                void *priv, unsigned flags)
 {
        struct r600_context *rctx = CALLOC_STRUCT(r600_context);
        struct r600_screen* rscreen = (struct r600_screen *)screen;
+       struct radeon_winsys *ws = rscreen->b.ws;
 
        if (rctx == NULL)
                return NULL;
@@ -202,7 +121,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
        rctx->b.b.screen = screen;
        rctx->b.b.priv = priv;
        rctx->b.b.destroy = r600_destroy_context;
-       rctx->b.b.flush = r600_flush_from_st;
+       rctx->b.set_atom_dirty = (void *)r600_set_atom_dirty;
 
        if (!r600_common_context_init(&rctx->b, &rscreen->b))
                goto fail;
@@ -210,11 +129,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
        rctx->screen = rscreen;
        rctx->keep_tiling_flags = rscreen->b.info.drm_minor >= 12;
 
-       LIST_INITHEAD(&rctx->active_nontimer_queries);
-
        r600_init_blit_functions(rctx);
-       r600_init_query_functions(rctx);
-       r600_init_context_resource_functions(rctx);
 
        if (rscreen->b.info.has_uvd) {
                rctx->b.b.create_video_codec = r600_uvd_create_decoder;
@@ -231,7 +146,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
        case R700:
                r600_init_state_functions(rctx);
                r600_init_atom_start_cs(rctx);
-               rctx->max_db = 4;
                rctx->custom_dsa_flush = r600_create_db_flush_dsa(rctx);
                rctx->custom_blend_resolve = rctx->b.chip_class == R700 ? r700_create_resolve_blend(rctx)
                                                                      : r600_create_resolve_blend(rctx);
@@ -247,7 +161,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
                evergreen_init_state_functions(rctx);
                evergreen_init_atom_start_cs(rctx);
                evergreen_init_atom_start_compute_cs(rctx);
-               rctx->max_db = 8;
                rctx->custom_dsa_flush = evergreen_create_db_flush_dsa(rctx);
                rctx->custom_blend_resolve = evergreen_create_resolve_blend(rctx);
                rctx->custom_blend_decompress = evergreen_create_decompress_blend(rctx);
@@ -265,25 +178,14 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
                goto fail;
        }
 
-       if (rscreen->trace_bo) {
-               rctx->b.rings.gfx.cs = rctx->b.ws->cs_create(rctx->b.ws, RING_GFX, rscreen->trace_bo->cs_buf);
-       } else {
-               rctx->b.rings.gfx.cs = rctx->b.ws->cs_create(rctx->b.ws, RING_GFX, NULL);
-       }
-       rctx->b.rings.gfx.flush = r600_flush_gfx_ring;
-       rctx->b.ws->cs_set_flush_callback(rctx->b.rings.gfx.cs, r600_flush_from_winsys, rctx);
-       rctx->b.rings.gfx.flushing = false;
-
-       rctx->b.rings.dma.cs = NULL;
-       if (rscreen->b.info.r600_has_dma && !(rscreen->b.debug_flags & DBG_NO_ASYNC_DMA)) {
-               rctx->b.rings.dma.cs = rctx->b.ws->cs_create(rctx->b.ws, RING_DMA, NULL);
-               rctx->b.rings.dma.flush = r600_flush_dma_ring;
-               rctx->b.ws->cs_set_flush_callback(rctx->b.rings.dma.cs, r600_flush_dma_from_winsys, rctx);
-               rctx->b.rings.dma.flushing = false;
-       }
+       rctx->b.gfx.cs = ws->cs_create(rctx->b.ctx, RING_GFX,
+                                      r600_context_gfx_flush, rctx,
+                                      rscreen->b.trace_bo ?
+                                              rscreen->b.trace_bo->cs_buf : NULL);
+       rctx->b.gfx.flush = r600_context_gfx_flush;
 
        rctx->allocator_fetch_shader = u_suballocator_create(&rctx->b.b, 64 * 1024, 256,
-                                                            0, PIPE_USAGE_STATIC, FALSE);
+                                                            0, PIPE_USAGE_DEFAULT, FALSE);
        if (!rctx->allocator_fetch_shader)
                goto fail;
 
@@ -291,6 +193,9 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
        if (!rctx->isa || r600_isa_init(rctx, rctx->isa))
                goto fail;
 
+       if (rscreen->b.debug_flags & DBG_FORCE_DMA)
+               rctx->b.b.resource_copy_region = rctx->b.dma_copy;
+
        rctx->blitter = util_blitter_create(&rctx->b.b);
        if (rctx->blitter == NULL)
                goto fail;
@@ -298,7 +203,7 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void
        rctx->blitter->draw_rectangle = r600_draw_rectangle;
 
        r600_begin_new_cs(rctx);
-       r600_get_backend_mask(rctx); /* this emits commands and must be last */
+       r600_query_init_backend_mask(&rctx->b); /* this emits commands and must be last */
 
        rctx->dummy_pixel_shader =
                util_make_fragment_cloneinput_shader(&rctx->b.b, 0,
@@ -316,49 +221,6 @@ fail:
 /*
  * pipe_screen
  */
-static const char* r600_get_vendor(struct pipe_screen* pscreen)
-{
-       return "X.Org";
-}
-
-static const char *r600_get_family_name(enum radeon_family family)
-{
-       switch(family) {
-       case CHIP_R600: return "AMD R600";
-       case CHIP_RV610: return "AMD RV610";
-       case CHIP_RV630: return "AMD RV630";
-       case CHIP_RV670: return "AMD RV670";
-       case CHIP_RV620: return "AMD RV620";
-       case CHIP_RV635: return "AMD RV635";
-       case CHIP_RS780: return "AMD RS780";
-       case CHIP_RS880: return "AMD RS880";
-       case CHIP_RV770: return "AMD RV770";
-       case CHIP_RV730: return "AMD RV730";
-       case CHIP_RV710: return "AMD RV710";
-       case CHIP_RV740: return "AMD RV740";
-       case CHIP_CEDAR: return "AMD CEDAR";
-       case CHIP_REDWOOD: return "AMD REDWOOD";
-       case CHIP_JUNIPER: return "AMD JUNIPER";
-       case CHIP_CYPRESS: return "AMD CYPRESS";
-       case CHIP_HEMLOCK: return "AMD HEMLOCK";
-       case CHIP_PALM: return "AMD PALM";
-       case CHIP_SUMO: return "AMD SUMO";
-       case CHIP_SUMO2: return "AMD SUMO2";
-       case CHIP_BARTS: return "AMD BARTS";
-       case CHIP_TURKS: return "AMD TURKS";
-       case CHIP_CAICOS: return "AMD CAICOS";
-       case CHIP_CAYMAN: return "AMD CAYMAN";
-       case CHIP_ARUBA: return "AMD ARUBA";
-       default: return "AMD unknown";
-       }
-}
-
-static const char* r600_get_name(struct pipe_screen* pscreen)
-{
-       struct r600_screen *rscreen = (struct r600_screen *)pscreen;
-
-       return r600_get_family_name(rscreen->b.family);
-}
 
 static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
 {
@@ -396,18 +258,39 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_VERTEX_ELEMENT_SRC_OFFSET_4BYTE_ALIGNED_ONLY:
        case PIPE_CAP_USER_INDEX_BUFFERS:
        case PIPE_CAP_USER_CONSTANT_BUFFERS:
-       case PIPE_CAP_COMPUTE:
        case PIPE_CAP_START_INSTANCE:
        case PIPE_CAP_MAX_DUAL_SOURCE_RENDER_TARGETS:
        case PIPE_CAP_TEXTURE_BUFFER_OBJECTS:
         case PIPE_CAP_PREFER_BLIT_BASED_TEXTURE_TRANSFER:
        case PIPE_CAP_QUERY_PIPELINE_STATISTICS:
        case PIPE_CAP_TEXTURE_MULTISAMPLE:
+       case PIPE_CAP_BUFFER_MAP_PERSISTENT_COHERENT:
+       case PIPE_CAP_TGSI_VS_WINDOW_SPACE_POSITION:
+       case PIPE_CAP_TGSI_VS_LAYER_VIEWPORT:
+       case PIPE_CAP_SAMPLE_SHADING:
+       case PIPE_CAP_CLIP_HALFZ:
+       case PIPE_CAP_POLYGON_OFFSET_CLAMP:
+       case PIPE_CAP_CONDITIONAL_RENDER_INVERTED:
+       case PIPE_CAP_TEXTURE_FLOAT_LINEAR:
+       case PIPE_CAP_TEXTURE_HALF_FLOAT_LINEAR:
+       case PIPE_CAP_TGSI_TXQS:
                return 1;
 
+       case PIPE_CAP_DEVICE_RESET_STATUS_QUERY:
+               return rscreen->b.info.drm_major == 2 && rscreen->b.info.drm_minor >= 43;
+
+       case PIPE_CAP_RESOURCE_FROM_USER_MEMORY:
+               return !R600_BIG_ENDIAN && rscreen->b.info.has_userptr;
+
+       case PIPE_CAP_COMPUTE:
+               return rscreen->b.chip_class > R700;
+
        case PIPE_CAP_TGSI_TEXCOORD:
                return 0;
 
+       case PIPE_CAP_FAKE_SW_MSAA:
+               return 0;
+
        case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE:
                return MIN2(rscreen->b.info.vram_size, 0xFFFFFFFF);
 
@@ -421,6 +304,11 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
                return 1;
 
        case PIPE_CAP_GLSL_FEATURE_LEVEL:
+               if (family >= CHIP_CEDAR)
+                  return 410;
+               /* pre-evergreen geom shaders need newer kernel */
+               if (rscreen->b.info.drm_minor >= 37)
+                  return 330;
                return 140;
 
        /* Supported except the original R600. */
@@ -432,17 +320,32 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        /* Supported on Evergreen. */
        case PIPE_CAP_SEAMLESS_CUBE_MAP_PER_TEXTURE:
        case PIPE_CAP_CUBE_MAP_ARRAY:
+       case PIPE_CAP_TEXTURE_GATHER_SM5:
+       case PIPE_CAP_TEXTURE_QUERY_LOD:
+       case PIPE_CAP_TGSI_FS_FINE_DERIVATIVE:
+       case PIPE_CAP_SAMPLER_VIEW_TARGET:
                return family >= CHIP_CEDAR ? 1 : 0;
+       case PIPE_CAP_MAX_TEXTURE_GATHER_COMPONENTS:
+               return family >= CHIP_CEDAR ? 4 : 0;
+       case PIPE_CAP_DRAW_INDIRECT:
+               /* kernel command checker support is also required */
+               return family >= CHIP_CEDAR && rscreen->b.info.drm_minor >= 41;
 
        /* Unsupported features. */
        case PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT:
        case PIPE_CAP_TGSI_FS_COORD_PIXEL_CENTER_INTEGER:
-       case PIPE_CAP_SCALED_RESOLVE:
        case PIPE_CAP_TGSI_CAN_COMPACT_CONSTANTS:
        case PIPE_CAP_FRAGMENT_COLOR_CLAMPED:
        case PIPE_CAP_VERTEX_COLOR_CLAMPED:
        case PIPE_CAP_USER_VERTEX_BUFFERS:
-       case PIPE_CAP_TGSI_VS_LAYER:
+       case PIPE_CAP_TEXTURE_GATHER_OFFSETS:
+       case PIPE_CAP_VERTEXID_NOBASE:
+       case PIPE_CAP_MAX_SHADER_PATCH_VARYINGS:
+       case PIPE_CAP_DEPTH_BOUNDS_TEST:
+       case PIPE_CAP_FORCE_PERSAMPLE_INTERP:
+       case PIPE_CAP_SHAREABLE_SHADERS:
+       case PIPE_CAP_COPY_BETWEEN_COMPRESSED_AND_PLAIN_FORMATS:
+       case PIPE_CAP_CLEAR_TEXTURE:
                return 0;
 
        /* Stream output. */
@@ -454,19 +357,30 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
        case PIPE_CAP_MAX_STREAM_OUTPUT_INTERLEAVED_COMPONENTS:
                return 32*4;
 
+       /* Geometry shader output. */
+       case PIPE_CAP_MAX_GEOMETRY_OUTPUT_VERTICES:
+               return 1024;
+       case PIPE_CAP_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS:
+               return 16384;
+       case PIPE_CAP_MAX_VERTEX_STREAMS:
+               return family >= CHIP_CEDAR ? 4 : 1;
+
+       case PIPE_CAP_MAX_VERTEX_ATTRIB_STRIDE:
+               return 2047;
+
        /* Texturing. */
        case PIPE_CAP_MAX_TEXTURE_2D_LEVELS:
-       case PIPE_CAP_MAX_TEXTURE_3D_LEVELS:
        case PIPE_CAP_MAX_TEXTURE_CUBE_LEVELS:
                if (family >= CHIP_CEDAR)
                        return 15;
                else
                        return 14;
+       case PIPE_CAP_MAX_TEXTURE_3D_LEVELS:
+               /* textures support 8192, but layered rendering supports 2048 */
+               return 12;
        case PIPE_CAP_MAX_TEXTURE_ARRAY_LAYERS:
-               return rscreen->b.info.drm_minor >= 9 ?
-                       (family >= CHIP_CEDAR ? 16384 : 8192) : 0;
-       case PIPE_CAP_MAX_COMBINED_SAMPLERS:
-               return 32;
+               /* textures support 8192, but layered rendering supports 2048 */
+               return rscreen->b.info.drm_minor >= 9 ? 2048 : 0;
 
        /* Render targets. */
        case PIPE_CAP_MAX_RENDER_TARGETS:
@@ -474,7 +388,7 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
                return 8;
 
        case PIPE_CAP_MAX_VIEWPORTS:
-               return 1;
+               return R600_MAX_VIEWPORTS;
 
        /* Timer queries, present when the clock frequency is non zero. */
        case PIPE_CAP_QUERY_TIME_ELAPSED:
@@ -483,9 +397,11 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
                return rscreen->b.info.drm_minor >= 20 &&
                       rscreen->b.info.r600_clock_crystal_freq != 0;
 
+       case PIPE_CAP_MIN_TEXTURE_GATHER_OFFSET:
        case PIPE_CAP_MIN_TEXEL_OFFSET:
                return -8;
 
+       case PIPE_CAP_MAX_TEXTURE_GATHER_OFFSET:
        case PIPE_CAP_MAX_TEXEL_OFFSET:
                return 7;
 
@@ -493,48 +409,39 @@ static int r600_get_param(struct pipe_screen* pscreen, enum pipe_cap param)
                return PIPE_QUIRK_TEXTURE_BORDER_COLOR_SWIZZLE_R600;
        case PIPE_CAP_ENDIANNESS:
                return PIPE_ENDIAN_LITTLE;
+
+       case PIPE_CAP_VENDOR_ID:
+               return 0x1002;
+       case PIPE_CAP_DEVICE_ID:
+               return rscreen->b.info.pci_id;
+       case PIPE_CAP_ACCELERATED:
+               return 1;
+       case PIPE_CAP_VIDEO_MEMORY:
+               return rscreen->b.info.vram_size >> 20;
+       case PIPE_CAP_UMA:
+               return 0;
+       case PIPE_CAP_MULTISAMPLE_Z_RESOLVE:
+               return rscreen->b.chip_class >= R700;
        }
        return 0;
 }
 
-static float r600_get_paramf(struct pipe_screen* pscreen,
-                            enum pipe_capf param)
+static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, enum pipe_shader_cap param)
 {
        struct r600_screen *rscreen = (struct r600_screen *)pscreen;
-       enum radeon_family family = rscreen->b.family;
 
-       switch (param) {
-       case PIPE_CAPF_MAX_LINE_WIDTH:
-       case PIPE_CAPF_MAX_LINE_WIDTH_AA:
-       case PIPE_CAPF_MAX_POINT_WIDTH:
-       case PIPE_CAPF_MAX_POINT_WIDTH_AA:
-               if (family >= CHIP_CEDAR)
-                       return 16384.0f;
-               else
-                       return 8192.0f;
-       case PIPE_CAPF_MAX_TEXTURE_ANISOTROPY:
-               return 16.0f;
-       case PIPE_CAPF_MAX_TEXTURE_LOD_BIAS:
-               return 16.0f;
-       case PIPE_CAPF_GUARD_BAND_LEFT:
-       case PIPE_CAPF_GUARD_BAND_TOP:
-       case PIPE_CAPF_GUARD_BAND_RIGHT:
-       case PIPE_CAPF_GUARD_BAND_BOTTOM:
-               return 0.0f;
-       }
-       return 0.0f;
-}
-
-static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, enum pipe_shader_cap param)
-{
        switch(shader)
        {
        case PIPE_SHADER_FRAGMENT:
        case PIPE_SHADER_VERTEX:
-        case PIPE_SHADER_COMPUTE:
+       case PIPE_SHADER_COMPUTE:
                break;
        case PIPE_SHADER_GEOMETRY:
-               /* XXX: support and enable geometry programs */
+               if (rscreen->b.family >= CHIP_CEDAR)
+                       break;
+               /* pre-evergreen geom shaders need newer kernel */
+               if (rscreen->b.info.drm_minor >= 37)
+                       break;
                return 0;
        default:
                /* XXX: support tessellation on Evergreen */
@@ -550,14 +457,22 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, e
        case PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH:
                return 32;
        case PIPE_SHADER_CAP_MAX_INPUTS:
-               return 32;
+               return shader == PIPE_SHADER_VERTEX ? 16 : 32;
+       case PIPE_SHADER_CAP_MAX_OUTPUTS:
+               return shader == PIPE_SHADER_FRAGMENT ? 8 : 32;
        case PIPE_SHADER_CAP_MAX_TEMPS:
                return 256; /* Max native temporaries. */
-       case PIPE_SHADER_CAP_MAX_ADDRS:
-               /* XXX Isn't this equal to TEMPS? */
-               return 1; /* Max native address registers */
-       case PIPE_SHADER_CAP_MAX_CONSTS:
-               return R600_MAX_CONST_BUFFER_SIZE;
+       case PIPE_SHADER_CAP_MAX_CONST_BUFFER_SIZE:
+               if (shader == PIPE_SHADER_COMPUTE) {
+                       uint64_t max_const_buffer_size;
+                       pscreen->get_compute_param(pscreen,
+                               PIPE_COMPUTE_CAP_MAX_MEM_ALLOC_SIZE,
+                               &max_const_buffer_size);
+                       return max_const_buffer_size;
+
+               } else {
+                       return R600_MAX_CONST_BUFFER_SIZE;
+               }
        case PIPE_SHADER_CAP_MAX_CONST_BUFFERS:
                return R600_MAX_USER_CONST_BUFFERS;
        case PIPE_SHADER_CAP_MAX_PREDS:
@@ -565,7 +480,7 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, e
        case PIPE_SHADER_CAP_TGSI_CONT_SUPPORTED:
                return 1;
        case PIPE_SHADER_CAP_TGSI_SQRT_SUPPORTED:
-               return 0;
+               return 1;
        case PIPE_SHADER_CAP_INDIRECT_INPUT_ADDR:
        case PIPE_SHADER_CAP_INDIRECT_OUTPUT_ADDR:
        case PIPE_SHADER_CAP_INDIRECT_TEMP_ADDR:
@@ -574,207 +489,38 @@ static int r600_get_shader_param(struct pipe_screen* pscreen, unsigned shader, e
        case PIPE_SHADER_CAP_SUBROUTINES:
                return 0;
        case PIPE_SHADER_CAP_INTEGERS:
+       case PIPE_SHADER_CAP_TGSI_ANY_INOUT_DECL_RANGE:
                return 1;
        case PIPE_SHADER_CAP_MAX_TEXTURE_SAMPLERS:
        case PIPE_SHADER_CAP_MAX_SAMPLER_VIEWS:
                return 16;
         case PIPE_SHADER_CAP_PREFERRED_IR:
                if (shader == PIPE_SHADER_COMPUTE) {
+#if HAVE_LLVM < 0x0306
                        return PIPE_SHADER_IR_LLVM;
+#else
+                       return PIPE_SHADER_IR_NATIVE;
+#endif
                } else {
                        return PIPE_SHADER_IR_TGSI;
                }
-       }
-       return 0;
-}
-
-static int r600_get_video_param(struct pipe_screen *screen,
-                               enum pipe_video_profile profile,
-                               enum pipe_video_entrypoint entrypoint,
-                               enum pipe_video_cap param)
-{
-       switch (param) {
-       case PIPE_VIDEO_CAP_SUPPORTED:
-               return vl_profile_supported(screen, profile, entrypoint);
-       case PIPE_VIDEO_CAP_NPOT_TEXTURES:
-               return 1;
-       case PIPE_VIDEO_CAP_MAX_WIDTH:
-       case PIPE_VIDEO_CAP_MAX_HEIGHT:
-               return vl_video_buffer_max_size(screen);
-       case PIPE_VIDEO_CAP_PREFERED_FORMAT:
-               return PIPE_FORMAT_NV12;
-       case PIPE_VIDEO_CAP_PREFERS_INTERLACED:
-               return false;
-       case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED:
-               return false;
-       case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE:
-               return true;
-       case PIPE_VIDEO_CAP_MAX_LEVEL:
-               return vl_level_supported(screen, profile);
-       default:
+       case PIPE_SHADER_CAP_DOUBLES:
+               if (rscreen->b.family == CHIP_CYPRESS ||
+                       rscreen->b.family == CHIP_CAYMAN || rscreen->b.family == CHIP_ARUBA)
+                       return 1;
                return 0;
-       }
-}
-
-const char * r600_llvm_gpu_string(enum radeon_family family)
-{
-       const char * gpu_family;
-
-       switch (family) {
-       case CHIP_R600:
-       case CHIP_RV630:
-       case CHIP_RV635:
-       case CHIP_RV670:
-               gpu_family = "r600";
-               break;
-       case CHIP_RV610:
-       case CHIP_RV620:
-       case CHIP_RS780:
-       case CHIP_RS880:
-               gpu_family = "rs880";
-               break;
-       case CHIP_RV710:
-               gpu_family = "rv710";
-               break;
-       case CHIP_RV730:
-               gpu_family = "rv730";
-               break;
-       case CHIP_RV740:
-       case CHIP_RV770:
-               gpu_family = "rv770";
-               break;
-       case CHIP_PALM:
-       case CHIP_CEDAR:
-               gpu_family = "cedar";
-               break;
-       case CHIP_SUMO:
-       case CHIP_SUMO2:
-               gpu_family = "sumo";
-               break;
-       case CHIP_REDWOOD:
-               gpu_family = "redwood";
-               break;
-       case CHIP_JUNIPER:
-               gpu_family = "juniper";
-               break;
-       case CHIP_HEMLOCK:
-       case CHIP_CYPRESS:
-               gpu_family = "cypress";
-               break;
-       case CHIP_BARTS:
-               gpu_family = "barts";
-               break;
-       case CHIP_TURKS:
-               gpu_family = "turks";
-               break;
-       case CHIP_CAICOS:
-               gpu_family = "caicos";
-               break;
-       case CHIP_CAYMAN:
-        case CHIP_ARUBA:
-               gpu_family = "cayman";
-               break;
-       default:
-               gpu_family = "";
-               fprintf(stderr, "Chip not supported by r600 llvm "
-                       "backend, please file a bug at " PACKAGE_BUGREPORT "\n");
-               break;
-       }
-       return gpu_family;
-}
-
-
-static int r600_get_compute_param(struct pipe_screen *screen,
-        enum pipe_compute_cap param,
-        void *ret)
-{
-       struct r600_screen *rscreen = (struct r600_screen *)screen;
-       //TODO: select these params by asic
-       switch (param) {
-       case PIPE_COMPUTE_CAP_IR_TARGET: {
-               const char *gpu = r600_llvm_gpu_string(rscreen->b.family);
-               if (ret) {
-                       sprintf(ret, "%s-r600--", gpu);
-               }
-               return (8 + strlen(gpu)) * sizeof(char);
-       }
-       case PIPE_COMPUTE_CAP_GRID_DIMENSION:
-               if (ret) {
-                       uint64_t * grid_dimension = ret;
-                       grid_dimension[0] = 3;
-               }
-               return 1 * sizeof(uint64_t);
-
-       case PIPE_COMPUTE_CAP_MAX_GRID_SIZE:
-               if (ret) {
-                       uint64_t * grid_size = ret;
-                       grid_size[0] = 65535;
-                       grid_size[1] = 65535;
-                       grid_size[2] = 1;
-               }
-               return 3 * sizeof(uint64_t) ;
-
-       case PIPE_COMPUTE_CAP_MAX_BLOCK_SIZE:
-               if (ret) {
-                       uint64_t * block_size = ret;
-                       block_size[0] = 256;
-                       block_size[1] = 256;
-                       block_size[2] = 256;
-               }
-               return 3 * sizeof(uint64_t);
-
-       case PIPE_COMPUTE_CAP_MAX_THREADS_PER_BLOCK:
-               if (ret) {
-                       uint64_t * max_threads_per_block = ret;
-                       *max_threads_per_block = 256;
-               }
-               return sizeof(uint64_t);
-
-       case PIPE_COMPUTE_CAP_MAX_GLOBAL_SIZE:
-               if (ret) {
-                       uint64_t * max_global_size = ret;
-                       /* XXX: This is what the proprietary driver reports, we
-                        * may want to use a different value. */
-                       *max_global_size = 201326592;
-               }
-               return sizeof(uint64_t);
-
-       case PIPE_COMPUTE_CAP_MAX_INPUT_SIZE:
-               if (ret) {
-                       uint64_t * max_input_size = ret;
-                       *max_input_size = 1024;
-               }
-               return sizeof(uint64_t);
-
-       case PIPE_COMPUTE_CAP_MAX_LOCAL_SIZE:
-               if (ret) {
-                       uint64_t * max_local_size = ret;
-                       /* XXX: This is what the proprietary driver reports, we
-                        * may want to use a different value. */
-                       *max_local_size = 32768;
-               }
-               return sizeof(uint64_t);
-
-       case PIPE_COMPUTE_CAP_MAX_MEM_ALLOC_SIZE:
-               if (ret) {
-                       uint64_t max_global_size;
-                       uint64_t * max_mem_alloc_size = ret;
-                       r600_get_compute_param(screen,
-                                       PIPE_COMPUTE_CAP_MAX_GLOBAL_SIZE,
-                                       &max_global_size);
-                       /* OpenCL requres this value be at least
-                        * max(MAX_GLOBAL_SIZE / 4, 128 * 1024 *1024)
-                        * I'm really not sure what value to report here, but
-                        * MAX_GLOBAL_SIZE / 4 seems resonable.
-                        */
-                       *max_mem_alloc_size = max_global_size / 4;
-               }
-               return sizeof(uint64_t);
-
-       default:
-               fprintf(stderr, "unknown PIPE_COMPUTE_CAP %d\n", param);
+       case PIPE_SHADER_CAP_TGSI_DROUND_SUPPORTED:
+       case PIPE_SHADER_CAP_TGSI_DFRACEXP_DLDEXP_SUPPORTED:
+       case PIPE_SHADER_CAP_TGSI_FMA_SUPPORTED:
                return 0;
+       case PIPE_SHADER_CAP_MAX_UNROLL_ITERATIONS_HINT:
+               /* due to a bug in the shader compiler, some loops hang
+                * if they are not unrolled, see:
+                *    https://bugs.freedesktop.org/show_bug.cgi?id=86720
+                */
+               return 255;
        }
+       return 0;
 }
 
 static void r600_destroy_screen(struct pipe_screen* pscreen)
@@ -784,52 +530,24 @@ static void r600_destroy_screen(struct pipe_screen* pscreen)
        if (rscreen == NULL)
                return;
 
-       if (!radeon_winsys_unref(rscreen->b.ws))
+       if (!rscreen->b.ws->unref(rscreen->b.ws))
                return;
 
-       r600_common_screen_cleanup(&rscreen->b);
-
        if (rscreen->global_pool) {
                compute_memory_pool_delete(rscreen->global_pool);
        }
 
-       if (rscreen->trace_bo) {
-               rscreen->b.ws->buffer_unmap(rscreen->trace_bo->cs_buf);
-               pipe_resource_reference((struct pipe_resource**)&rscreen->trace_bo, NULL);
-       }
-
-       rscreen->b.ws->destroy(rscreen->b.ws);
-       FREE(rscreen);
-}
-
-static uint64_t r600_get_timestamp(struct pipe_screen *screen)
-{
-       struct r600_screen *rscreen = (struct r600_screen*)screen;
-
-       return 1000000 * rscreen->b.ws->query_value(rscreen->b.ws, RADEON_TIMESTAMP) /
-                       rscreen->b.info.r600_clock_crystal_freq;
+       r600_destroy_common_screen(&rscreen->b);
 }
 
-static int r600_get_driver_query_info(struct pipe_screen *screen,
-                                     unsigned index,
-                                     struct pipe_driver_query_info *info)
+static struct pipe_resource *r600_resource_create(struct pipe_screen *screen,
+                                                 const struct pipe_resource *templ)
 {
-       struct r600_screen *rscreen = (struct r600_screen*)screen;
-       struct pipe_driver_query_info list[] = {
-               {"draw-calls", R600_QUERY_DRAW_CALLS, 0},
-               {"requested-VRAM", R600_QUERY_REQUESTED_VRAM, rscreen->b.info.vram_size, TRUE},
-               {"requested-GTT", R600_QUERY_REQUESTED_GTT, rscreen->b.info.gart_size, TRUE},
-               {"buffer-wait-time", R600_QUERY_BUFFER_WAIT_TIME, 0, FALSE}
-       };
-
-       if (!info)
-               return Elements(list);
-
-       if (index >= Elements(list))
-               return 0;
+       if (templ->target == PIPE_BUFFER &&
+           (templ->bind & PIPE_BIND_GLOBAL))
+               return r600_compute_global_buffer_create(screen, templ);
 
-       *info = list[index];
-       return 1;
+       return r600_resource_create_common(screen, templ);
 }
 
 struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
@@ -840,38 +558,24 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
                return NULL;
        }
 
-       ws->query_info(ws, &rscreen->b.info);
-
        /* Set functions first. */
        rscreen->b.b.context_create = r600_create_context;
        rscreen->b.b.destroy = r600_destroy_screen;
-       rscreen->b.b.get_name = r600_get_name;
-       rscreen->b.b.get_vendor = r600_get_vendor;
        rscreen->b.b.get_param = r600_get_param;
        rscreen->b.b.get_shader_param = r600_get_shader_param;
-       rscreen->b.b.get_paramf = r600_get_paramf;
-       rscreen->b.b.get_compute_param = r600_get_compute_param;
-       rscreen->b.b.get_timestamp = r600_get_timestamp;
-       if (rscreen->b.info.chip_class >= EVERGREEN) {
-               rscreen->b.b.is_format_supported = evergreen_is_format_supported;
-       } else {
-               rscreen->b.b.is_format_supported = r600_is_format_supported;
-       }
-       rscreen->b.b.get_driver_query_info = r600_get_driver_query_info;
-       if (rscreen->b.info.has_uvd) {
-               rscreen->b.b.get_video_param = ruvd_get_video_param;
-               rscreen->b.b.is_video_format_supported = ruvd_is_format_supported;
-       } else {
-               rscreen->b.b.get_video_param = r600_get_video_param;
-               rscreen->b.b.is_video_format_supported = vl_video_buffer_is_format_supported;
-       }
-       r600_init_screen_resource_functions(&rscreen->b.b);
+       rscreen->b.b.resource_create = r600_resource_create;
 
        if (!r600_common_screen_init(&rscreen->b, ws)) {
                FREE(rscreen);
                return NULL;
        }
 
+       if (rscreen->b.info.chip_class >= EVERGREEN) {
+               rscreen->b.b.is_format_supported = evergreen_is_format_supported;
+       } else {
+               rscreen->b.b.is_format_supported = r600_is_format_supported;
+       }
+
        rscreen->b.debug_flags |= debug_get_flags_option("R600_DEBUG", r600_debug_options, 0);
        if (debug_get_bool_option("R600_DEBUG_COMPUTE", FALSE))
                rscreen->b.debug_flags |= DBG_COMPUTE;
@@ -879,8 +583,8 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
                rscreen->b.debug_flags |= DBG_FS | DBG_VS | DBG_GS | DBG_PS | DBG_CS;
        if (!debug_get_bool_option("R600_HYPERZ", TRUE))
                rscreen->b.debug_flags |= DBG_NO_HYPERZ;
-       if (!debug_get_bool_option("R600_LLVM", TRUE))
-               rscreen->b.debug_flags |= DBG_NO_LLVM;
+       if (debug_get_bool_option("R600_LLVM", FALSE))
+               rscreen->b.debug_flags |= DBG_LLVM;
 
        if (rscreen->b.family == CHIP_UNKNOWN) {
                fprintf(stderr, "r600: Unknown chipset 0x%04X\n", rscreen->b.info.pci_id);
@@ -934,20 +638,8 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
 
        rscreen->global_pool = compute_memory_pool_new(rscreen);
 
-       rscreen->cs_count = 0;
-       if (rscreen->b.info.drm_minor >= 28 && (rscreen->b.debug_flags & DBG_TRACE_CS)) {
-               rscreen->trace_bo = (struct r600_resource*)pipe_buffer_create(&rscreen->b.b,
-                                                                               PIPE_BIND_CUSTOM,
-                                                                               PIPE_USAGE_STAGING,
-                                                                               4096);
-               if (rscreen->trace_bo) {
-                       rscreen->trace_ptr = rscreen->b.ws->buffer_map(rscreen->trace_bo->cs_buf, NULL,
-                                                                       PIPE_TRANSFER_UNSYNCHRONIZED);
-               }
-       }
-
        /* Create the auxiliary context. This must be done last. */
-       rscreen->b.aux_context = rscreen->b.b.context_create(&rscreen->b.b, NULL);
+       rscreen->b.aux_context = rscreen->b.b.context_create(&rscreen->b.b, NULL, 0);
 
 #if 0 /* This is for testing whether aux_context and buffer clearing work correctly. */
        struct pipe_resource templ = {};
@@ -958,7 +650,7 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
        templ.array_size = 1;
        templ.target = PIPE_TEXTURE_2D;
        templ.format = PIPE_FORMAT_R8G8B8A8_UNORM;
-       templ.usage = PIPE_USAGE_STATIC;
+       templ.usage = PIPE_USAGE_DEFAULT;
 
        struct r600_resource *res = r600_resource(rscreen->screen.resource_create(&rscreen->screen, &templ));
        unsigned char *map = ws->buffer_map(res->cs_buf, NULL, PIPE_TRANSFER_WRITE);