radeon/video: seperate common video functions
authorChristian König <christian.koenig@amd.com>
Thu, 17 Oct 2013 12:21:40 +0000 (06:21 -0600)
committerChristian König <christian.koenig@amd.com>
Thu, 6 Feb 2014 14:54:13 +0000 (15:54 +0100)
Signed-off-by: Christian König <christian.koenig@amd.com>
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_uvd.c
src/gallium/drivers/radeon/Makefile.sources
src/gallium/drivers/radeon/r600_pipe_common.c
src/gallium/drivers/radeon/radeon_uvd.c
src/gallium/drivers/radeon/radeon_uvd.h
src/gallium/drivers/radeon/radeon_video.c [new file with mode: 0644]
src/gallium/drivers/radeon/radeon_video.h [new file with mode: 0644]
src/gallium/drivers/radeonsi/si_uvd.c

index 6c72d07575720e36846761a776ffb5fd5e6b6da0..cd54fb88785f8af6104d1f1ddc8511a3b718e087 100644 (file)
@@ -38,6 +38,7 @@
 #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"
 
index 300bccbc696019c75579ea3cada58d27b8b5813f..e0db492cf25a2fc9e96495710f7163c2341844f2 100644 (file)
@@ -45,6 +45,7 @@
 #include "vl/vl_mpeg12_decoder.h"
 
 #include "r600_pipe.h"
+#include "radeon/radeon_video.h"
 #include "radeon/radeon_uvd.h"
 #include "r600d.h"
 
@@ -111,7 +112,7 @@ struct pipe_video_buffer *r600_video_buffer_create(struct pipe_context *pipe,
                surfaces[i] = &resources[i]->surface;
        }
 
-       ruvd_join_surfaces(ctx->b.ws, templ.bind, pbs, surfaces);
+       rvid_join_surfaces(ctx->b.ws, templ.bind, pbs, surfaces);
 
        for (i = 0; i < VL_NUM_COMPONENTS; ++i) {
                if (!resources[i])
index 7c028388e35ddd6ddb2aa6826f0da16e1c0ada62..e0ccab9b8d8903dfadeaaf003c0b3b7fb2eaf446 100644 (file)
@@ -4,6 +4,7 @@ C_SOURCES := \
         r600_query.c \
        r600_streamout.c \
         r600_texture.c \
+       radeon_video.c \
        radeon_uvd.c
 
 LLVM_C_FILES := \
index 98164f0fb5c11c9f48f204b3afa5ee03f7cc1b3c..b324d8e0f1789d39ba4141db07d16ab0b0231675 100644 (file)
@@ -24,7 +24,6 @@
  *
  */
 
-#include "radeon/radeon_uvd.h"
 #include "r600_pipe_common.h"
 #include "r600_cs.h"
 #include "tgsi/tgsi_parse.h"
@@ -33,6 +32,7 @@
 #include "util/u_upload_mgr.h"
 #include "vl/vl_decoder.h"
 #include "vl/vl_video_buffer.h"
+#include "radeon/radeon_video.h"
 #include <inttypes.h>
 
 /*
@@ -601,8 +601,8 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
        rscreen->b.resource_destroy = u_resource_destroy_vtbl;
 
        if (rscreen->info.has_uvd) {
-               rscreen->b.get_video_param = ruvd_get_video_param;
-               rscreen->b.is_video_format_supported = ruvd_is_format_supported;
+               rscreen->b.get_video_param = rvid_get_video_param;
+               rscreen->b.is_video_format_supported = rvid_is_format_supported;
        } else {
                rscreen->b.get_video_param = r600_get_video_param;
                rscreen->b.is_video_format_supported = vl_video_buffer_is_format_supported;
index e88c45c5e5d59c509d0d6bf5697ac79be78bd8f4..e12b6fbaad5825dfc64d82efd1e431089490d568 100644 (file)
 
 #include "../../winsys/radeon/drm/radeon_winsys.h"
 #include "r600_pipe_common.h"
+#include "radeon_video.h"
 #include "radeon_uvd.h"
 
-#define RUVD_ERR(fmt, args...) \
-       fprintf(stderr, "EE %s:%d %s UVD - "fmt, __FILE__, __LINE__, __func__, ##args)
-
 #define NUM_BUFFERS 4
 
 #define NUM_MPEG2_REFS 6
 #define FB_BUFFER_OFFSET 0x1000
 #define FB_BUFFER_SIZE 2048
 
-/* UVD buffer representation */
-struct ruvd_buffer
-{
-       struct pb_buffer*               buf;
-       struct radeon_winsys_cs_handle* cs_handle;
-};
-
 /* UVD decoder representation */
 struct ruvd_decoder {
        struct pipe_video_codec         base;
@@ -82,32 +73,17 @@ struct ruvd_decoder {
 
        unsigned                        cur_buffer;
 
-       struct ruvd_buffer              msg_fb_buffers[NUM_BUFFERS];
+       struct rvid_buffer              msg_fb_buffers[NUM_BUFFERS];
        struct ruvd_msg                 *msg;
        uint32_t                        *fb;
 
-       struct ruvd_buffer              bs_buffers[NUM_BUFFERS];
+       struct rvid_buffer              bs_buffers[NUM_BUFFERS];
        void*                           bs_ptr;
        unsigned                        bs_size;
 
-       struct ruvd_buffer              dpb;
+       struct rvid_buffer              dpb;
 };
 
-/* generate an UVD stream handle */
-static unsigned alloc_stream_handle()
-{
-       static unsigned counter = 0;
-       unsigned stream_handle = 0;
-       unsigned pid = getpid();
-       int i;
-
-       for (i = 0; i < 32; ++i)
-               stream_handle |= ((pid >> i) & 1) << (31 - i);
-
-       stream_handle ^= ++counter;
-       return stream_handle;
-}
-
 /* flush IB to the hardware */
 static void flush(struct ruvd_decoder *dec)
 {
@@ -138,7 +114,7 @@ static void send_cmd(struct ruvd_decoder *dec, unsigned cmd,
 /* map the next available message/feedback buffer */
 static void map_msg_fb_buf(struct ruvd_decoder *dec)
 {
-       struct ruvd_buffer* buf;
+       struct rvid_buffer* buf;
        uint8_t *ptr;
 
        /* grab the current message/feedback buffer */
@@ -155,7 +131,7 @@ static void map_msg_fb_buf(struct ruvd_decoder *dec)
 /* unmap and send a message command to the VCPU */
 static void send_msg_buf(struct ruvd_decoder *dec)
 {
-       struct ruvd_buffer* buf;
+       struct rvid_buffer* buf;
 
        /* ignore the request if message/feedback buffer isn't mapped */
        if (!dec->msg || !dec->fb)
@@ -174,82 +150,6 @@ static void send_msg_buf(struct ruvd_decoder *dec)
                 RADEON_USAGE_READ, RADEON_DOMAIN_GTT);
 }
 
-/* create a buffer in the winsys */
-static bool create_buffer(struct ruvd_decoder *dec,
-                         struct ruvd_buffer *buffer,
-                         unsigned size)
-{
-       buffer->buf = dec->ws->buffer_create(dec->ws, size, 4096, false,
-                                            RADEON_DOMAIN_GTT | RADEON_DOMAIN_VRAM);
-       if (!buffer->buf)
-               return false;
-
-       buffer->cs_handle = dec->ws->buffer_get_cs_handle(buffer->buf);
-       if (!buffer->cs_handle)
-               return false;
-
-       return true;
-}
-
-/* destroy a buffer */
-static void destroy_buffer(struct ruvd_buffer *buffer)
-{
-       pb_reference(&buffer->buf, NULL);
-       buffer->cs_handle = NULL;
-}
-
-/* reallocate a buffer, preserving its content */
-static bool resize_buffer(struct ruvd_decoder *dec,
-                         struct ruvd_buffer *new_buf,
-                         unsigned new_size)
-{
-       unsigned bytes = MIN2(new_buf->buf->size, new_size);
-       struct ruvd_buffer old_buf = *new_buf;
-       void *src = NULL, *dst = NULL;
-
-       if (!create_buffer(dec, new_buf, new_size))
-               goto error;
-
-       src = dec->ws->buffer_map(old_buf.cs_handle, dec->cs, PIPE_TRANSFER_READ);
-       if (!src)
-               goto error;
-
-       dst = dec->ws->buffer_map(new_buf->cs_handle, dec->cs, PIPE_TRANSFER_WRITE);
-       if (!dst)
-               goto error;
-
-       memcpy(dst, src, bytes);
-       if (new_size > bytes) {
-               new_size -= bytes;
-               dst += bytes;
-               memset(dst, 0, new_size);
-       }
-       dec->ws->buffer_unmap(new_buf->cs_handle);
-       dec->ws->buffer_unmap(old_buf.cs_handle);
-       destroy_buffer(&old_buf);
-       return true;
-
-error:
-       if (src) dec->ws->buffer_unmap(old_buf.cs_handle);
-       destroy_buffer(new_buf);
-       *new_buf = old_buf;
-       return false;
-}
-
-/* clear the buffer with zeros */
-static void clear_buffer(struct ruvd_decoder *dec,
-                        struct ruvd_buffer* buffer)
-{
-       //TODO: let the GPU do the job
-       void *ptr = dec->ws->buffer_map(buffer->cs_handle, dec->cs,
-                                       PIPE_TRANSFER_WRITE);
-       if (!ptr)
-               return;
-
-       memset(ptr, 0, buffer->buf->size);
-       dec->ws->buffer_unmap(buffer->cs_handle);
-}
-
 /* cycle to the next set of buffers */
 static void next_buffer(struct ruvd_decoder *dec)
 {
@@ -667,11 +567,11 @@ static void ruvd_destroy(struct pipe_video_codec *decoder)
        dec->ws->cs_destroy(dec->cs);
 
        for (i = 0; i < NUM_BUFFERS; ++i) {
-               destroy_buffer(&dec->msg_fb_buffers[i]);
-               destroy_buffer(&dec->bs_buffers[i]);
+               rvid_destroy_buffer(&dec->msg_fb_buffers[i]);
+               rvid_destroy_buffer(&dec->bs_buffers[i]);
        }
 
-       destroy_buffer(&dec->dpb);
+       rvid_destroy_buffer(&dec->dpb);
 
        FREE(dec);
 }
@@ -736,13 +636,13 @@ static void ruvd_decode_bitstream(struct pipe_video_codec *decoder,
                return;
 
        for (i = 0; i < num_buffers; ++i) {
-               struct ruvd_buffer *buf = &dec->bs_buffers[dec->cur_buffer];
+               struct rvid_buffer *buf = &dec->bs_buffers[dec->cur_buffer];
                unsigned new_size = dec->bs_size + sizes[i];
 
                if (new_size > buf->buf->size) {
                        dec->ws->buffer_unmap(buf->cs_handle);
-                       if (!resize_buffer(dec, buf, new_size)) {
-                               RUVD_ERR("Can't resize bitstream buffer!");
+                       if (!rvid_resize_buffer(dec->ws, dec->cs, buf, new_size)) {
+                               RVID_ERR("Can't resize bitstream buffer!");
                                return;
                        }
 
@@ -769,7 +669,7 @@ static void ruvd_end_frame(struct pipe_video_codec *decoder,
 {
        struct ruvd_decoder *dec = (struct ruvd_decoder*)decoder;
        struct radeon_winsys_cs_handle *dt;
-       struct ruvd_buffer *msg_fb_buf, *bs_buf;
+       struct rvid_buffer *msg_fb_buf, *bs_buf;
        unsigned bs_size;
 
        assert(decoder);
@@ -903,11 +803,11 @@ struct pipe_video_codec *ruvd_create_decoder(struct pipe_context *context,
        dec->base.flush = ruvd_flush;
 
        dec->set_dtb = set_dtb;
-       dec->stream_handle = alloc_stream_handle();
+       dec->stream_handle = rvid_alloc_stream_handle();
        dec->ws = ws;
        dec->cs = ws->cs_create(ws, RING_UVD, NULL);
        if (!dec->cs) {
-               RUVD_ERR("Can't get command submission context.\n");
+               RVID_ERR("Can't get command submission context.\n");
                goto error;
        }
 
@@ -915,26 +815,26 @@ struct pipe_video_codec *ruvd_create_decoder(struct pipe_context *context,
        for (i = 0; i < NUM_BUFFERS; ++i) {
                unsigned msg_fb_size = FB_BUFFER_OFFSET + FB_BUFFER_SIZE;
                STATIC_ASSERT(sizeof(struct ruvd_msg) <= FB_BUFFER_OFFSET);
-               if (!create_buffer(dec, &dec->msg_fb_buffers[i], msg_fb_size)) {
-                       RUVD_ERR("Can't allocated message buffers.\n");
+               if (!rvid_create_buffer(dec->ws, &dec->msg_fb_buffers[i], msg_fb_size)) {
+                       RVID_ERR("Can't allocated message buffers.\n");
                        goto error;
                }
 
-               if (!create_buffer(dec, &dec->bs_buffers[i], bs_buf_size)) {
-                       RUVD_ERR("Can't allocated bitstream buffers.\n");
+               if (!rvid_create_buffer(dec->ws, &dec->bs_buffers[i], bs_buf_size)) {
+                       RVID_ERR("Can't allocated bitstream buffers.\n");
                        goto error;
                }
 
-               clear_buffer(dec, &dec->msg_fb_buffers[i]);
-               clear_buffer(dec, &dec->bs_buffers[i]);
+               rvid_clear_buffer(dec->ws, dec->cs, &dec->msg_fb_buffers[i]);
+               rvid_clear_buffer(dec->ws, dec->cs, &dec->bs_buffers[i]);
        }
 
-       if (!create_buffer(dec, &dec->dpb, dpb_size)) {
-               RUVD_ERR("Can't allocated dpb.\n");
+       if (!rvid_create_buffer(dec->ws, &dec->dpb, dpb_size)) {
+               RVID_ERR("Can't allocated dpb.\n");
                goto error;
        }
 
-       clear_buffer(dec, &dec->dpb);
+       rvid_clear_buffer(dec->ws, dec->cs, &dec->dpb);
 
        map_msg_fb_buf(dec);
        dec->msg->size = sizeof(*dec->msg);
@@ -954,90 +854,17 @@ error:
        if (dec->cs) dec->ws->cs_destroy(dec->cs);
 
        for (i = 0; i < NUM_BUFFERS; ++i) {
-               destroy_buffer(&dec->msg_fb_buffers[i]);
-               destroy_buffer(&dec->bs_buffers[i]);
+               rvid_destroy_buffer(&dec->msg_fb_buffers[i]);
+               rvid_destroy_buffer(&dec->bs_buffers[i]);
        }
 
-       destroy_buffer(&dec->dpb);
+       rvid_destroy_buffer(&dec->dpb);
 
        FREE(dec);
 
        return NULL;
 }
 
-/**
- * join surfaces into the same buffer with identical tiling params
- * sumup their sizes and replace the backend buffers with a single bo
- */
-void ruvd_join_surfaces(struct radeon_winsys* ws, unsigned bind,
-                       struct pb_buffer** buffers[VL_NUM_COMPONENTS],
-                       struct radeon_surface *surfaces[VL_NUM_COMPONENTS])
-{
-       unsigned best_tiling, best_wh, off;
-       unsigned size, alignment;
-       struct pb_buffer *pb;
-       unsigned i, j;
-
-       for (i = 0, best_tiling = 0, best_wh = ~0; i < VL_NUM_COMPONENTS; ++i) {
-               unsigned wh;
-
-               if (!surfaces[i])
-                       continue;
-
-               /* choose the smallest bank w/h for now */
-               wh = surfaces[i]->bankw * surfaces[i]->bankh;
-               if (wh < best_wh) {
-                       best_wh = wh;
-                       best_tiling = i;
-               }
-       }
-
-       for (i = 0, off = 0; i < VL_NUM_COMPONENTS; ++i) {
-               if (!surfaces[i])
-                       continue;
-
-               /* copy the tiling parameters */
-               surfaces[i]->bankw = surfaces[best_tiling]->bankw;
-               surfaces[i]->bankh = surfaces[best_tiling]->bankh;
-               surfaces[i]->mtilea = surfaces[best_tiling]->mtilea;
-               surfaces[i]->tile_split = surfaces[best_tiling]->tile_split;
-
-               /* adjust the texture layer offsets */
-               off = align(off, surfaces[i]->bo_alignment);
-               for (j = 0; j < Elements(surfaces[i]->level); ++j)
-                       surfaces[i]->level[j].offset += off;
-               off += surfaces[i]->bo_size;
-       }
-
-       for (i = 0, size = 0, alignment = 0; i < VL_NUM_COMPONENTS; ++i) {
-               if (!buffers[i] || !*buffers[i])
-                       continue;
-
-               size = align(size, (*buffers[i])->alignment);
-               size += (*buffers[i])->size;
-               alignment = MAX2(alignment, (*buffers[i])->alignment * 1);
-       }
-
-       if (!size)
-               return;
-
-       /* TODO: 2D tiling workaround */
-       alignment *= 2;
-
-       pb = ws->buffer_create(ws, size, alignment, bind, RADEON_DOMAIN_VRAM);
-       if (!pb)
-               return;
-
-       for (i = 0; i < VL_NUM_COMPONENTS; ++i) {
-               if (!buffers[i] || !*buffers[i])
-                       continue;
-
-               pb_reference(buffers[i], pb);
-       }
-
-       pb_reference(&pb, NULL);
-}
-
 /* calculate top/bottom offset */
 static unsigned texture_offset(struct radeon_surface *surface, unsigned layer)
 {
@@ -1114,94 +941,3 @@ void ruvd_set_dt_surfaces(struct ruvd_msg *msg, struct radeon_surface *luma,
        msg->body.decode.dt_surf_tile_config |= RUVD_BANK_HEIGHT(bank_wh(luma->bankh));
        msg->body.decode.dt_surf_tile_config |= RUVD_MACRO_TILE_ASPECT_RATIO(macro_tile_aspect(luma->mtilea));
 }
-
-int ruvd_get_video_param(struct pipe_screen *screen,
-                        enum pipe_video_profile profile,
-                        enum pipe_video_entrypoint entrypoint,
-                        enum pipe_video_cap param)
-{
-       struct r600_common_screen *rscreen = (struct r600_common_screen *)screen;
-
-       /* UVD 2.x limits */
-       if (rscreen->family < CHIP_PALM) {
-               enum pipe_video_format codec = u_reduce_video_profile(profile);
-               switch (param) {
-               case PIPE_VIDEO_CAP_SUPPORTED:
-                       /* no support for MPEG4 */
-                       return codec != PIPE_VIDEO_FORMAT_MPEG4;
-               case PIPE_VIDEO_CAP_PREFERS_INTERLACED:
-               case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED:
-                       /* and MPEG2 only with shaders */
-                       return codec != PIPE_VIDEO_FORMAT_MPEG12;
-               default:
-                       break;
-               }
-       }
-
-       switch (param) {
-       case PIPE_VIDEO_CAP_SUPPORTED:
-               switch (u_reduce_video_profile(profile)) {
-               case PIPE_VIDEO_FORMAT_MPEG12:
-               case PIPE_VIDEO_FORMAT_MPEG4:
-               case PIPE_VIDEO_FORMAT_MPEG4_AVC:
-                       return true;
-               case PIPE_VIDEO_FORMAT_VC1:
-                       /* FIXME: VC-1 simple/main profile is broken */
-                       return profile == PIPE_VIDEO_PROFILE_VC1_ADVANCED;
-               default:
-                       return false;
-               }
-       case PIPE_VIDEO_CAP_NPOT_TEXTURES:
-               return 1;
-       case PIPE_VIDEO_CAP_MAX_WIDTH:
-               return 2048;
-       case PIPE_VIDEO_CAP_MAX_HEIGHT:
-               return 1152;
-       case PIPE_VIDEO_CAP_PREFERED_FORMAT:
-               return PIPE_FORMAT_NV12;
-       case PIPE_VIDEO_CAP_PREFERS_INTERLACED:
-               return true;
-       case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED:
-               return true;
-       case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE:
-               return true;
-       case PIPE_VIDEO_CAP_MAX_LEVEL:
-               switch (profile) {
-               case PIPE_VIDEO_PROFILE_MPEG1:
-                       return 0;
-               case PIPE_VIDEO_PROFILE_MPEG2_SIMPLE:
-               case PIPE_VIDEO_PROFILE_MPEG2_MAIN:
-                       return 3;
-               case PIPE_VIDEO_PROFILE_MPEG4_SIMPLE:
-                       return 3;
-               case PIPE_VIDEO_PROFILE_MPEG4_ADVANCED_SIMPLE:
-                       return 5;
-               case PIPE_VIDEO_PROFILE_VC1_SIMPLE:
-                       return 1;
-               case PIPE_VIDEO_PROFILE_VC1_MAIN:
-                       return 2;
-               case PIPE_VIDEO_PROFILE_VC1_ADVANCED:
-                       return 4;
-               case PIPE_VIDEO_PROFILE_MPEG4_AVC_BASELINE:
-               case PIPE_VIDEO_PROFILE_MPEG4_AVC_MAIN:
-               case PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH:
-                       return 41;
-               default:
-                       return 0;
-               }
-       default:
-               return 0;
-       }
-}
-
-boolean ruvd_is_format_supported(struct pipe_screen *screen,
-                                enum pipe_format format,
-                                enum pipe_video_profile profile,
-                                enum pipe_video_entrypoint entrypoint)
-{
-       /* we can only handle this one with UVD */
-       if (profile != PIPE_VIDEO_PROFILE_UNKNOWN)
-               return format == PIPE_FORMAT_NV12;
-
-       return vl_video_buffer_is_format_supported(screen, format, profile, entrypoint);
-}
index 6278f12a8aed2203abcfc8865994f0ea0b437e46..8cf70fd57ef327c918d20d6b3588bb0a7410ed31 100644 (file)
@@ -352,26 +352,7 @@ struct pipe_video_codec *ruvd_create_decoder(struct pipe_context *context,
                                             const struct pipe_video_codec *templat,
                                             ruvd_set_dtb set_dtb);
 
-/* join surfaces into the same buffer with identical tiling params
-   sumup their sizes and replace the backend buffers with a single bo */
-void ruvd_join_surfaces(struct radeon_winsys* ws, unsigned bind,
-                       struct pb_buffer** buffers[VL_NUM_COMPONENTS],
-                       struct radeon_surface *surfaces[VL_NUM_COMPONENTS]);
-
 /* fill decoding target field from the luma and chroma surfaces */
 void ruvd_set_dt_surfaces(struct ruvd_msg *msg, struct radeon_surface *luma,
                          struct radeon_surface *chroma);
-
-/* returns supported codecs and other parameters */
-int ruvd_get_video_param(struct pipe_screen *screen,
-                        enum pipe_video_profile profile,
-                        enum pipe_video_entrypoint entrypoint,
-                        enum pipe_video_cap param);
-
-/* the hardware only supports NV12 */
-boolean ruvd_is_format_supported(struct pipe_screen *screen,
-                                enum pipe_format format,
-                                enum pipe_video_profile profile,
-                                enum pipe_video_entrypoint entrypoint);
-
 #endif
diff --git a/src/gallium/drivers/radeon/radeon_video.c b/src/gallium/drivers/radeon/radeon_video.c
new file mode 100644 (file)
index 0000000..3471202
--- /dev/null
@@ -0,0 +1,293 @@
+/**************************************************************************
+ *
+ * Copyright 2013 Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+/*
+ * Authors:
+ *      Christian König <christian.koenig@amd.com>
+ *
+ */
+
+#include <unistd.h>
+
+#include "util/u_memory.h"
+#include "util/u_video.h"
+
+#include "vl/vl_defines.h"
+#include "vl/vl_video_buffer.h"
+
+#include "../../winsys/radeon/drm/radeon_winsys.h"
+#include "r600_pipe_common.h"
+#include "radeon_video.h"
+
+/* generate an stream handle */
+unsigned rvid_alloc_stream_handle()
+{
+       static unsigned counter = 0;
+       unsigned stream_handle = 0;
+       unsigned pid = getpid();
+       int i;
+
+       for (i = 0; i < 32; ++i)
+               stream_handle |= ((pid >> i) & 1) << (31 - i);
+
+       stream_handle ^= ++counter;
+       return stream_handle;
+}
+
+/* create a buffer in the winsys */
+bool rvid_create_buffer(struct radeon_winsys *ws, struct rvid_buffer *buffer, unsigned size)
+{
+       buffer->buf = ws->buffer_create(ws, size, 4096, false, RADEON_DOMAIN_GTT | RADEON_DOMAIN_VRAM);
+       if (!buffer->buf)
+               return false;
+
+       buffer->cs_handle = ws->buffer_get_cs_handle(buffer->buf);
+       if (!buffer->cs_handle)
+               return false;
+
+       return true;
+}
+
+/* destroy a buffer */
+void rvid_destroy_buffer(struct rvid_buffer *buffer)
+{
+       pb_reference(&buffer->buf, NULL);
+       buffer->cs_handle = NULL;
+}
+
+/* reallocate a buffer, preserving its content */
+bool rvid_resize_buffer(struct radeon_winsys *ws, struct radeon_winsys_cs *cs,
+                       struct rvid_buffer *new_buf, unsigned new_size)
+{
+       unsigned bytes = MIN2(new_buf->buf->size, new_size);
+       struct rvid_buffer old_buf = *new_buf;
+       void *src = NULL, *dst = NULL;
+
+       if (!rvid_create_buffer(ws, new_buf, new_size))
+               goto error;
+
+       src = ws->buffer_map(old_buf.cs_handle, cs, PIPE_TRANSFER_READ);
+       if (!src)
+               goto error;
+
+       dst = ws->buffer_map(new_buf->cs_handle, cs, PIPE_TRANSFER_WRITE);
+       if (!dst)
+               goto error;
+
+       memcpy(dst, src, bytes);
+       if (new_size > bytes) {
+               new_size -= bytes;
+               dst += bytes;
+               memset(dst, 0, new_size);
+       }
+       ws->buffer_unmap(new_buf->cs_handle);
+       ws->buffer_unmap(old_buf.cs_handle);
+       rvid_destroy_buffer(&old_buf);
+       return true;
+
+error:
+       if (src)
+               ws->buffer_unmap(old_buf.cs_handle);
+       rvid_destroy_buffer(new_buf);
+       *new_buf = old_buf;
+       return false;
+}
+
+/* clear the buffer with zeros */
+void rvid_clear_buffer(struct radeon_winsys *ws, struct radeon_winsys_cs *cs, struct rvid_buffer* buffer)
+{
+        void *ptr = ws->buffer_map(buffer->cs_handle, cs, PIPE_TRANSFER_WRITE);
+        if (!ptr)
+                return;
+
+        memset(ptr, 0, buffer->buf->size);
+        ws->buffer_unmap(buffer->cs_handle);
+}
+
+/**
+ * join surfaces into the same buffer with identical tiling params
+ * sumup their sizes and replace the backend buffers with a single bo
+ */
+void rvid_join_surfaces(struct radeon_winsys* ws, unsigned bind,
+                       struct pb_buffer** buffers[VL_NUM_COMPONENTS],
+                       struct radeon_surface *surfaces[VL_NUM_COMPONENTS])
+{
+       unsigned best_tiling, best_wh, off;
+       unsigned size, alignment;
+       struct pb_buffer *pb;
+       unsigned i, j;
+
+       for (i = 0, best_tiling = 0, best_wh = ~0; i < VL_NUM_COMPONENTS; ++i) {
+               unsigned wh;
+
+               if (!surfaces[i])
+                       continue;
+
+               /* choose the smallest bank w/h for now */
+               wh = surfaces[i]->bankw * surfaces[i]->bankh;
+               if (wh < best_wh) {
+                       best_wh = wh;
+                       best_tiling = i;
+               }
+       }
+
+       for (i = 0, off = 0; i < VL_NUM_COMPONENTS; ++i) {
+               if (!surfaces[i])
+                       continue;
+
+               /* copy the tiling parameters */
+               surfaces[i]->bankw = surfaces[best_tiling]->bankw;
+               surfaces[i]->bankh = surfaces[best_tiling]->bankh;
+               surfaces[i]->mtilea = surfaces[best_tiling]->mtilea;
+               surfaces[i]->tile_split = surfaces[best_tiling]->tile_split;
+
+               /* adjust the texture layer offsets */
+               off = align(off, surfaces[i]->bo_alignment);
+               for (j = 0; j < Elements(surfaces[i]->level); ++j)
+                       surfaces[i]->level[j].offset += off;
+               off += surfaces[i]->bo_size;
+       }
+
+       for (i = 0, size = 0, alignment = 0; i < VL_NUM_COMPONENTS; ++i) {
+               if (!buffers[i] || !*buffers[i])
+                       continue;
+
+               size = align(size, (*buffers[i])->alignment);
+               size += (*buffers[i])->size;
+               alignment = MAX2(alignment, (*buffers[i])->alignment * 1);
+       }
+
+       if (!size)
+               return;
+
+       /* TODO: 2D tiling workaround */
+       alignment *= 2;
+
+       pb = ws->buffer_create(ws, size, alignment, bind, RADEON_DOMAIN_VRAM);
+       if (!pb)
+               return;
+
+       for (i = 0; i < VL_NUM_COMPONENTS; ++i) {
+               if (!buffers[i] || !*buffers[i])
+                       continue;
+
+               pb_reference(buffers[i], pb);
+       }
+
+       pb_reference(&pb, NULL);
+}
+
+int rvid_get_video_param(struct pipe_screen *screen,
+                        enum pipe_video_profile profile,
+                        enum pipe_video_entrypoint entrypoint,
+                        enum pipe_video_cap param)
+{
+       struct r600_common_screen *rscreen = (struct r600_common_screen *)screen;
+
+       /* UVD 2.x limits */
+       if (rscreen->family < CHIP_PALM) {
+               enum pipe_video_format codec = u_reduce_video_profile(profile);
+               switch (param) {
+               case PIPE_VIDEO_CAP_SUPPORTED:
+                       /* no support for MPEG4 */
+                       return codec != PIPE_VIDEO_FORMAT_MPEG4;
+               case PIPE_VIDEO_CAP_PREFERS_INTERLACED:
+               case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED:
+                       /* and MPEG2 only with shaders */
+                       return codec != PIPE_VIDEO_FORMAT_MPEG12;
+               default:
+                       break;
+               }
+       }
+
+       switch (param) {
+       case PIPE_VIDEO_CAP_SUPPORTED:
+               switch (u_reduce_video_profile(profile)) {
+               case PIPE_VIDEO_FORMAT_MPEG12:
+               case PIPE_VIDEO_FORMAT_MPEG4:
+               case PIPE_VIDEO_FORMAT_MPEG4_AVC:
+                       return true;
+               case PIPE_VIDEO_FORMAT_VC1:
+                       /* FIXME: VC-1 simple/main profile is broken */
+                       return profile == PIPE_VIDEO_PROFILE_VC1_ADVANCED;
+               default:
+                       return false;
+               }
+       case PIPE_VIDEO_CAP_NPOT_TEXTURES:
+               return 1;
+       case PIPE_VIDEO_CAP_MAX_WIDTH:
+               return 2048;
+       case PIPE_VIDEO_CAP_MAX_HEIGHT:
+               return 1152;
+       case PIPE_VIDEO_CAP_PREFERED_FORMAT:
+               return PIPE_FORMAT_NV12;
+       case PIPE_VIDEO_CAP_PREFERS_INTERLACED:
+               return true;
+       case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED:
+               return true;
+       case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE:
+               return true;
+       case PIPE_VIDEO_CAP_MAX_LEVEL:
+               switch (profile) {
+               case PIPE_VIDEO_PROFILE_MPEG1:
+                       return 0;
+               case PIPE_VIDEO_PROFILE_MPEG2_SIMPLE:
+               case PIPE_VIDEO_PROFILE_MPEG2_MAIN:
+                       return 3;
+               case PIPE_VIDEO_PROFILE_MPEG4_SIMPLE:
+                       return 3;
+               case PIPE_VIDEO_PROFILE_MPEG4_ADVANCED_SIMPLE:
+                       return 5;
+               case PIPE_VIDEO_PROFILE_VC1_SIMPLE:
+                       return 1;
+               case PIPE_VIDEO_PROFILE_VC1_MAIN:
+                       return 2;
+               case PIPE_VIDEO_PROFILE_VC1_ADVANCED:
+                       return 4;
+               case PIPE_VIDEO_PROFILE_MPEG4_AVC_BASELINE:
+               case PIPE_VIDEO_PROFILE_MPEG4_AVC_MAIN:
+               case PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH:
+                       return 41;
+               default:
+                       return 0;
+               }
+       default:
+               return 0;
+       }
+}
+
+boolean rvid_is_format_supported(struct pipe_screen *screen,
+                                enum pipe_format format,
+                                enum pipe_video_profile profile,
+                                enum pipe_video_entrypoint entrypoint)
+{
+       /* we can only handle this one with UVD */
+       if (profile != PIPE_VIDEO_PROFILE_UNKNOWN)
+               return format == PIPE_FORMAT_NV12;
+
+       return vl_video_buffer_is_format_supported(screen, format, profile, entrypoint);
+}
diff --git a/src/gallium/drivers/radeon/radeon_video.h b/src/gallium/drivers/radeon/radeon_video.h
new file mode 100644 (file)
index 0000000..7833ddc
--- /dev/null
@@ -0,0 +1,84 @@
+/**************************************************************************
+ *
+ * Copyright 2013 Advanced Micro Devices, Inc.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sub license, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
+ **************************************************************************/
+
+/*
+ * Authors:
+ *      Christian König <christian.koenig@amd.com>
+ *
+ */
+
+#ifndef RADEON_VIDEO_H
+#define RADEON_VIDEO_H
+
+#include "../../winsys/radeon/drm/radeon_winsys.h"
+#include "vl/vl_video_buffer.h"
+
+#define RVID_ERR(fmt, args...) \
+       fprintf(stderr, "EE %s:%d %s UVD - "fmt, __FILE__, __LINE__, __func__, ##args)
+
+/* video buffer representation */
+struct rvid_buffer
+{
+       struct pb_buffer*               buf;
+       struct radeon_winsys_cs_handle* cs_handle;
+};
+
+/* generate an stream handle */
+unsigned rvid_alloc_stream_handle(void);
+
+/* create a buffer in the winsys */
+bool rvid_create_buffer(struct radeon_winsys *ws, struct rvid_buffer *buffer, unsigned size);
+
+/* destroy a buffer */
+void rvid_destroy_buffer(struct rvid_buffer *buffer);
+
+/* reallocate a buffer, preserving its content */
+bool rvid_resize_buffer(struct radeon_winsys *ws, struct radeon_winsys_cs *cs,
+                       struct rvid_buffer *new_buf, unsigned new_size);
+
+/* clear the buffer with zeros */
+void rvid_clear_buffer(struct radeon_winsys *ws, struct radeon_winsys_cs *cs, struct rvid_buffer* buffer);
+
+/* join surfaces into the same buffer with identical tiling params
+   sumup their sizes and replace the backend buffers with a single bo */
+void rvid_join_surfaces(struct radeon_winsys* ws, unsigned bind,
+                        struct pb_buffer** buffers[VL_NUM_COMPONENTS],
+                        struct radeon_surface *surfaces[VL_NUM_COMPONENTS]);
+
+/* returns supported codecs and other parameters */
+int rvid_get_video_param(struct pipe_screen *screen,
+                         enum pipe_video_profile profile,
+                         enum pipe_video_entrypoint entrypoint,
+                         enum pipe_video_cap param);
+
+/* the hardware only supports NV12 */
+boolean rvid_is_format_supported(struct pipe_screen *screen,
+                                 enum pipe_format format,
+                                 enum pipe_video_profile profile,
+                                 enum pipe_video_entrypoint entrypoint);
+
+#endif // RADEON_VIDEO_H
index f0d1427b6f153bbc93173b6abbd12e0c603b8d75..98f1340f6aa122396b15b0994b5ee529e74a3c96 100644 (file)
@@ -32,6 +32,7 @@
  */
 
 #include "si_pipe.h"
+#include "radeon/radeon_video.h"
 #include "radeon/radeon_uvd.h"
 
 /**
@@ -95,7 +96,7 @@ struct pipe_video_buffer *si_video_buffer_create(struct pipe_context *pipe,
                pbs[i] = &resources[i]->resource.buf;
        }
 
-       ruvd_join_surfaces(ctx->b.ws, templ.bind, pbs, surfaces);
+       rvid_join_surfaces(ctx->b.ws, templ.bind, pbs, surfaces);
 
        for (i = 0; i < VL_NUM_COMPONENTS; ++i) {
                if (!resources[i])