diff --git a/src/gallium/drivers/radeon/radeon_uvd.c b/src/gallium/drivers/radeon/radeon_uvd.c
index 2f98de2..9d571cf 100644
--- a/src/gallium/drivers/radeon/radeon_uvd.c
+++ b/src/gallium/drivers/radeon/radeon_uvd.c
@@ -1113,6 +1113,30 @@ int ruvd_get_video_param(struct pipe_screen *screen,
 		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 51;
+        default:
+            return 0;
+        }
 	default:
 		return 0;
 	}
diff --git a/src/gallium/include/pipe/p_video_enums.h b/src/gallium/include/pipe/p_video_enums.h
index deacf8d..e66948e 100644
--- a/src/gallium/include/pipe/p_video_enums.h
+++ b/src/gallium/include/pipe/p_video_enums.h
@@ -54,7 +54,8 @@ enum pipe_video_cap
    PIPE_VIDEO_CAP_PREFERED_FORMAT = 4,
    PIPE_VIDEO_CAP_PREFERS_INTERLACED = 5,
    PIPE_VIDEO_CAP_SUPPORTS_PROGRESSIVE = 6,
-   PIPE_VIDEO_CAP_SUPPORTS_INTERLACED = 7
+   PIPE_VIDEO_CAP_SUPPORTS_INTERLACED = 7,
+   PIPE_VIDEO_CAP_MAX_LEVEL = 8
 };
 
 enum pipe_video_codec
diff --git a/src/gallium/state_trackers/vdpau/query.c b/src/gallium/state_trackers/vdpau/query.c
index 2281dcf..a6b34c7 100644
--- a/src/gallium/state_trackers/vdpau/query.c
+++ b/src/gallium/state_trackers/vdpau/query.c
@@ -176,13 +176,13 @@ vlVdpDecoderQueryCapabilities(VdpDevice device, VdpDecoderProfile profile,
       *is_supported = false;
       return VDP_STATUS_OK;
    }
-   
+
    pipe_mutex_lock(dev->mutex);
    *is_supported = pscreen->get_video_param(pscreen, p_profile, PIPE_VIDEO_CAP_SUPPORTED);
    if (*is_supported) {
       *max_width = pscreen->get_video_param(pscreen, p_profile, PIPE_VIDEO_CAP_MAX_WIDTH); 
       *max_height = pscreen->get_video_param(pscreen, p_profile, PIPE_VIDEO_CAP_MAX_HEIGHT);
-      *max_level = 16;
+      *max_level = pscreen->get_video_param(pscreen, p_profile, PIPE_VIDEO_CAP_MAX_LEVEL);
       *max_macroblocks = (*max_width/16)*(*max_height/16);
    } else {
       *max_width = 0;