On Wed, Feb 20, 2019 at 11:00 AM Christian König <[email protected]> wrote: > > Am 20.02.19 um 16:16 schrieb Michael Labriola: > > On Wed, Feb 20, 2019 at 9:30 AM Deucher, Alexander > > <[email protected]> wrote: > >> Reviewed-by: Alex Deucher <[email protected]> > >> ________________________________ > >> From: amd-gfx <[email protected]> on behalf of > >> Christian König <[email protected]> > >> Sent: Wednesday, February 20, 2019 7:47 AM > >> To: [email protected]; [email protected] > >> Subject: [PATCH] drm/amdgpu: fix dma mask check in gmc_v6_0.c > >> > >> This got messed up by "drm: change func to better detect wether swiotlb > >> is needed". > > Shoot, I thought I hunted all those down! Sorry about that. > > Can I get an rb or ab so that I can push it directly after your change?
Reviewed-by: Michael D Labriola <[email protected]> > > BTW: I pushed your change to drm-misc-next and its on it way to upstream. Great, thanks! Is this something that should get fed into the stable branches? -Mike > Christian. > > > > > -Mike > > > >> Signed-off-by: Christian König <[email protected]> > >> --- > >> drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > >> > >> diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c > >> b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c > >> index 9fc3296592fe..98fd9208877f 100644 > >> --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c > >> +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c > >> @@ -886,7 +886,7 @@ static int gmc_v6_0_sw_init(void *handle) > >> pci_set_consistent_dma_mask(adev->pdev, > >> DMA_BIT_MASK(32)); > >> dev_warn(adev->dev, "amdgpu: No coherent DMA > >> available.\n"); > >> } > >> - adev->need_swiotlb = drm_get_max_iomem() > ((u64)1 << dma_bits); > >> + adev->need_swiotlb = drm_need_swiotlb(dma_bits); > >> > >> r = gmc_v6_0_init_microcode(adev); > >> if (r) { > >> -- > >> 2.17.1 > >> > >> _______________________________________________ > >> amd-gfx mailing list > >> [email protected] > >> https://lists.freedesktop.org/mailman/listinfo/amd-gfx > -- Michael D Labriola 21 Rip Van Winkle Cir Warwick, RI 02886 401-316-9844 (cell) 401-848-8871 (work) 401-234-1306 (home) _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
