Commit 45ed97ad authored by James Zhu's avatar James Zhu Committed by Alex Deucher
Browse files

drm/amdgpu: increase MAX setting to hold more jpeg instances 



vcn_v4_0_3 increased jpeg instances,
need increasing MAX resources setting accordlingly.

Signed-off-by: default avatarJames Zhu <James.Zhu@amd.com>
Acked-by Leo Liu <leo.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 73fa2553

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

+3 −3
Original line number Diff line number Diff line
@@ -325,14 +325,14 @@ typedef enum _AMDGPU_DOORBELL_ASSIGNMENT_LAYOUT1 
	AMDGPU_DOORBELL_LAYOUT1_sDMA_ENGINE_END         = 0x19F,

	/* IH: 0x1A0 ~ 0x1AF */

	AMDGPU_DOORBELL_LAYOUT1_IH                      = 0x1A0,

	/* VCN: 0x1B0 ~ 0x1C2 */

	/* VCN: 0x1B0 ~ 0x1D4 */

	AMDGPU_DOORBELL_LAYOUT1_VCN_START               = 0x1B0,

	AMDGPU_DOORBELL_LAYOUT1_VCN_END                 = 0x1C2,

	AMDGPU_DOORBELL_LAYOUT1_VCN_END                 = 0x1D4,



	AMDGPU_DOORBELL_LAYOUT1_FIRST_NON_CP            = AMDGPU_DOORBELL_LAYOUT1_sDMA_ENGINE_START,

	AMDGPU_DOORBELL_LAYOUT1_LAST_NON_CP             = AMDGPU_DOORBELL_LAYOUT1_VCN_END,



	AMDGPU_DOORBELL_LAYOUT1_MAX_ASSIGNMENT          = 0x1C2,

	AMDGPU_DOORBELL_LAYOUT1_MAX_ASSIGNMENT          = 0x1D4,

	AMDGPU_DOORBELL_LAYOUT1_INVALID                 = 0xFFFF

} AMDGPU_DOORBELL_ASSIGNMENT_LAYOUT1;

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 


#include "amdgpu_ras.h"



#define AMDGPU_MAX_JPEG_INSTANCES	2

#define AMDGPU_MAX_JPEG_INSTANCES	4

#define AMDGPU_MAX_JPEG_RINGS		8



#define AMDGPU_JPEG_HARVEST_JPEG0 (1 << 0)

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

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ struct amdgpu_job; 
struct amdgpu_vm;



/* max number of rings */

#define AMDGPU_MAX_RINGS		96

#define AMDGPU_MAX_RINGS		102

#define AMDGPU_MAX_HWIP_RINGS		32

#define AMDGPU_MAX_GFX_RINGS		2

#define AMDGPU_MAX_SW_GFX_RINGS         2