ilo: fold drm_intel_get_aperture_sizes() within probe_winsys()

[mesa.git] / src / gallium / drivers / radeon / radeon_video.c

diff --git a/src/gallium/drivers/radeon/radeon_video.c b/src/gallium/drivers/radeon/radeon_video.c
index 63bd805be340d3b04204295080a68283f27b4a37..17e9a59d81d768d4a22e8570998cb141d9e6d093 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_video.c
+++ b/src/gallium/drivers/radeon/radeon_video.c
@@ -61,11 +61,13 @@ unsigned rvid_alloc_stream_handle()
 
 /* create a buffer in the winsys */
 bool rvid_create_buffer(struct radeon_winsys *ws, struct rvid_buffer *buffer,
-                       unsigned size, enum radeon_bo_domain domain)
+                       unsigned size, enum radeon_bo_domain domain,
+                       enum radeon_bo_flag flags)
 {
        buffer->domain = domain;
+       buffer->flags = flags;
 
-       buffer->buf = ws->buffer_create(ws, size, 4096, false, domain);
+       buffer->buf = ws->buffer_create(ws, size, 4096, false, domain, flags);
        if (!buffer->buf)
                return false;
 
@@ -91,7 +93,8 @@ bool rvid_resize_buffer(struct radeon_winsys *ws, struct radeon_winsys_cs *cs,
        struct rvid_buffer old_buf = *new_buf;
        void *src = NULL, *dst = NULL;
 
-       if (!rvid_create_buffer(ws, new_buf, new_size, new_buf->domain))
+       if (!rvid_create_buffer(ws, new_buf, new_size, new_buf->domain,
+                                new_buf->flags))
                goto error;
 
        src = ws->buffer_map(old_buf.cs_handle, cs, PIPE_TRANSFER_READ);
@@ -191,7 +194,7 @@ void rvid_join_surfaces(struct radeon_winsys* ws, unsigned bind,
        /* TODO: 2D tiling workaround */
        alignment *= 2;
 
-       pb = ws->buffer_create(ws, size, alignment, bind, RADEON_DOMAIN_VRAM);
+       pb = ws->buffer_create(ws, size, alignment, bind, RADEON_DOMAIN_VRAM, 0);
        if (!pb)
                return;
 
@@ -242,7 +245,10 @@ int rvid_get_video_param(struct pipe_screen *screen,
                switch (param) {
                case PIPE_VIDEO_CAP_SUPPORTED:
                        /* no support for MPEG4 */
-                       return codec != PIPE_VIDEO_FORMAT_MPEG4;
+                       return codec != PIPE_VIDEO_FORMAT_MPEG4 &&
+                              /* FIXME: VC-1 simple/main profile is broken */
+                              profile != PIPE_VIDEO_PROFILE_VC1_SIMPLE &&
+                              profile != PIPE_VIDEO_PROFILE_VC1_MAIN;
                case PIPE_VIDEO_CAP_PREFERS_INTERLACED:
                case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED:
                        /* and MPEG2 only with shaders */