Commit 995a1460 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'amd-drm-fixes-5.14-2021-07-21' of... 

Merge tag 'amd-drm-fixes-5.14-2021-07-21' of https://gitlab.freedesktop.org/agd5f/linux

 into drm-fixes

amd-drm-fixes-5.14-2021-07-21:

amdgpu:
- Yellow Carp updates
- Add some Yellow Carp DIDs
- Beige Goby updates
- CIK 10bit 4K regression fix
- GFX10 golden settings updates
- eDP panel regression fix
- Misc display fixes
- Aldebaran fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210721215800.17590-1-alexander.deucher@amd.com
parents 2734d6c1 d80cded9

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+7 −0
Original line number Diff line number Diff line
@@ -619,6 +619,13 @@ struct amdgpu_video_codec_info { 
	u32 max_level;

};



#define codec_info_build(type, width, height, level) \

			 .codec_type = type,\

			 .max_width = width,\

			 .max_height = height,\

			 .max_pixels_per_frame = height * width,\

			 .max_level = level,



struct amdgpu_video_codecs {

	const u32 codec_count;

	const struct amdgpu_video_codec_info *codec_array;

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+4 −0
Original line number Diff line number Diff line
@@ -1190,6 +1190,10 @@ static const struct pci_device_id pciidlist[] = { 
	/* Van Gogh */

	{0x1002, 0x163F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_VANGOGH|AMD_IS_APU},



	/* Yellow Carp */

	{0x1002, 0x164D, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_YELLOW_CARP|AMD_IS_APU},

	{0x1002, 0x1681, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_YELLOW_CARP|AMD_IS_APU},



	/* Navy_Flounder */

	{0x1002, 0x73C0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVY_FLOUNDER},

	{0x1002, 0x73C1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_NAVY_FLOUNDER},

drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c

+3 −0
Original line number Diff line number Diff line
@@ -3300,6 +3300,7 @@ static const struct soc15_reg_golden golden_settings_gc_10_3[] = 
	SOC15_REG_GOLDEN_VALUE(GC, 0, mmSQ_PERFCOUNTER7_SELECT, 0xf0f001ff, 0x00000000),

	SOC15_REG_GOLDEN_VALUE(GC, 0, mmSQ_PERFCOUNTER8_SELECT, 0xf0f001ff, 0x00000000),

	SOC15_REG_GOLDEN_VALUE(GC, 0, mmSQ_PERFCOUNTER9_SELECT, 0xf0f001ff, 0x00000000),

	SOC15_REG_GOLDEN_VALUE(GC, 0, mmSX_DEBUG_1, 0x00010000, 0x00010020),

	SOC15_REG_GOLDEN_VALUE(GC, 0, mmTA_CNTL_AUX, 0xfff7ffff, 0x01030000),

	SOC15_REG_GOLDEN_VALUE(GC, 0, mmUTCL1_CTRL, 0xffbfffff, 0x00a00000)

};
@@ -3379,6 +3380,7 @@ static const struct soc15_reg_golden golden_settings_gc_10_3_vangogh[] = 
	SOC15_REG_GOLDEN_VALUE(GC, 0, mmPA_SC_ENHANCE_2, 0xffffffbf, 0x00000020),

	SOC15_REG_GOLDEN_VALUE(GC, 0, mmSPI_CONFIG_CNTL_1_Vangogh, 0xffffffff, 0x00070103),

	SOC15_REG_GOLDEN_VALUE(GC, 0, mmSQG_CONFIG, 0x000017ff, 0x00001000),

	SOC15_REG_GOLDEN_VALUE(GC, 0, mmSX_DEBUG_1, 0x00010000, 0x00010020),

	SOC15_REG_GOLDEN_VALUE(GC, 0, mmTA_CNTL_AUX, 0xfff7ffff, 0x01030000),

	SOC15_REG_GOLDEN_VALUE(GC, 0, mmUTCL1_CTRL, 0xffffffff, 0x00400000),

	SOC15_REG_GOLDEN_VALUE(GC, 0, mmVGT_GS_MAX_WAVE_ID, 0x00000fff, 0x000000ff),
@@ -3445,6 +3447,7 @@ static const struct soc15_reg_golden golden_settings_gc_10_3_4[] = 
	SOC15_REG_GOLDEN_VALUE(GC, 0, mmSQ_PERFCOUNTER7_SELECT, 0xf0f001ff, 0x00000000),

	SOC15_REG_GOLDEN_VALUE(GC, 0, mmSQ_PERFCOUNTER8_SELECT, 0xf0f001ff, 0x00000000),

	SOC15_REG_GOLDEN_VALUE(GC, 0, mmSQ_PERFCOUNTER9_SELECT, 0xf0f001ff, 0x00000000),

	SOC15_REG_GOLDEN_VALUE(GC, 0, mmSX_DEBUG_1, 0x00010000, 0x00010020),

	SOC15_REG_GOLDEN_VALUE(GC, 0, mmTA_CNTL_AUX, 0x01030000, 0x01030000),

	SOC15_REG_GOLDEN_VALUE(GC, 0, mmUTCL1_CTRL, 0x03a00000, 0x00a00000),

	SOC15_REG_GOLDEN_VALUE(GC, 0, mmLDS_CONFIG,  0x00000020, 0x00000020)

drivers/gpu/drm/amd/amdgpu/nv.c

+50 −198
Original line number Diff line number Diff line
@@ -64,32 +64,13 @@ 
#include "smuio_v11_0.h"

#include "smuio_v11_0_6.h"



#define codec_info_build(type, width, height, level) \

			 .codec_type = type,\

			 .max_width = width,\

			 .max_height = height,\

			 .max_pixels_per_frame = height * width,\

			 .max_level = level,



static const struct amd_ip_funcs nv_common_ip_funcs;



/* Navi */

static const struct amdgpu_video_codec_info nv_video_codecs_encode_array[] =

{

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC,

		.max_width = 4096,

		.max_height = 2304,

		.max_pixels_per_frame = 4096 * 2304,

		.max_level = 0,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC,

		.max_width = 4096,

		.max_height = 2304,

		.max_pixels_per_frame = 4096 * 2304,

		.max_level = 0,

	},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, 4096, 2304, 0)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, 4096, 2304, 0)},

};



static const struct amdgpu_video_codecs nv_video_codecs_encode =
@@ -101,55 +82,13 @@ static const struct amdgpu_video_codecs nv_video_codecs_encode = 
/* Navi1x */

static const struct amdgpu_video_codec_info nv_video_codecs_decode_array[] =

{

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 3,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 5,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 52,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 4,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC,

		.max_width = 8192,

		.max_height = 4352,

		.max_pixels_per_frame = 8192 * 4352,

		.max_level = 186,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 0,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9,

		.max_width = 8192,

		.max_height = 4352,

		.max_pixels_per_frame = 8192 * 4352,

		.max_level = 0,

	},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2, 4096, 4906, 3)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4, 4096, 4906, 5)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, 4096, 4906, 52)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1, 4096, 4906, 4)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, 8192, 4352, 186)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG, 4096, 4096, 0)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9, 8192, 4352, 0)},

};



static const struct amdgpu_video_codecs nv_video_codecs_decode =
@@ -161,62 +100,14 @@ static const struct amdgpu_video_codecs nv_video_codecs_decode = 
/* Sienna Cichlid */

static const struct amdgpu_video_codec_info sc_video_codecs_decode_array[] =

{

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 3,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 5,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 52,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 4,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC,

		.max_width = 8192,

		.max_height = 4352,

		.max_pixels_per_frame = 8192 * 4352,

		.max_level = 186,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 0,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9,

		.max_width = 8192,

		.max_height = 4352,

		.max_pixels_per_frame = 8192 * 4352,

		.max_level = 0,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_AV1,

		.max_width = 8192,

		.max_height = 4352,

		.max_pixels_per_frame = 8192 * 4352,

		.max_level = 0,

	},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2, 4096, 4906, 3)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4, 4096, 4906, 5)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, 4096, 4906, 52)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1, 4096, 4906, 4)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, 8192, 4352, 186)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG, 4096, 4096, 0)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9, 8192, 4352, 0)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_AV1, 8192, 4352, 0)},

};



static const struct amdgpu_video_codecs sc_video_codecs_decode =
@@ -228,80 +119,20 @@ static const struct amdgpu_video_codecs sc_video_codecs_decode = 
/* SRIOV Sienna Cichlid, not const since data is controlled by host */

static struct amdgpu_video_codec_info sriov_sc_video_codecs_encode_array[] =

{

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC,

		.max_width = 4096,

		.max_height = 2304,

		.max_pixels_per_frame = 4096 * 2304,

		.max_level = 0,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC,

		.max_width = 4096,

		.max_height = 2304,

		.max_pixels_per_frame = 4096 * 2304,

		.max_level = 0,

	},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, 4096, 2304, 0)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, 4096, 2304, 0)},

};



static struct amdgpu_video_codec_info sriov_sc_video_codecs_decode_array[] =

{

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 3,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 5,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 52,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 4,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC,

		.max_width = 8192,

		.max_height = 4352,

		.max_pixels_per_frame = 8192 * 4352,

		.max_level = 186,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 0,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9,

		.max_width = 8192,

		.max_height = 4352,

		.max_pixels_per_frame = 8192 * 4352,

		.max_level = 0,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_AV1,

		.max_width = 8192,

		.max_height = 4352,

		.max_pixels_per_frame = 8192 * 4352,

		.max_level = 0,

	},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2, 4096, 4906, 3)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4, 4096, 4906, 5)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, 4096, 4906, 52)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1, 4096, 4906, 4)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, 8192, 4352, 186)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG, 4096, 4096, 0)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9, 8192, 4352, 0)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_AV1, 8192, 4352, 0)},

};



static struct amdgpu_video_codecs sriov_sc_video_codecs_encode =
@@ -333,6 +164,19 @@ static const struct amdgpu_video_codecs bg_video_codecs_encode = { 
	.codec_array = NULL,

};



/* Yellow Carp*/

static const struct amdgpu_video_codec_info yc_video_codecs_decode_array[] = {

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, 4096, 4906, 52)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, 8192, 4352, 186)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9, 8192, 4352, 0)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG, 4096, 4096, 0)},

};



static const struct amdgpu_video_codecs yc_video_codecs_decode = {

	.codec_count = ARRAY_SIZE(yc_video_codecs_decode_array),

	.codec_array = yc_video_codecs_decode_array,

};



static int nv_query_video_codecs(struct amdgpu_device *adev, bool encode,

				 const struct amdgpu_video_codecs **codecs)

{
@@ -353,12 +197,17 @@ static int nv_query_video_codecs(struct amdgpu_device *adev, bool encode, 
	case CHIP_NAVY_FLOUNDER:

	case CHIP_DIMGREY_CAVEFISH:

	case CHIP_VANGOGH:

	case CHIP_YELLOW_CARP:

		if (encode)

			*codecs = &nv_video_codecs_encode;

		else

			*codecs = &sc_video_codecs_decode;

		return 0;

	case CHIP_YELLOW_CARP:

		if (encode)

			*codecs = &nv_video_codecs_encode;

		else

			*codecs = &yc_video_codecs_decode;

		return 0;

	case CHIP_BEIGE_GOBY:

		if (encode)

			*codecs = &bg_video_codecs_encode;
@@ -1387,6 +1236,9 @@ static int nv_common_early_init(void *handle) 
			AMD_PG_SUPPORT_VCN |

			AMD_PG_SUPPORT_VCN_DPG |

			AMD_PG_SUPPORT_JPEG;

		if (adev->pdev->device == 0x1681)

			adev->external_rev_id = adev->rev_id + 0x19;

		else

			adev->external_rev_id = adev->rev_id + 0x01;

		break;

	default:

drivers/gpu/drm/amd/amdgpu/soc15.c

+22 −154
Original line number Diff line number Diff line
@@ -88,20 +88,8 @@ 
/* Vega, Raven, Arcturus */

static const struct amdgpu_video_codec_info vega_video_codecs_encode_array[] =

{

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC,

		.max_width = 4096,

		.max_height = 2304,

		.max_pixels_per_frame = 4096 * 2304,

		.max_level = 0,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC,

		.max_width = 4096,

		.max_height = 2304,

		.max_pixels_per_frame = 4096 * 2304,

		.max_level = 0,

	},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, 4096, 2304, 0)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, 4096, 2304, 0)},

};



static const struct amdgpu_video_codecs vega_video_codecs_encode =
@@ -113,48 +101,12 @@ static const struct amdgpu_video_codecs vega_video_codecs_encode = 
/* Vega */

static const struct amdgpu_video_codec_info vega_video_codecs_decode_array[] =

{

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 3,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 5,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 52,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 4,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 186,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 0,

	},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2, 4096, 4906, 3)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4, 4096, 4906, 5)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, 4096, 4906, 52)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1, 4096, 4906, 4)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, 4096, 4096, 186)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG, 4096, 4096, 0)},

};



static const struct amdgpu_video_codecs vega_video_codecs_decode =
@@ -166,55 +118,13 @@ static const struct amdgpu_video_codecs vega_video_codecs_decode = 
/* Raven */

static const struct amdgpu_video_codec_info rv_video_codecs_decode_array[] =

{

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 3,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 5,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 52,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 4,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 186,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 0,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 0,

	},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2, 4096, 4906, 3)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4, 4096, 4906, 5)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, 4096, 4906, 52)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1, 4096, 4906, 4)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, 4096, 4096, 186)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG, 4096, 4096, 0)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9, 4096, 4096, 0)},

};



static const struct amdgpu_video_codecs rv_video_codecs_decode =
@@ -226,55 +136,13 @@ static const struct amdgpu_video_codecs rv_video_codecs_decode = 
/* Renoir, Arcturus */

static const struct amdgpu_video_codec_info rn_video_codecs_decode_array[] =

{

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 3,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 5,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 52,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 4,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC,

		.max_width = 8192,

		.max_height = 4352,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 186,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG,

		.max_width = 4096,

		.max_height = 4096,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 0,

	},

	{

		.codec_type = AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9,

		.max_width = 8192,

		.max_height = 4352,

		.max_pixels_per_frame = 4096 * 4096,

		.max_level = 0,

	},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG2, 4096, 4906, 3)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4, 4096, 4906, 5)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_MPEG4_AVC, 4096, 4906, 52)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VC1, 4096, 4906, 4)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_HEVC, 8192, 4352, 186)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_JPEG, 4096, 4096, 0)},

	{codec_info_build(AMDGPU_INFO_VIDEO_CAPS_CODEC_IDX_VP9, 8192, 4352, 0)},

};



static const struct amdgpu_video_codecs rn_video_codecs_decode =