Commit 6ec598cc authored by Stanley.Yang's avatar Stanley.Yang Committed by Alex Deucher
Browse files

drm/amdgpu: fix bad address translation for sienna_cichlid 



Signed-off-by: default avatarStanley.Yang <Stanley.Yang@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 09b6744c

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

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,11 @@ 
#ifndef __AMDGPU_UMC_H__

#define __AMDGPU_UMC_H__



/*

 * (addr / 256) * 4096, the higher 26 bits in ErrorAddr

 * is the index of 4KB block

 */

#define ADDR_OF_4KB_BLOCK(addr)			(((addr) & ~0xffULL) << 4)

/*

 * (addr / 256) * 8192, the higher 26 bits in ErrorAddr

 * is the index of 8KB block

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

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static void umc_v8_7_query_error_address(struct amdgpu_device *adev, 
		err_addr &= ~((0x1ULL << lsb) - 1);



		/* translate umc channel address to soc pa, 3 parts are included */

		retired_page = ADDR_OF_8KB_BLOCK(err_addr) |

		retired_page = ADDR_OF_4KB_BLOCK(err_addr) |

				ADDR_OF_256B_BLOCK(channel_index) |

				OFFSET_IN_256B_BLOCK(err_addr);