From: Sasha Levin <sashal@kernel.org>
To: "Michel Dänzer" <michel@daenzer.net>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
"Pierre-Eric Pelloux-Prayer" <pierre-eric.pelloux-prayer@amd.com>,
"Marek Olšák" <marek.olsak@amd.com>,
amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
"Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>
Subject: Re: [PATCH AUTOSEL 5.6 33/50] drm/amdgpu: bump version for invalidate L2 before SDMA IBs
Date: Sat, 16 May 2020 19:08:10 -0400 [thread overview]
Message-ID: <20200516230810.GH29995@sasha-vm> (raw)
In-Reply-To: <349b2cb9-71f9-a0cd-aceb-308512d7501a@daenzer.net>
On Thu, May 07, 2020 at 06:11:17PM +0200, Michel Dänzer wrote:
>On 2020-05-07 4:27 p.m., Sasha Levin wrote:
>> From: Marek Olšák <marek.olsak@amd.com>
>>
>> [ Upstream commit 9017a4897a20658f010bebea825262963c10afa6 ]
>>
>> This fixes GPU hangs due to cache coherency issues.
>> Bump the driver version. Split out from the original patch.
>>
>> Signed-off-by: Marek Olšák <marek.olsak@amd.com>
>> Reviewed-by: Christian König <christian.koenig@amd.com>
>> Tested-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
>> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>> Signed-off-by: Sasha Levin <sashal@kernel.org>
>> ---
>> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>> index 42f4febe24c6d..8d45a2b662aeb 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>> @@ -85,9 +85,10 @@
>> * - 3.34.0 - Non-DC can flip correctly between buffers with different pitches
>> * - 3.35.0 - Add drm_amdgpu_info_device::tcc_disabled_mask
>> * - 3.36.0 - Allow reading more status registers on si/cik
>> + * - 3.37.0 - L2 is invalidated before SDMA IBs, needed for correctness
>> */
>> #define KMS_DRIVER_MAJOR 3
>> -#define KMS_DRIVER_MINOR 36
>> +#define KMS_DRIVER_MINOR 37
>> #define KMS_DRIVER_PATCHLEVEL 0
>>
>> int amdgpu_vram_limit = 0;
>>
>
>This requires the parent commit fdf83646c0542ecfb9adc4db8f741a1f43dca058
>"drm/amdgpu: invalidate L2 before SDMA IBs (v2)". KMS_DRIVER_MINOR is
>bumped to signal to userspace the fix in that commit is present.
I've grabbed the commit you've pointed out as well as ce73516d42c9
("drm/amdgpu: simplify padding calculations (v2)") to make the backport
apply cleanly, thank you!
--
Thanks,
Sasha
next prev parent reply other threads:[~2020-05-16 23:08 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-07 14:26 [PATCH AUTOSEL 5.6 01/50] RDMA/mlx4: Initialize ib_spec on the stack Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 02/50] RDMA/siw: Fix potential siw_mem refcnt leak in siw_fastreg_mr() Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 03/50] dmaengine: hisilicon: Fix build error without PCI_MSI Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 04/50] dmaengine: ti: k3-psil: fix deadlock on error path Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 05/50] dmaengine: xilinx_dma: Add missing check for empty list Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 06/50] nfs: Fix potential posix_acl refcnt leak in nfs3_set_acl Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 07/50] vfio: avoid possible overflow in vfio_iommu_type1_pin_pages Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 08/50] riscv: fix vdso build with lld Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 09/50] scsi: qla2xxx: set UNLOADING before waiting for session deletion Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 10/50] scsi: qla2xxx: check UNLOADING before posting async work Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 11/50] scsi: target/iblock: fix WRITE SAME zeroing Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 12/50] RDMA/mlx5: Set GRH fields in query QP on RoCE Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 13/50] RDMA/uverbs: Fix a race with disassociate and exit_mmap() Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 14/50] RDMA/core: Prevent mixed use of FDs between shared ufiles Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 15/50] RDMA/core: Fix overwriting of uobj in case of error Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 16/50] dmaengine: pch_dma.c: Avoid data race between probe and irq handler Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 17/50] dmaengine: mmp_tdma: Do not ignore slave config validation errors Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 18/50] dmaengine: mmp_tdma: Reset channel error on release Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 19/50] vfio/type1: Fix VA->PA translation for PFNMAP VMAs in vaddr_get_pfn() Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 20/50] ALSA: hda: Match both PCI ID and SSID for driver blacklist Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 21/50] drm/amd/display: blank dp stream before re-train the link Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 22/50] selftests/ftrace: Check the first record for kprobe_args_type.tc Sasha Levin
2020-05-07 14:26 ` [PATCH AUTOSEL 5.6 23/50] RDMA/core: Fix race between destroy and release FD object Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 24/50] cpufreq: intel_pstate: Only mention the BIOS disabling turbo mode once Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 25/50] dma-buf: Fix SET_NAME ioctl uapi Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 26/50] nvme: prevent double free in nvme_alloc_ns() error handling Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 27/50] dmaengine: fix channel index enumeration Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 28/50] dmaengine: dmatest: Fix iteration non-stop logic Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 29/50] i2c: iproc: generate stop event for slave writes Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 30/50] ALSA: hda/hdmi: fix race in monitor detection during probe Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 31/50] dmaengine: dmatest: Fix process hang when reading 'wait' parameter Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 32/50] drm/amd/powerplay: avoid using pm_en before it is initialized revised Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 33/50] drm/amdgpu: bump version for invalidate L2 before SDMA IBs Sasha Levin
2020-05-07 16:11 ` Michel Dänzer
2020-05-16 23:08 ` Sasha Levin [this message]
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 34/50] SUNRPC: defer slow parts of rpc_free_client() to a workqueue Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 35/50] drm/amd/display: check if REFCLK_CNTL register is present Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 36/50] drm/amd/display: Defer cursor update around VUPDATE for all ASIC Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 37/50] drm/amd/display: Update downspread percent to match spreadsheet for DCN2.1 Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 38/50] Fix use after free in get_tree_bdev() Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 39/50] drm/qxl: lost qxl_bo_kunmap_atomic_page in qxl_image_init_helper() Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 40/50] ALSA: opti9xx: shut up gcc-10 range warning Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 41/50] i2c: aspeed: Avoid i2c interrupt status clear race condition Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 42/50] fibmap: Warn and return an error in case of block > INT_MAX Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 43/50] block: remove the bd_openers checks in blk_drop_partitions Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 44/50] arm64: vdso: Add -fasynchronous-unwind-tables to cflags Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 45/50] io_uring: use cond_resched() in io_ring_ctx_wait_and_kill() Sasha Levin
2020-05-07 14:27 ` [PATCH AUTOSEL 5.6 46/50] iommu/amd: Fix legacy interrupt remapping for x2APIC-enabled system Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200516230810.GH29995@sasha-vm \
--to=sashal@kernel.org \
--cc=alexander.deucher@amd.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marek.olsak@amd.com \
--cc=michel@daenzer.net \
--cc=pierre-eric.pelloux-prayer@amd.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox