On Thu, Jan 20, 2022 at 09:16:35AM +0100, Christian König wrote: > Am 20.01.22 um 00:55 schrieb Ira Weiny: > > On Wed, Jan 19, 2022 at 06:24:22PM +0100, Daniel Vetter wrote: > > > On Wed, Jan 19, 2022 at 08:53:56AM -0800, Ira Weiny wrote: > > > > On Fri, Dec 10, 2021 at 03:23:57PM -0800, 'Ira Weiny' wrote: > > > > > From: Ira Weiny <ira.weiny@xxxxxxxxx> > > > > > > > > > > This series starts by converting the last easy kmap() uses to > > > > > kmap_local_page(). > > > > > > > > > > There is one more call to kmap() wrapped in ttm_bo_kmap_ttm(). Unfortunately, > > > > > ttm_bo_kmap_ttm() is called in a number of different ways including some which > > > > > are not thread local. I have a patch to convert that call. However, it is not > > > > > straight forward so it is not included in this series. > > > > > > > > > > The final 2 patches fix bugs found while working on the ttm_bo_kmap_ttm() > > > > > conversion. > > > > Gentile ping on this series? Will it make this merge window? > > > I think this fell through the cracks and so no. Note that generally we > > > feature-freeze drm tree around -rc6 anyway for the upcoming merge window, > > > so you were cutting this all a bit close anyway. > > Ok, No problem. I just had not heard if this was picked up or not. > > > > > Also looks like the ttm > > > kmap caching question didn't get resolved? > > I'm sorry I thought it was resolve for this series. Christian said the patches > > in this series were "a good bug fix" even if not strictly necessary.[1] Beyond > > this series I was discussing where to go from here, and is it possible to go > > further with more changes.[2] At the moment I don't think I will. > > > > Christian did I misunderstand? I can drop patch 6 and 7 if they are not proper > > bug fixes or at least clarifications to the code. > > Yeah, it is indeed a correct cleanup. I would just *not* put a CC stable on > it because it doesn't really fix anything. Ok can you pls get the amd/radeon ones stuffed into alex' tree? Or do we want to put all the ttm ones into drm-misc instead? -Daniel > > Christian. > > > > > Ira > > > > [1] https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Flkml%2Fc3b173ea-6509-ebbe-b5f9-eeb29f1ce57e%40amd.com%2F&data=04%7C01%7Cchristian.koenig%40amd.com%7C5e0192210d4640adb88b08d9dba734b1%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637782333459591089%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=4p7jCB6pB4nlcUtLWh6K2Sso9X%2BsRSK7mcD8UavzztQ%3D&reserved=0 > > [2] https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Flkml%2F20211215210949.GW3538886%40iweiny-DESK2.sc.intel.com%2F&data=04%7C01%7Cchristian.koenig%40amd.com%7C5e0192210d4640adb88b08d9dba734b1%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637782333459591089%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=6%2BGfSKshg8Xr%2FXJshiU28yHzbg2HcVisVJLDU6tVUT4%3D&reserved=0 > > > > > Anyway if patches are stuck resend with RESEND and if people still don't > > > pick them up poke me and I'll apply as fallback. > > > > > > Cheers, Daniel > > > > > > > Thanks, > > > > Ira > > > > > > > > > > > > > > Ira Weiny (7): > > > > > drm/i915: Replace kmap() with kmap_local_page() > > > > > drm/amd: Replace kmap() with kmap_local_page() > > > > > drm/gma: Remove calls to kmap() > > > > > drm/radeon: Replace kmap() with kmap_local_page() > > > > > drm/msm: Alter comment to use kmap_local_page() > > > > > drm/amdgpu: Ensure kunmap is called on error > > > > > drm/radeon: Ensure kunmap is called on error > > > > > > > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 8 ++++---- > > > > > drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 1 + > > > > > drivers/gpu/drm/gma500/gma_display.c | 6 ++---- > > > > > drivers/gpu/drm/gma500/mmu.c | 8 ++++---- > > > > > drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 4 ++-- > > > > > drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 8 ++++---- > > > > > drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 4 ++-- > > > > > drivers/gpu/drm/i915/gt/shmem_utils.c | 4 ++-- > > > > > drivers/gpu/drm/i915/i915_gem.c | 8 ++++---- > > > > > drivers/gpu/drm/i915/i915_gpu_error.c | 4 ++-- > > > > > drivers/gpu/drm/msm/msm_gem_submit.c | 4 ++-- > > > > > drivers/gpu/drm/radeon/radeon_ttm.c | 4 ++-- > > > > > drivers/gpu/drm/radeon/radeon_uvd.c | 1 + > > > > > 13 files changed, 32 insertions(+), 32 deletions(-) > > > > > > > > > > -- > > > > > 2.31.1 > > > > > > > > -- > > > Daniel Vetter > > > Software Engineer, Intel Corporation > > > https://nam11.safelinks.protection.outlook.com/?url=http%3A%2F%2Fblog.ffwll.ch%2F&data=04%7C01%7Cchristian.koenig%40amd.com%7C5e0192210d4640adb88b08d9dba734b1%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637782333459591089%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=NLqm91HCdllhW%2BrQ8aHMLXhYGkOJrYffpjsIJZWaFBc%3D&reserved=0 > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
