mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	drm/amdgpu/jpeg5: reprogram doorbell setting after power up for each playback
Doorbell needs to be configured after power up during each playback Signed-off-by: Sonny Jiang <sonjiang@amd.com> Reviewed-by: Kenneth Feng <kenneth.feng@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
		
							parent
							
								
									83edf00d89
								
							
						
					
					
						commit
						ed3165d660
					
				
					 1 changed files with 4 additions and 4 deletions
				
			
		| 
						 | 
					@ -137,10 +137,6 @@ static int jpeg_v5_0_0_hw_init(void *handle)
 | 
				
			||||||
	adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
 | 
						adev->nbio.funcs->vcn_doorbell_range(adev, ring->use_doorbell,
 | 
				
			||||||
			(adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0);
 | 
								(adev->doorbell_index.vcn.vcn_ring0_1 << 1), 0);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	WREG32_SOC15(VCN, 0, regVCN_JPEG_DB_CTRL,
 | 
					 | 
				
			||||||
			ring->doorbell_index << VCN_JPEG_DB_CTRL__OFFSET__SHIFT |
 | 
					 | 
				
			||||||
			VCN_JPEG_DB_CTRL__EN_MASK);
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
	r = amdgpu_ring_test_helper(ring);
 | 
						r = amdgpu_ring_test_helper(ring);
 | 
				
			||||||
	if (r)
 | 
						if (r)
 | 
				
			||||||
		return r;
 | 
							return r;
 | 
				
			||||||
| 
						 | 
					@ -314,6 +310,10 @@ static int jpeg_v5_0_0_start(struct amdgpu_device *adev)
 | 
				
			||||||
		JPEG_SYS_INT_EN__DJRBC0_MASK,
 | 
							JPEG_SYS_INT_EN__DJRBC0_MASK,
 | 
				
			||||||
		~JPEG_SYS_INT_EN__DJRBC0_MASK);
 | 
							~JPEG_SYS_INT_EN__DJRBC0_MASK);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						WREG32_SOC15(VCN, 0, regVCN_JPEG_DB_CTRL,
 | 
				
			||||||
 | 
							ring->doorbell_index << VCN_JPEG_DB_CTRL__OFFSET__SHIFT |
 | 
				
			||||||
 | 
							VCN_JPEG_DB_CTRL__EN_MASK);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	WREG32_SOC15(JPEG, 0, regUVD_LMI_JRBC_RB_VMID, 0);
 | 
						WREG32_SOC15(JPEG, 0, regUVD_LMI_JRBC_RB_VMID, 0);
 | 
				
			||||||
	WREG32_SOC15(JPEG, 0, regUVD_JRBC_RB_CNTL, (0x00000001L | 0x00000002L));
 | 
						WREG32_SOC15(JPEG, 0, regUVD_JRBC_RB_CNTL, (0x00000001L | 0x00000002L));
 | 
				
			||||||
	WREG32_SOC15(JPEG, 0, regUVD_LMI_JRBC_RB_64BIT_BAR_LOW,
 | 
						WREG32_SOC15(JPEG, 0, regUVD_LMI_JRBC_RB_64BIT_BAR_LOW,
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue