The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x e0409021e34af50e7b6f31635c8d21583d7c43dd # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2023120351-refinish-obtuse-e77f@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^..
Possible dependencies:
e0409021e34a ("drm/amdgpu: Update EEPROM I2C address for smu v13_0_0") b81fde0dfe40 ("drm/amdgpu: Add I2C EEPROM support on smu v13_0_6") 6246059a19d4 ("drm/amdgpu: simplify amdgpu_ras_eeprom.c") 8782007b5f57 ("drm/amdgpu: Return from switch early for EEPROM I2C address") 1bb745d7596d ("drm/amdgpu: Remove second moot switch to set EEPROM I2C address") 64a3dbb06ad8 ("drm/amdgpu: Add support for RAS table at 0x40000") 3b8164f8084f ("drm/amdgpu: Decouple RAS EEPROM addresses from chips") da858deab88e ("drm/amdgpu: Remove redundant I2C EEPROM address") c9bdc6c3cf39 ("drm/amdgpu: Add EEPROM I2C address support for ip discovery") bc22f8ec464a ("drm/amdgpu: Update ras eeprom support for smu v13_0_0 and v13_0_10")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From e0409021e34af50e7b6f31635c8d21583d7c43dd Mon Sep 17 00:00:00 2001 From: Candice Li candice.li@amd.com Date: Fri, 24 Nov 2023 09:33:47 +0800 Subject: [PATCH] drm/amdgpu: Update EEPROM I2C address for smu v13_0_0
Check smu v13_0_0 SKU type to select EEPROM I2C address.
Signed-off-by: Candice Li candice.li@amd.com Reviewed-by: Hawking Zhang Hawking.Zhang@amd.com Signed-off-by: Alex Deucher alexander.deucher@amd.com Cc: stable@vger.kernel.org # 6.1.x
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c index 65aa218380be..2fde93b00cab 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c @@ -214,6 +214,12 @@ static bool __get_eeprom_i2c_addr(struct amdgpu_device *adev, control->i2c_address = EEPROM_I2C_MADDR_0; return true; case IP_VERSION(13, 0, 0): + if (strnstr(atom_ctx->vbios_pn, "D707", + sizeof(atom_ctx->vbios_pn))) + control->i2c_address = EEPROM_I2C_MADDR_0; + else + control->i2c_address = EEPROM_I2C_MADDR_4; + return true; case IP_VERSION(13, 0, 6): case IP_VERSION(13, 0, 10): control->i2c_address = EEPROM_I2C_MADDR_4;