Commit f95b8ea7 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Linus Torvalds
Browse files

Revert "venus: firmware: Correct non-pix start and end addresses" 



This reverts commit a837e516, which broke probing of the venus
driver, at least on the SC7180 SoC HP X2 Chromebook:

  qcom-venus aa00000.video-codec: Adding to iommu group 11
  qcom-venus aa00000.video-codec: non legacy binding
  qcom-venus aa00000.video-codec: failed to reset venus core
  qcom-venus: probe of aa00000.video-codec failed with error -110

Matthias Kaehlcke also reported that the same change caused a regression
in SC7180 and sc7280, that prevents AOSS from entering sleep mode during
system suspend.  So let's revert this commit for now to fix both issues.

Fixes: a837e516 ("venus: firmware: Correct non-pix start and end addresses")
Reported-by: default avatarMatthias Kaehlcke <mka@chromium.org>
Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a10ca095

drivers/media/platform/qcom/venus/firmware.c

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ static void venus_reset_cpu(struct venus_core *core) 
	writel(fw_size, wrapper_base + WRAPPER_FW_END_ADDR);

	writel(0, wrapper_base + WRAPPER_CPA_START_ADDR);

	writel(fw_size, wrapper_base + WRAPPER_CPA_END_ADDR);

	writel(0, wrapper_base + WRAPPER_NONPIX_START_ADDR);

	writel(0, wrapper_base + WRAPPER_NONPIX_END_ADDR);

	writel(fw_size, wrapper_base + WRAPPER_NONPIX_START_ADDR);

	writel(fw_size, wrapper_base + WRAPPER_NONPIX_END_ADDR);



	if (IS_V6(core)) {

		/* Bring XTSS out of reset */