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 3471202f94bd07c5121c9e59411e226f1f76d110..17e9a59d81d768d4a22e8570998cb141d9e6d093 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_video.c
+++ b/src/gallium/drivers/radeon/radeon_video.c
@@ -42,6 +42,7 @@
 #include "../../winsys/radeon/drm/radeon_winsys.h"
 #include "r600_pipe_common.h"
 #include "radeon_video.h"
+#include "radeon_vce.h"
 
 /* generate an stream handle */
 unsigned rvid_alloc_stream_handle()
@@ -59,9 +60,14 @@ 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)
+bool rvid_create_buffer(struct radeon_winsys *ws, struct rvid_buffer *buffer,
+                       unsigned size, enum radeon_bo_domain domain,
+                       enum radeon_bo_flag flags)
 {
-       buffer->buf = ws->buffer_create(ws, size, 4096, false, RADEON_DOMAIN_GTT | RADEON_DOMAIN_VRAM);
+       buffer->domain = domain;
+       buffer->flags = flags;
+
+       buffer->buf = ws->buffer_create(ws, size, 4096, false, domain, flags);
        if (!buffer->buf)
                return false;
 
@@ -87,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))
+       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);
@@ -187,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;
 
@@ -208,13 +215,40 @@ int rvid_get_video_param(struct pipe_screen *screen,
 {
        struct r600_common_screen *rscreen = (struct r600_common_screen *)screen;
 
+       if (entrypoint == PIPE_VIDEO_ENTRYPOINT_ENCODE) {
+               switch (param) {
+               case PIPE_VIDEO_CAP_SUPPORTED:
+                       return u_reduce_video_profile(profile) == PIPE_VIDEO_FORMAT_MPEG4_AVC &&
+                               rvce_is_fw_version_supported(rscreen);
+               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 false;
+               case PIPE_VIDEO_CAP_SUPPORTS_INTERLACED:
+                       return false;
+               case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE:
+                       return true;
+               default:
+                       return 0;
+               }
+       }
+
        /* 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;
+                       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 */
@@ -230,10 +264,11 @@ int rvid_get_video_param(struct pipe_screen *screen,
                case PIPE_VIDEO_FORMAT_MPEG12:
                case PIPE_VIDEO_FORMAT_MPEG4:
                case PIPE_VIDEO_FORMAT_MPEG4_AVC:
-                       return true;
+                       return entrypoint != PIPE_VIDEO_ENTRYPOINT_ENCODE;
                case PIPE_VIDEO_FORMAT_VC1:
                        /* FIXME: VC-1 simple/main profile is broken */
-                       return profile == PIPE_VIDEO_PROFILE_VC1_ADVANCED;
+                       return profile == PIPE_VIDEO_PROFILE_VC1_ADVANCED &&
+                              entrypoint != PIPE_VIDEO_ENTRYPOINT_ENCODE;
                default:
                        return false;
                }