From: Daniel Vetter Date: Wed, 29 Mar 2023 14:00:23 +0000 (+0200) Subject: Merge v6.3-rc4 into drm-next X-Git-Tag: v6.6.7~2898^2~19 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=82bbec189ab34873688484cd14189a5392946fbb;p=platform%2Fkernel%2Flinux-starfive.git Merge v6.3-rc4 into drm-next I just landed the fence deadline PR from Rob that a bunch of drivers want/need to apply driver-specific patches. Backmerge -rc4 so that they don't have to be stuck on -rc2 for no reason at all. Signed-off-by: Daniel Vetter --- 82bbec189ab34873688484cd14189a5392946fbb diff --cc drivers/gpu/drm/amd/amdgpu/nv.c index 15f3c67,ebe0e2d..47420b4 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c @@@ -520,9 -561,24 +520,9 @@@ static int nv_set_vce_clocks(struct amd return 0; } -static void nv_pcie_gen3_enable(struct amdgpu_device *adev) -{ - if (pci_is_root_bus(adev->pdev->bus)) - return; - - if (amdgpu_pcie_gen2 == 0) - return; - - if (!(adev->pm.pcie_gen_mask & (CAIL_PCIE_LINK_SPEED_SUPPORT_GEN2 | - CAIL_PCIE_LINK_SPEED_SUPPORT_GEN3))) - return; - - /* todo */ -} - static void nv_program_aspm(struct amdgpu_device *adev) { - if (!amdgpu_device_should_use_aspm(adev)) + if (!amdgpu_device_should_use_aspm(adev) || !amdgpu_device_aspm_support_quirk()) return; if (!(adev->flags & AMD_IS_APU) && diff --cc include/drm/drm_gem.h index c76e651,f1f00fc..7bd8e2b --- a/include/drm/drm_gem.h +++ b/include/drm/drm_gem.h @@@ -486,9 -476,9 +486,11 @@@ int drm_gem_dumb_map_offset(struct drm_ void drm_gem_lru_init(struct drm_gem_lru *lru, struct mutex *lock); void drm_gem_lru_remove(struct drm_gem_object *obj); void drm_gem_lru_move_tail(struct drm_gem_lru *lru, struct drm_gem_object *obj); - unsigned long drm_gem_lru_scan(struct drm_gem_lru *lru, unsigned nr_to_scan, + unsigned long drm_gem_lru_scan(struct drm_gem_lru *lru, + unsigned int nr_to_scan, + unsigned long *remaining, bool (*shrink)(struct drm_gem_object *obj)); +int drm_gem_evict(struct drm_gem_object *obj); + #endif /* __DRM_GEM_H__ */