radeon: cleanup driver query list

[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 0bc439070055a9701c8ccbc27c371c8d904abd6f..f56c6cf6cb42ca4841ebd55e732820bf9b7d1584 100644 (file)
--- a/src/gallium/drivers/radeon/radeon_video.c
+++ b/src/gallium/drivers/radeon/radeon_video.c
@@ -39,7 +39,6 @@
 #include "vl/vl_defines.h"
 #include "vl/vl_video_buffer.h"
 
-#include "radeon/drm/radeon_winsys.h"
 #include "r600_pipe_common.h"
 #include "radeon_video.h"
 #include "radeon_vce.h"
@@ -118,14 +117,13 @@ error:
 }
 
 /* clear the buffer with zeros */
-void rvid_clear_buffer(struct radeon_winsys *ws, struct radeon_winsys_cs *cs, struct rvid_buffer* buffer)
+void rvid_clear_buffer(struct pipe_context *context, struct rvid_buffer* buffer)
 {
-       void *ptr = ws->buffer_map(buffer->res->cs_buf, cs, PIPE_TRANSFER_WRITE);
-       if (!ptr)
-               return;
+       struct r600_common_context *rctx = (struct r600_common_context*)context;
 
-       memset(ptr, 0, buffer->res->buf->size);
-       ws->buffer_unmap(buffer->res->cs_buf);
+       rctx->clear_buffer(context, &buffer->res->b.b, 0, buffer->res->buf->size,
+                          0, false);
+       context->flush(context, NULL, 0);
 }
 
 /**
@@ -134,7 +132,7 @@ void rvid_clear_buffer(struct radeon_winsys *ws, struct radeon_winsys_cs *cs, st
  */
 void rvid_join_surfaces(struct radeon_winsys* ws, unsigned bind,
                        struct pb_buffer** buffers[VL_NUM_COMPONENTS],
-                       struct radeon_surface *surfaces[VL_NUM_COMPONENTS])
+                       struct radeon_surf *surfaces[VL_NUM_COMPONENTS])
 {
        unsigned best_tiling, best_wh, off;
        unsigned size, alignment;
@@ -207,18 +205,19 @@ int rvid_get_video_param(struct pipe_screen *screen,
                         enum pipe_video_cap param)
 {
        struct r600_common_screen *rscreen = (struct r600_common_screen *)screen;
+       enum pipe_video_format codec = u_reduce_video_profile(profile);
 
        if (entrypoint == PIPE_VIDEO_ENTRYPOINT_ENCODE) {
                switch (param) {
                case PIPE_VIDEO_CAP_SUPPORTED:
-                       return u_reduce_video_profile(profile) == PIPE_VIDEO_FORMAT_MPEG4_AVC &&
+                       return codec == 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;
+                       return (rscreen->family < CHIP_TONGA) ? 2048 : 4096;
                case PIPE_VIDEO_CAP_MAX_HEIGHT:
-                       return 1152;
+                       return (rscreen->family < CHIP_TONGA) ? 1152 : 2304;
                case PIPE_VIDEO_CAP_PREFERED_FORMAT:
                        return PIPE_FORMAT_NV12;
                case PIPE_VIDEO_CAP_PREFERS_INTERLACED:
@@ -227,58 +226,52 @@ int rvid_get_video_param(struct pipe_screen *screen,
                        return false;
                case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE:
                        return true;
+               case PIPE_VIDEO_CAP_STACKED_FRAMES:
+                       return (rscreen->family < CHIP_TONGA) ? 1 : 2;
                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 &&
-                              /* 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:
-                       /* MPEG2 only with shaders and no support for
-                          interlacing on R6xx style UVD */
-                       return codec != PIPE_VIDEO_FORMAT_MPEG12 &&
-                              rscreen->family > CHIP_RV770;
-               default:
-                       break;
-               }
-       }
-
        switch (param) {
        case PIPE_VIDEO_CAP_SUPPORTED:
-               switch (u_reduce_video_profile(profile)) {
+               switch (codec) {
                case PIPE_VIDEO_FORMAT_MPEG12:
                case PIPE_VIDEO_FORMAT_MPEG4:
                case PIPE_VIDEO_FORMAT_MPEG4_AVC:
-                       return entrypoint != PIPE_VIDEO_ENTRYPOINT_ENCODE;
+                       if (rscreen->family < CHIP_PALM)
+                               /* no support for MPEG4 */
+                               return codec != PIPE_VIDEO_FORMAT_MPEG4;
+                       return true;
                case PIPE_VIDEO_FORMAT_VC1:
-                       /* FIXME: VC-1 simple/main profile is broken */
-                       return profile == PIPE_VIDEO_PROFILE_VC1_ADVANCED &&
-                              entrypoint != PIPE_VIDEO_ENTRYPOINT_ENCODE;
+                       return true;
+               case PIPE_VIDEO_FORMAT_HEVC:
+                       /* Carrizo only supports HEVC Main */
+                       return rscreen->family >= CHIP_CARRIZO &&
+                                  profile == PIPE_VIDEO_PROFILE_HEVC_MAIN;
                default:
                        return false;
                }
        case PIPE_VIDEO_CAP_NPOT_TEXTURES:
                return 1;
        case PIPE_VIDEO_CAP_MAX_WIDTH:
-               return 2048;
+               return (rscreen->family < CHIP_TONGA) ? 2048 : 4096;
        case PIPE_VIDEO_CAP_MAX_HEIGHT:
-               return 1152;
+               return (rscreen->family < CHIP_TONGA) ? 1152 : 2304;
        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;
+               if (rscreen->family < CHIP_PALM) {
+                       /* MPEG2 only with shaders and no support for
+                          interlacing on R6xx style UVD */
+                       return codec != PIPE_VIDEO_FORMAT_MPEG12 &&
+                              rscreen->family > CHIP_RV770;
+               } else {
+                       if (u_reduce_video_profile(profile) == PIPE_VIDEO_FORMAT_HEVC)
+                               return false; //The firmware doesn't support interlaced HEVC.
+                       return true;
+               }
        case PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE:
                return true;
        case PIPE_VIDEO_CAP_MAX_LEVEL:
@@ -302,6 +295,8 @@ int rvid_get_video_param(struct pipe_screen *screen,
                case PIPE_VIDEO_PROFILE_MPEG4_AVC_MAIN:
                case PIPE_VIDEO_PROFILE_MPEG4_AVC_HIGH:
                        return 41;
+               case PIPE_VIDEO_PROFILE_HEVC_MAIN:
+                       return 186;
                default:
                        return 0;
                }