dri-devel November 2019

dri-devel@lists.freedesktop.org

304 participants
1862 discussions

[GIT PULL] drm/tegra: Changes for v5.5-rc1
by Thierry Reding 02 Nov '19

02 Nov '19

Hi Dave, The following changes since commit 9a42c7c647a9ad0f7ebb147a52eda3dcb7c84292: drm/tegra: Move drm_dp_link helpers to Tegra DRM (2019-10-23 18:22:10 +0200) are available in the Git repository at: git://anongit.freedesktop.org/tegra/linux tags/drm/tegra/for-5.5-rc1 for you to fetch changes up to 84db889e6d827eefc3dde130fec8382d2dcb23ac: drm/tegra: Unconditionally select IOMMU_IOVA (2019-11-01 10:49:29 +0100) Note that this is based on the drm-misc-next-2019-10-24-2 tag which contains the DP link helper move into the Tegra DRM driver. The diffstat below shows only the differences since that tag, since the other changes have already been merged as part of drm-misc-next. Thierry ---------------------------------------------------------------- drm/tegra: Changes for v5.5-rc1 The bulk of these changes is the addition of DisplayPort support for Tegra210, Tegra186 and Tegra194. I've been running versions of this for about three years now, so I'd consider these changes to be pretty mature. These changes also unify the existing eDP support with the DP support since the programming is very similar, except for a few steps that can be easily parameterized. The rest are a couple of fixes all over the place for minor issues, as well as some work to support the IOMMU-backed DMA API, which in the end turned out to also clean up a number of cases where the DMA API was not being used correctly. ---------------------------------------------------------------- Ben Dooks (Codethink) (1): gpu: host1x: Make host1x_cdma_wait_pushbuffer_space() static Dariusz Marcinkiewicz (1): drm/tegra: Use cec_notifier_conn_(un)register() Thierry Reding (66): drm/tegra: sor: Move register programming out of ->init() drm/tegra: Fix ordering of cleanup code gpu: host1x: Do not limit DMA segment size gpu: host1x: Remove gratuitous blank line gpu: host1x: Explicitly initialize host1x_info structures gpu: host1x: Request channels for clients, not devices drm/tegra: Inherit device DMA parameters from host1x drm/tegra: Use DRM_DEBUG_DRIVER for driver messages drm/tegra: vic: Skip stream ID programming without IOMMU drm/tegra: vic: Inherit DMA mask from host1x drm/tegra: vic: Use common IOMMU attach/detach code drm/tegra: Move IOMMU group into host1x client drm/tegra: gem: Rename paddr -> iova drm/tegra: gem: Use dma_get_sgtable() drm/tegra: gem: Always map SG tables for DMA-BUFs drm/tegra: gem: Use sg_alloc_table_from_pages() drm/tegra: dpaux: Support monitor hotplugging drm/tegra: dpaux: Retry on transfer size mismatch drm/tegra: dpaux: Fix crash if VDD supply is absent drm/tegra: dpaux: Parameterize CMH, DRVZ and DRVI drm/tegra: Add missing kerneldoc for struct drm_dp_link drm/tegra: dp: Add drm_dp_link_reset() implementation drm/tegra: dp: Track link capabilities alongside settings drm/tegra: dp: Turn link capabilities into booleans drm/tegra: dp: Probe link using existing parsing helpers drm/tegra: dp: Read fast training capability from link drm/tegra: dp: Read TPS3 capability from sink drm/tegra: dp: Read channel coding capability from sink drm/tegra: dp: Read alternate scrambler reset capability from sink drm/tegra: dp: Read eDP version from DPCD drm/tegra: dp: Read AUX read interval from DPCD drm/tegra: dp: Set channel coding on link configuration drm/tegra: dp: Enable alternate scrambler reset when supported drm/tegra: dp: Add drm_dp_link_choose() helper drm/tegra: dp: Add support for eDP link rates drm/tegra: dp: Add DisplayPort link training helper drm/tegra: sor: Use DP link training helpers drm/tegra: sor: Hook up I2C-over-AUX to output drm/tegra: sor: Stabilize eDP drm/tegra: sor: Filter eDP rates drm/tegra: sor: Add DisplayPort support drm/tegra: sor: Remove tegra186-sor1 support drm/tegra: sor: Use correct SOR index on Tegra210 drm/tegra: sor: Implement pad clock for all SOR instances drm/tegra: sor: Deduplicate connector type detection code drm/tegra: sor: Support DisplayPort on Tegra194 drm/tegra: sor: Unify clock setup for eDP, HDMI and DP drm/tegra: sor: Use correct I/O pad for DP drm/tegra: sor: Unify eDP and DP support drm/tegra: sor: Avoid timeouts on unplug events drm/tegra: sor: Extract common audio enabling code drm/tegra: sor: Introduce audio enable/disable callbacks drm/tegra: Do not use ->load() and ->unload() callbacks drm/tegra: Simplify IOMMU group selection gpu: host1x: Overhaul host1x_bo_{pin,unpin}() API gpu: host1x: Clean up debugfs on removal gpu: host1x: Add direction flags to relocations gpu: host1x: Allocate gather copy for host1x gpu: host1x: Support DMA mapping of buffers gpu: host1x: Set DMA mask based on IOMMU setup drm/tegra: Remove memory allocation from Falcon library drm/tegra: falcon: Clarify address usage drm/tegra: Support DMA API for display controllers drm/tegra: Optionally attach clients to the IOMMU gpu: host1x: Unconditionally select IOMMU_IOVA drm/tegra: Unconditionally select IOMMU_IOVA drivers/gpu/drm/tegra/Kconfig | 2 +- drivers/gpu/drm/tegra/dc.c | 30 +- drivers/gpu/drm/tegra/dc.h | 2 - drivers/gpu/drm/tegra/dp.c | 765 +++++++++++++++++- drivers/gpu/drm/tegra/dp.h | 157 +++- drivers/gpu/drm/tegra/dpaux.c | 207 +++-- drivers/gpu/drm/tegra/drm.c | 417 +++++----- drivers/gpu/drm/tegra/drm.h | 13 +- drivers/gpu/drm/tegra/falcon.c | 64 +- drivers/gpu/drm/tegra/falcon.h | 16 +- drivers/gpu/drm/tegra/fb.c | 4 +- drivers/gpu/drm/tegra/gem.c | 81 +- drivers/gpu/drm/tegra/gem.h | 2 +- drivers/gpu/drm/tegra/gr2d.c | 12 +- drivers/gpu/drm/tegra/gr3d.c | 12 +- drivers/gpu/drm/tegra/hub.c | 6 +- drivers/gpu/drm/tegra/output.c | 28 +- drivers/gpu/drm/tegra/plane.c | 104 +++ drivers/gpu/drm/tegra/plane.h | 8 + drivers/gpu/drm/tegra/sor.c | 1703 +++++++++++++++++++++++++--------------- drivers/gpu/drm/tegra/sor.h | 3 + drivers/gpu/drm/tegra/vic.c | 138 ++-- drivers/gpu/host1x/Kconfig | 2 +- drivers/gpu/host1x/bus.c | 2 +- drivers/gpu/host1x/cdma.c | 6 +- drivers/gpu/host1x/channel.c | 13 +- drivers/gpu/host1x/channel.h | 1 + drivers/gpu/host1x/dev.c | 236 ++++-- drivers/gpu/host1x/dev.h | 3 + drivers/gpu/host1x/intr.c | 1 - drivers/gpu/host1x/job.c | 91 ++- drivers/gpu/host1x/job.h | 4 + include/linux/host1x.h | 26 +- 33 files changed, 2873 insertions(+), 1286 deletions(-)

1 0

[radeon-alex:amd-mainline-dkms-5.2 2181/2647] include/kcl/kcl_drm.h:705:20: error: static declaration of 'drm_mode_is_420_only' follows non-static declaration
by kbuild test robot 02 Nov '19

02 Nov '19

tree: git://people.freedesktop.org/~agd5f/linux.git amd-mainline-dkms-5.2 head: b027ed8d9051470f4ed6bc071fcde172fe1fc595 commit: da0ac8c59f795fc9b85174b15fbdf22c77e7b9e0 [2181/2647] drm/amdkcl: check drm_mode_is_420_xxx() is available config: x86_64-randconfig-g002-201943 (attached as .config) compiler: gcc-7 (Debian 7.4.0-14) 7.4.0 reproduce: git checkout da0ac8c59f795fc9b85174b15fbdf22c77e7b9e0 # save the attached .config to linux build tree make ARCH=x86_64 If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> All errors (new ones prefixed by >>): struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32 handle); ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h:360:37: warning: passing argument 2 of 'drm_gem_object_lookup' makes integer from pointer without a cast [-Wint-conversion] return drm_gem_object_lookup(dev, filp, handle); ^~~~ In file included from include/kcl/kcl_drm.h:10:0, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_gem.h:386:24: note: expected 'u32 {aka unsigned int}' but argument is of type 'struct drm_file *' struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32 handle); ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h:360:10: error: too many arguments to function 'drm_gem_object_lookup' return drm_gem_object_lookup(dev, filp, handle); ^~~~~~~~~~~~~~~~~~~~~ In file included from include/kcl/kcl_drm.h:10:0, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_gem.h:386:24: note: declared here struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32 handle); ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h: At top level: include/kcl/kcl_drm.h:369:8: error: redefinition of 'struct drm_format_name_buf' struct drm_format_name_buf { ^~~~~~~~~~~~~~~~~~~ In file included from include/drm/drmP.h:69:0, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_fourcc.h:142:8: note: originally defined here struct drm_format_name_buf { ^~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h: In function 'kcl_drm_gem_object_put_unlocked': include/kcl/kcl_drm.h:401:9: error: implicit declaration of function 'drm_gem_object_unreference_unlocked'; did you mean 'drm_gem_object_put_unlocked'? [-Werror=implicit-function-declaration] return drm_gem_object_unreference_unlocked(obj); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drm_gem_object_put_unlocked include/kcl/kcl_drm.h:401:9: warning: 'return' with a value, in function returning void return drm_gem_object_unreference_unlocked(obj); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h:398:20: note: declared here static inline void kcl_drm_gem_object_put_unlocked(struct drm_gem_object *obj) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h: At top level: include/kcl/kcl_drm.h:586:34: error: redefinition of 'drm_debug_printer' static inline struct drm_printer drm_debug_printer(const char *prefix) ^~~~~~~~~~~~~~~~~ In file included from include/drm/drm_mm.h:49:0, from include/drm/drm_vma_manager.h:26, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/drm/drm_print.h:219:34: note: previous definition of 'drm_debug_printer' was here static inline struct drm_printer drm_debug_printer(const char *prefix) ^~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h:661:20: error: static declaration of 'drm_dev_put' follows non-static declaration static inline void drm_dev_put(struct drm_device *dev) ^~~~~~~~~~~ In file included from include/drm/drmP.h:74:0, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_drv.h:739:6: note: previous declaration of 'drm_dev_put' was here void drm_dev_put(struct drm_device *dev); ^~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h: In function 'drm_dev_put': include/kcl/kcl_drm.h:663:9: error: implicit declaration of function 'drm_dev_unref'; did you mean 'drm_dev_enter'? [-Werror=implicit-function-declaration] return drm_dev_unref(dev); ^~~~~~~~~~~~~ drm_dev_enter include/kcl/kcl_drm.h:663:9: warning: 'return' with a value, in function returning void return drm_dev_unref(dev); ^~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h:661:20: note: declared here static inline void drm_dev_put(struct drm_device *dev) ^~~~~~~~~~~ include/kcl/kcl_drm.h: At top level: include/kcl/kcl_drm.h:668:19: error: static declaration of 'drm_crtc_accurate_vblank_count' follows non-static declaration static inline u64 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from include/drm/drmP.h:82:0, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_vblank.h:218:5: note: previous declaration of 'drm_crtc_accurate_vblank_count' was here u64 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: >> include/kcl/kcl_drm.h:705:20: error: static declaration of 'drm_mode_is_420_only' follows non-static declaration static inline bool drm_mode_is_420_only(const struct drm_display_info *display, ^~~~~~~~~~~~~~~~~~~~ In file included from include/drm/drm_crtc.h:40:0, from include/drm/drmP.h:68, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_modes.h:473:6: note: previous declaration of 'drm_mode_is_420_only' was here bool drm_mode_is_420_only(const struct drm_display_info *display, ^~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: >> include/kcl/kcl_drm.h:712:20: error: static declaration of 'drm_mode_is_420_also' follows non-static declaration static inline bool drm_mode_is_420_also(const struct drm_display_info *display, ^~~~~~~~~~~~~~~~~~~~ In file included from include/drm/drm_crtc.h:40:0, from include/drm/drmP.h:68, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_modes.h:475:6: note: previous declaration of 'drm_mode_is_420_also' was here bool drm_mode_is_420_also(const struct drm_display_info *display, ^~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h: In function 'kcl_get_user_pages': include/kcl/kcl_mm.h:43:24: warning: passing argument 1 of 'get_user_pages' makes integer from pointer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'long unsigned int' but argument is of type 'struct task_struct *' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:43:29: warning: passing argument 2 of 'get_user_pages' makes integer from pointer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'long unsigned int' but argument is of type 'struct mm_struct *' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:43:40: warning: passing argument 4 of 'get_user_pages' makes pointer from integer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'struct page **' but argument is of type 'long unsigned int' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:44:4: warning: passing argument 5 of 'get_user_pages' makes pointer from integer without a cast [-Wint-conversion] write, force, pages, vmas); ^~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'struct vm_area_struct **' but argument is of type 'int' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:43:9: error: too many arguments to function 'get_user_pages' return get_user_pages(tsk, mm, start, nr_pages, ^~~~~~~~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: declared here long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h: At top level: include/kcl/kcl_mm.h:50:28: error: redefinition of 'memalloc_nofs_save' static inline unsigned int memalloc_nofs_save(void) ^~~~~~~~~~~~~~~~~~ In file included from include/kcl/kcl_mm.h:5:0, from drivers/gpu/drm/ttm/backport/backport.h:8, from <command-line>:0: include/linux/sched/mm.h:248:28: note: previous definition of 'memalloc_nofs_save' was here static inline unsigned int memalloc_nofs_save(void) ^~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:55:20: error: redefinition of 'memalloc_nofs_restore' static inline void memalloc_nofs_restore(unsigned int flags) ^~~~~~~~~~~~~~~~~~~~~ In file included from include/kcl/kcl_mm.h:5:0, from drivers/gpu/drm/ttm/backport/backport.h:8, from <command-line>:0: include/linux/sched/mm.h:263:20: note: previous definition of 'memalloc_nofs_restore' was here static inline void memalloc_nofs_restore(unsigned int flags) ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:61:21: error: redefinition of 'kvmalloc' static inline void *kvmalloc(size_t size, gfp_t flags) ^~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, -- struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32 handle); ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h:360:37: warning: passing argument 2 of 'drm_gem_object_lookup' makes integer from pointer without a cast [-Wint-conversion] return drm_gem_object_lookup(dev, filp, handle); ^~~~ In file included from include/kcl/kcl_drm.h:10:0, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_gem.h:386:24: note: expected 'u32 {aka unsigned int}' but argument is of type 'struct drm_file *' struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32 handle); ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h:360:10: error: too many arguments to function 'drm_gem_object_lookup' return drm_gem_object_lookup(dev, filp, handle); ^~~~~~~~~~~~~~~~~~~~~ In file included from include/kcl/kcl_drm.h:10:0, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_gem.h:386:24: note: declared here struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32 handle); ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h: At top level: include/kcl/kcl_drm.h:369:8: error: redefinition of 'struct drm_format_name_buf' struct drm_format_name_buf { ^~~~~~~~~~~~~~~~~~~ In file included from include/drm/drmP.h:69:0, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_fourcc.h:142:8: note: originally defined here struct drm_format_name_buf { ^~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h: In function 'kcl_drm_gem_object_put_unlocked': include/kcl/kcl_drm.h:401:9: error: implicit declaration of function 'drm_gem_object_unreference_unlocked'; did you mean 'drm_gem_object_put_unlocked'? [-Werror=implicit-function-declaration] return drm_gem_object_unreference_unlocked(obj); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drm_gem_object_put_unlocked include/kcl/kcl_drm.h:401:9: warning: 'return' with a value, in function returning void return drm_gem_object_unreference_unlocked(obj); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h:398:20: note: declared here static inline void kcl_drm_gem_object_put_unlocked(struct drm_gem_object *obj) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h: At top level: include/kcl/kcl_drm.h:586:34: error: redefinition of 'drm_debug_printer' static inline struct drm_printer drm_debug_printer(const char *prefix) ^~~~~~~~~~~~~~~~~ In file included from include/drm/drm_mm.h:49:0, from include/drm/drm_vma_manager.h:26, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/drm/drm_print.h:219:34: note: previous definition of 'drm_debug_printer' was here static inline struct drm_printer drm_debug_printer(const char *prefix) ^~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h:661:20: error: static declaration of 'drm_dev_put' follows non-static declaration static inline void drm_dev_put(struct drm_device *dev) ^~~~~~~~~~~ In file included from include/drm/drmP.h:74:0, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_drv.h:739:6: note: previous declaration of 'drm_dev_put' was here void drm_dev_put(struct drm_device *dev); ^~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h: In function 'drm_dev_put': include/kcl/kcl_drm.h:663:9: error: implicit declaration of function 'drm_dev_unref'; did you mean 'drm_dev_enter'? [-Werror=implicit-function-declaration] return drm_dev_unref(dev); ^~~~~~~~~~~~~ drm_dev_enter include/kcl/kcl_drm.h:663:9: warning: 'return' with a value, in function returning void return drm_dev_unref(dev); ^~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h:661:20: note: declared here static inline void drm_dev_put(struct drm_device *dev) ^~~~~~~~~~~ include/kcl/kcl_drm.h: At top level: include/kcl/kcl_drm.h:668:19: error: static declaration of 'drm_crtc_accurate_vblank_count' follows non-static declaration static inline u64 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from include/drm/drmP.h:82:0, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_vblank.h:218:5: note: previous declaration of 'drm_crtc_accurate_vblank_count' was here u64 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: >> include/kcl/kcl_drm.h:705:20: error: static declaration of 'drm_mode_is_420_only' follows non-static declaration static inline bool drm_mode_is_420_only(const struct drm_display_info *display, ^~~~~~~~~~~~~~~~~~~~ In file included from include/drm/drm_crtc.h:40:0, from include/drm/drmP.h:68, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_modes.h:473:6: note: previous declaration of 'drm_mode_is_420_only' was here bool drm_mode_is_420_only(const struct drm_display_info *display, ^~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: >> include/kcl/kcl_drm.h:712:20: error: static declaration of 'drm_mode_is_420_also' follows non-static declaration static inline bool drm_mode_is_420_also(const struct drm_display_info *display, ^~~~~~~~~~~~~~~~~~~~ In file included from include/drm/drm_crtc.h:40:0, from include/drm/drmP.h:68, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_modes.h:475:6: note: previous declaration of 'drm_mode_is_420_also' was here bool drm_mode_is_420_also(const struct drm_display_info *display, ^~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h: In function 'kcl_get_user_pages': include/kcl/kcl_mm.h:43:24: warning: passing argument 1 of 'get_user_pages' makes integer from pointer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'long unsigned int' but argument is of type 'struct task_struct *' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:43:29: warning: passing argument 2 of 'get_user_pages' makes integer from pointer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'long unsigned int' but argument is of type 'struct mm_struct *' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:43:40: warning: passing argument 4 of 'get_user_pages' makes pointer from integer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'struct page **' but argument is of type 'long unsigned int' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:44:4: warning: passing argument 5 of 'get_user_pages' makes pointer from integer without a cast [-Wint-conversion] write, force, pages, vmas); ^~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'struct vm_area_struct **' but argument is of type 'int' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:43:9: error: too many arguments to function 'get_user_pages' return get_user_pages(tsk, mm, start, nr_pages, ^~~~~~~~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: declared here long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h: At top level: include/kcl/kcl_mm.h:50:28: error: redefinition of 'memalloc_nofs_save' static inline unsigned int memalloc_nofs_save(void) ^~~~~~~~~~~~~~~~~~ In file included from include/kcl/kcl_mm.h:5:0, from drivers/gpu/drm/ttm/backport/backport.h:8, from <command-line>:0: include/linux/sched/mm.h:248:28: note: previous definition of 'memalloc_nofs_save' was here static inline unsigned int memalloc_nofs_save(void) ^~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:55:20: error: redefinition of 'memalloc_nofs_restore' static inline void memalloc_nofs_restore(unsigned int flags) ^~~~~~~~~~~~~~~~~~~~~ In file included from include/kcl/kcl_mm.h:5:0, from drivers/gpu/drm/ttm/backport/backport.h:8, from <command-line>:0: include/linux/sched/mm.h:263:20: note: previous definition of 'memalloc_nofs_restore' was here static inline void memalloc_nofs_restore(unsigned int flags) ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:61:21: error: redefinition of 'kvmalloc' static inline void *kvmalloc(size_t size, gfp_t flags) ^~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, .. vim +/drm_mode_is_420_only +705 include/kcl/kcl_drm.h 703 704 #ifndef HAVE_DRM_MODE_IS_420_XXX > 705 static inline bool drm_mode_is_420_only(const struct drm_display_info *display, 706 const struct drm_display_mode *mode) 707 { 708 /* DRM < 4.4 ,un-support this pixel format */ 709 printk_once(KERN_WARNING "This kernel version not support API: drm_mode_is_420_only!\n"); 710 return false; 711 } > 712 static inline bool drm_mode_is_420_also(const struct drm_display_info *display, 713 const struct drm_display_mode *mode) 714 { 715 printk_once(KERN_WARNING "This kernel version not support API: drm_mode_is_420_also!\n"); 716 return false; 717 } 718 #endif 719 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[PATCH] drm/nouveau/bios/init: make const arrays probe_order static, makes object smaller
by Colin King 02 Nov '19

02 Nov '19

From: Colin Ian King <colin.king(a)canonical.com> Don't populate const arrays on the stack but instead make them static. Makes the object code smaller by 6 bytes. Before: text data bss dec hex filename 103075 9692 0 112767 1b87f nvkm/subdev/bios/init.o After: text data bss dec hex filename 102909 9852 0 112761 1b879 nvkm/subdev/bios/init.o (gcc version 9.2.1, amd64) Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c index 9de74f41dcd2..dc8625eff20a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c @@ -546,9 +546,9 @@ init_tmds_reg(struct nvbios_init *init, u8 tmds) * CR58 for CR57 = 0 to index a table of offsets to the basic * 0x6808b0 address, and then flip the offset by 8. */ - const int pramdac_offset[13] = { + static const int pramdac_offset[13] = { 0, 0, 0x8, 0, 0x2000, 0, 0, 0, 0x2008, 0, 0, 0, 0x2000 }; - const u32 pramdac_table[4] = { + static const u32 pramdac_table[4] = { 0x6808b0, 0x6808b8, 0x6828b0, 0x6828b8 }; if (tmds >= 0x80) { -- 2.20.1

1 0

[radeon-alex:amd-mainline-dkms-5.2 2163/2647] include/kcl/kcl_drm.h:614:19: error: static declaration of 'drm_crtc_accurate_vblank_count' follows non-static declaration
by kbuild test robot 02 Nov '19

02 Nov '19

tree: git://people.freedesktop.org/~agd5f/linux.git amd-mainline-dkms-5.2 head: b027ed8d9051470f4ed6bc071fcde172fe1fc595 commit: ce2ac7946ad9ad370cf8212eab6d5651ba5520c6 [2163/2647] drm/amdkcl: use kcl to leverage drm_crtc_accurate_vblank_count change config: x86_64-randconfig-g002-201943 (attached as .config) compiler: gcc-7 (Debian 7.4.0-14) 7.4.0 reproduce: git checkout ce2ac7946ad9ad370cf8212eab6d5651ba5520c6 # save the attached .config to linux build tree make ARCH=x86_64 If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> All errors (new ones prefixed by >>): int drm_universal_plane_init(struct drm_device *dev, ^~~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h: In function 'kcl_drm_gem_object_lookup': include/kcl/kcl_drm.h:306:32: error: passing argument 1 of 'drm_gem_object_lookup' from incompatible pointer type [-Werror=incompatible-pointer-types] return drm_gem_object_lookup(dev, filp, handle); ^~~ In file included from include/kcl/kcl_drm.h:9:0, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_gem.h:386:24: note: expected 'struct drm_file *' but argument is of type 'struct drm_device *' struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32 handle); ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h:306:37: warning: passing argument 2 of 'drm_gem_object_lookup' makes integer from pointer without a cast [-Wint-conversion] return drm_gem_object_lookup(dev, filp, handle); ^~~~ In file included from include/kcl/kcl_drm.h:9:0, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_gem.h:386:24: note: expected 'u32 {aka unsigned int}' but argument is of type 'struct drm_file *' struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32 handle); ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h:306:10: error: too many arguments to function 'drm_gem_object_lookup' return drm_gem_object_lookup(dev, filp, handle); ^~~~~~~~~~~~~~~~~~~~~ In file included from include/kcl/kcl_drm.h:9:0, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_gem.h:386:24: note: declared here struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32 handle); ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h: At top level: include/kcl/kcl_drm.h:315:8: error: redefinition of 'struct drm_format_name_buf' struct drm_format_name_buf { ^~~~~~~~~~~~~~~~~~~ In file included from include/drm/drmP.h:69:0, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_fourcc.h:142:8: note: originally defined here struct drm_format_name_buf { ^~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h: In function 'kcl_drm_gem_object_put_unlocked': include/kcl/kcl_drm.h:347:9: error: implicit declaration of function 'drm_gem_object_unreference_unlocked'; did you mean 'drm_gem_object_put_unlocked'? [-Werror=implicit-function-declaration] return drm_gem_object_unreference_unlocked(obj); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drm_gem_object_put_unlocked include/kcl/kcl_drm.h:347:9: warning: 'return' with a value, in function returning void return drm_gem_object_unreference_unlocked(obj); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h:344:20: note: declared here static inline void kcl_drm_gem_object_put_unlocked(struct drm_gem_object *obj) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h: At top level: include/kcl/kcl_drm.h:532:34: error: redefinition of 'drm_debug_printer' static inline struct drm_printer drm_debug_printer(const char *prefix) ^~~~~~~~~~~~~~~~~ In file included from include/drm/drm_mm.h:49:0, from include/drm/drm_vma_manager.h:26, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/drm/drm_print.h:219:34: note: previous definition of 'drm_debug_printer' was here static inline struct drm_printer drm_debug_printer(const char *prefix) ^~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h:607:20: error: static declaration of 'drm_dev_put' follows non-static declaration static inline void drm_dev_put(struct drm_device *dev) ^~~~~~~~~~~ In file included from include/drm/drmP.h:74:0, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_drv.h:739:6: note: previous declaration of 'drm_dev_put' was here void drm_dev_put(struct drm_device *dev); ^~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h: In function 'drm_dev_put': include/kcl/kcl_drm.h:609:9: error: implicit declaration of function 'drm_dev_unref'; did you mean 'drm_dev_enter'? [-Werror=implicit-function-declaration] return drm_dev_unref(dev); ^~~~~~~~~~~~~ drm_dev_enter include/kcl/kcl_drm.h:609:9: warning: 'return' with a value, in function returning void return drm_dev_unref(dev); ^~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h:607:20: note: declared here static inline void drm_dev_put(struct drm_device *dev) ^~~~~~~~~~~ include/kcl/kcl_drm.h: At top level: >> include/kcl/kcl_drm.h:614:19: error: static declaration of 'drm_crtc_accurate_vblank_count' follows non-static declaration static inline u64 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from include/drm/drmP.h:82:0, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_vblank.h:218:5: note: previous declaration of 'drm_crtc_accurate_vblank_count' was here u64 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h: In function 'kcl_get_user_pages': include/kcl/kcl_mm.h:43:24: warning: passing argument 1 of 'get_user_pages' makes integer from pointer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'long unsigned int' but argument is of type 'struct task_struct *' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:43:29: warning: passing argument 2 of 'get_user_pages' makes integer from pointer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'long unsigned int' but argument is of type 'struct mm_struct *' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:43:40: warning: passing argument 4 of 'get_user_pages' makes pointer from integer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'struct page **' but argument is of type 'long unsigned int' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:44:4: warning: passing argument 5 of 'get_user_pages' makes pointer from integer without a cast [-Wint-conversion] write, force, pages, vmas); ^~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'struct vm_area_struct **' but argument is of type 'int' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:43:9: error: too many arguments to function 'get_user_pages' return get_user_pages(tsk, mm, start, nr_pages, ^~~~~~~~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: declared here long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h: At top level: include/kcl/kcl_mm.h:50:28: error: redefinition of 'memalloc_nofs_save' static inline unsigned int memalloc_nofs_save(void) ^~~~~~~~~~~~~~~~~~ In file included from include/kcl/kcl_mm.h:5:0, from drivers/gpu/drm/ttm/backport/backport.h:8, from <command-line>:0: include/linux/sched/mm.h:248:28: note: previous definition of 'memalloc_nofs_save' was here static inline unsigned int memalloc_nofs_save(void) ^~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:55:20: error: redefinition of 'memalloc_nofs_restore' static inline void memalloc_nofs_restore(unsigned int flags) ^~~~~~~~~~~~~~~~~~~~~ In file included from include/kcl/kcl_mm.h:5:0, from drivers/gpu/drm/ttm/backport/backport.h:8, from <command-line>:0: include/linux/sched/mm.h:263:20: note: previous definition of 'memalloc_nofs_restore' was here static inline void memalloc_nofs_restore(unsigned int flags) ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:61:21: error: redefinition of 'kvmalloc' static inline void *kvmalloc(size_t size, gfp_t flags) ^~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, -- int drm_universal_plane_init(struct drm_device *dev, ^~~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h: In function 'kcl_drm_gem_object_lookup': include/kcl/kcl_drm.h:306:32: error: passing argument 1 of 'drm_gem_object_lookup' from incompatible pointer type [-Werror=incompatible-pointer-types] return drm_gem_object_lookup(dev, filp, handle); ^~~ In file included from include/kcl/kcl_drm.h:9:0, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_gem.h:386:24: note: expected 'struct drm_file *' but argument is of type 'struct drm_device *' struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32 handle); ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h:306:37: warning: passing argument 2 of 'drm_gem_object_lookup' makes integer from pointer without a cast [-Wint-conversion] return drm_gem_object_lookup(dev, filp, handle); ^~~~ In file included from include/kcl/kcl_drm.h:9:0, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_gem.h:386:24: note: expected 'u32 {aka unsigned int}' but argument is of type 'struct drm_file *' struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32 handle); ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h:306:10: error: too many arguments to function 'drm_gem_object_lookup' return drm_gem_object_lookup(dev, filp, handle); ^~~~~~~~~~~~~~~~~~~~~ In file included from include/kcl/kcl_drm.h:9:0, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_gem.h:386:24: note: declared here struct drm_gem_object *drm_gem_object_lookup(struct drm_file *filp, u32 handle); ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h: At top level: include/kcl/kcl_drm.h:315:8: error: redefinition of 'struct drm_format_name_buf' struct drm_format_name_buf { ^~~~~~~~~~~~~~~~~~~ In file included from include/drm/drmP.h:69:0, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_fourcc.h:142:8: note: originally defined here struct drm_format_name_buf { ^~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h: In function 'kcl_drm_gem_object_put_unlocked': include/kcl/kcl_drm.h:347:9: error: implicit declaration of function 'drm_gem_object_unreference_unlocked'; did you mean 'drm_gem_object_put_unlocked'? [-Werror=implicit-function-declaration] return drm_gem_object_unreference_unlocked(obj); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drm_gem_object_put_unlocked include/kcl/kcl_drm.h:347:9: warning: 'return' with a value, in function returning void return drm_gem_object_unreference_unlocked(obj); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h:344:20: note: declared here static inline void kcl_drm_gem_object_put_unlocked(struct drm_gem_object *obj) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h: At top level: include/kcl/kcl_drm.h:532:34: error: redefinition of 'drm_debug_printer' static inline struct drm_printer drm_debug_printer(const char *prefix) ^~~~~~~~~~~~~~~~~ In file included from include/drm/drm_mm.h:49:0, from include/drm/drm_vma_manager.h:26, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/drm/drm_print.h:219:34: note: previous definition of 'drm_debug_printer' was here static inline struct drm_printer drm_debug_printer(const char *prefix) ^~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h:607:20: error: static declaration of 'drm_dev_put' follows non-static declaration static inline void drm_dev_put(struct drm_device *dev) ^~~~~~~~~~~ In file included from include/drm/drmP.h:74:0, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_drv.h:739:6: note: previous declaration of 'drm_dev_put' was here void drm_dev_put(struct drm_device *dev); ^~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h: In function 'drm_dev_put': include/kcl/kcl_drm.h:609:9: error: implicit declaration of function 'drm_dev_unref'; did you mean 'drm_dev_enter'? [-Werror=implicit-function-declaration] return drm_dev_unref(dev); ^~~~~~~~~~~~~ drm_dev_enter include/kcl/kcl_drm.h:609:9: warning: 'return' with a value, in function returning void return drm_dev_unref(dev); ^~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h:607:20: note: declared here static inline void drm_dev_put(struct drm_device *dev) ^~~~~~~~~~~ include/kcl/kcl_drm.h: At top level: >> include/kcl/kcl_drm.h:614:19: error: static declaration of 'drm_crtc_accurate_vblank_count' follows non-static declaration static inline u64 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from include/drm/drmP.h:82:0, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_vblank.h:218:5: note: previous declaration of 'drm_crtc_accurate_vblank_count' was here u64 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h: In function 'kcl_get_user_pages': include/kcl/kcl_mm.h:43:24: warning: passing argument 1 of 'get_user_pages' makes integer from pointer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'long unsigned int' but argument is of type 'struct task_struct *' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:43:29: warning: passing argument 2 of 'get_user_pages' makes integer from pointer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'long unsigned int' but argument is of type 'struct mm_struct *' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:43:40: warning: passing argument 4 of 'get_user_pages' makes pointer from integer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'struct page **' but argument is of type 'long unsigned int' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:44:4: warning: passing argument 5 of 'get_user_pages' makes pointer from integer without a cast [-Wint-conversion] write, force, pages, vmas); ^~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'struct vm_area_struct **' but argument is of type 'int' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:43:9: error: too many arguments to function 'get_user_pages' return get_user_pages(tsk, mm, start, nr_pages, ^~~~~~~~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: declared here long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h: At top level: include/kcl/kcl_mm.h:50:28: error: redefinition of 'memalloc_nofs_save' static inline unsigned int memalloc_nofs_save(void) ^~~~~~~~~~~~~~~~~~ In file included from include/kcl/kcl_mm.h:5:0, from drivers/gpu/drm/ttm/backport/backport.h:8, from <command-line>:0: include/linux/sched/mm.h:248:28: note: previous definition of 'memalloc_nofs_save' was here static inline unsigned int memalloc_nofs_save(void) ^~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:55:20: error: redefinition of 'memalloc_nofs_restore' static inline void memalloc_nofs_restore(unsigned int flags) ^~~~~~~~~~~~~~~~~~~~~ In file included from include/kcl/kcl_mm.h:5:0, from drivers/gpu/drm/ttm/backport/backport.h:8, from <command-line>:0: include/linux/sched/mm.h:263:20: note: previous definition of 'memalloc_nofs_restore' was here static inline void memalloc_nofs_restore(unsigned int flags) ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:61:21: error: redefinition of 'kvmalloc' static inline void *kvmalloc(size_t size, gfp_t flags) ^~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, .. vim +/drm_crtc_accurate_vblank_count +614 include/kcl/kcl_drm.h 605 606 #ifndef HAVE_DRM_DEV_PUT 607 static inline void drm_dev_put(struct drm_device *dev) 608 { > 609 return drm_dev_unref(dev); 610 } 611 #endif 612 613 #if !defined(HAVE_DRM_CRTC_ACCURATE_VBLANK_COUNT) > 614 static inline u64 drm_crtc_accurate_vblank_count(struct drm_crtc *crtc) 615 { 616 #if defined(HAVE_DRM_ACCURATE_VBLANK_COUNT) 617 return drm_accurate_vblank_count(crtc); 618 #else 619 pr_warn_once("drm_crtc_accurate_vblank_count is not supported"); 620 return 0; 621 #endif 622 } 623 #endif 624 --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[bug report] dma-buf: heaps: Add heap helpers
by Dan Carpenter 02 Nov '19

02 Nov '19

Hello John Stultz, The patch 7b87ea704fd9: "dma-buf: heaps: Add heap helpers" from Oct 21, 2019, leads to the following static checker warning: drivers/dma-buf/heaps/heap-helpers.c:165 dma_heap_vm_fault() warn: uncapped user index 'buffer->pages[vmf->pgoff]' drivers/dma-buf/heaps/heap-helpers.c 160 static vm_fault_t dma_heap_vm_fault(struct vm_fault *vmf) 161 { 162 struct vm_area_struct *vma = vmf->vma; 163 struct heap_helper_buffer *buffer = vma->vm_private_data; 164 165 vmf->page = buffer->pages[vmf->pgoff]; ^^^^^^^^^^ Smatch for some reason thinks this needs to be checked. Smatch also gets confused by these fault handlers and thinks there is some recursion involved... 166 get_page(vmf->page); 167 168 return 0; 169 } 170 171 static const struct vm_operations_struct dma_heap_vm_ops = { 172 .fault = dma_heap_vm_fault, 173 }; 174 regards, dan carpenter

2 2

[PATCH -next] gpu: host1x: Remove dev_err() on platform_get_irq() failure
by YueHaibing 02 Nov '19

02 Nov '19

platform_get_irq() will call dev_err() itself on failure, so there is no need for the driver to also do this. This is detected by coccinelle. Signed-off-by: YueHaibing <yuehaibing(a)huawei.com> --- drivers/gpu/host1x/dev.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c index a738ea5..388bcc2 100644 --- a/drivers/gpu/host1x/dev.c +++ b/drivers/gpu/host1x/dev.c @@ -339,10 +339,8 @@ static int host1x_probe(struct platform_device *pdev) } syncpt_irq = platform_get_irq(pdev, 0); - if (syncpt_irq < 0) { - dev_err(&pdev->dev, "failed to get IRQ: %d\n", syncpt_irq); + if (syncpt_irq < 0) return syncpt_irq; - } mutex_init(&host->devices_lock); INIT_LIST_HEAD(&host->devices); -- 2.7.4

1 0

[radeon-alex:amd-mainline-dkms-5.2 2161/2647] include/kcl/kcl_mm.h:43:9: error: too many arguments to function 'get_user_pages'
by kbuild test robot 02 Nov '19

02 Nov '19

tree: git://people.freedesktop.org/~agd5f/linux.git amd-mainline-dkms-5.2 head: b027ed8d9051470f4ed6bc071fcde172fe1fc595 commit: f56288ab7a001e359739d486be8aae78cf09081b [2161/2647] drm/amdkcl: Test whether get_user_{pages,pages_remote}() wants {5/6,8} args config: x86_64-randconfig-g002-201943 (attached as .config) compiler: gcc-7 (Debian 7.4.0-14) 7.4.0 reproduce: git checkout f56288ab7a001e359739d486be8aae78cf09081b # save the attached .config to linux build tree make ARCH=x86_64 If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> All errors (new ones prefixed by >>): from <command-line>:0: include/kcl/kcl_drm.h: In function 'kcl_drm_gem_object_put_unlocked': include/kcl/kcl_drm.h:347:9: error: implicit declaration of function 'drm_gem_object_unreference_unlocked'; did you mean 'drm_gem_object_put_unlocked'? [-Werror=implicit-function-declaration] return drm_gem_object_unreference_unlocked(obj); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drm_gem_object_put_unlocked include/kcl/kcl_drm.h:347:9: warning: 'return' with a value, in function returning void return drm_gem_object_unreference_unlocked(obj); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h:344:20: note: declared here static inline void kcl_drm_gem_object_put_unlocked(struct drm_gem_object *obj) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h: At top level: include/kcl/kcl_drm.h:532:34: error: redefinition of 'drm_debug_printer' static inline struct drm_printer drm_debug_printer(const char *prefix) ^~~~~~~~~~~~~~~~~ In file included from include/drm/drm_mm.h:49:0, from include/drm/drm_vma_manager.h:26, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/drm/drm_print.h:219:34: note: previous definition of 'drm_debug_printer' was here static inline struct drm_printer drm_debug_printer(const char *prefix) ^~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h:607:20: error: static declaration of 'drm_dev_put' follows non-static declaration static inline void drm_dev_put(struct drm_device *dev) ^~~~~~~~~~~ In file included from include/drm/drmP.h:74:0, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_drv.h:739:6: note: previous declaration of 'drm_dev_put' was here void drm_dev_put(struct drm_device *dev); ^~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h: In function 'drm_dev_put': include/kcl/kcl_drm.h:609:9: error: implicit declaration of function 'drm_dev_unref'; did you mean 'drm_dev_enter'? [-Werror=implicit-function-declaration] return drm_dev_unref(dev); ^~~~~~~~~~~~~ drm_dev_enter include/kcl/kcl_drm.h:609:9: warning: 'return' with a value, in function returning void return drm_dev_unref(dev); ^~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h:607:20: note: declared here static inline void drm_dev_put(struct drm_device *dev) ^~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h: In function 'kcl_get_user_pages': include/kcl/kcl_mm.h:43:24: warning: passing argument 1 of 'get_user_pages' makes integer from pointer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'long unsigned int' but argument is of type 'struct task_struct *' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:43:29: warning: passing argument 2 of 'get_user_pages' makes integer from pointer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'long unsigned int' but argument is of type 'struct mm_struct *' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:43:40: warning: passing argument 4 of 'get_user_pages' makes pointer from integer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'struct page **' but argument is of type 'long unsigned int' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:44:4: warning: passing argument 5 of 'get_user_pages' makes pointer from integer without a cast [-Wint-conversion] write, force, pages, vmas); ^~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'struct vm_area_struct **' but argument is of type 'int' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: >> include/kcl/kcl_mm.h:43:9: error: too many arguments to function 'get_user_pages' return get_user_pages(tsk, mm, start, nr_pages, ^~~~~~~~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: declared here long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h: At top level: include/kcl/kcl_mm.h:50:28: error: redefinition of 'memalloc_nofs_save' static inline unsigned int memalloc_nofs_save(void) ^~~~~~~~~~~~~~~~~~ In file included from include/kcl/kcl_mm.h:5:0, from drivers/gpu/drm/ttm/backport/backport.h:8, from <command-line>:0: include/linux/sched/mm.h:248:28: note: previous definition of 'memalloc_nofs_save' was here static inline unsigned int memalloc_nofs_save(void) ^~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:55:20: error: redefinition of 'memalloc_nofs_restore' static inline void memalloc_nofs_restore(unsigned int flags) ^~~~~~~~~~~~~~~~~~~~~ In file included from include/kcl/kcl_mm.h:5:0, from drivers/gpu/drm/ttm/backport/backport.h:8, from <command-line>:0: include/linux/sched/mm.h:263:20: note: previous definition of 'memalloc_nofs_restore' was here static inline void memalloc_nofs_restore(unsigned int flags) ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:61:21: error: redefinition of 'kvmalloc' static inline void *kvmalloc(size_t size, gfp_t flags) ^~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:635:21: note: previous definition of 'kvmalloc' was here static inline void *kvmalloc(size_t size, gfp_t flags) ^~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:71:21: error: redefinition of 'kvzalloc' static inline void *kvzalloc(size_t size, gfp_t flags) ^~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:643:21: note: previous definition of 'kvzalloc' was here static inline void *kvzalloc(size_t size, gfp_t flags) ^~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:81:20: error: static declaration of 'kvfree' follows non-static declaration static inline void kvfree(const void *addr) ^~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:663:13: note: previous declaration of 'kvfree' was here extern void kvfree(const void *addr); ^~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:101:21: error: redefinition of 'kvmalloc_array' static inline void *kvmalloc_array(size_t n, size_t size, gfp_t flags) ^~~~~~~~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:648:21: note: previous definition of 'kvmalloc_array' was here static inline void *kvmalloc_array(size_t n, size_t size, gfp_t flags) ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:114:21: error: redefinition of 'kvcalloc' static inline void *kvcalloc(size_t n, size_t size, gfp_t flags) ^~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:658:21: note: previous definition of 'kvcalloc' was here static inline void *kvcalloc(size_t n, size_t size, gfp_t flags) ^~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:121:20: error: redefinition of 'mmgrab' static inline void mmgrab(struct mm_struct *mm) ^~~~~~ In file included from include/kcl/kcl_mm.h:5:0, from drivers/gpu/drm/ttm/backport/backport.h:8, from <command-line>:0: -- from <command-line>:0: include/kcl/kcl_drm.h: In function 'kcl_drm_gem_object_put_unlocked': include/kcl/kcl_drm.h:347:9: error: implicit declaration of function 'drm_gem_object_unreference_unlocked'; did you mean 'drm_gem_object_put_unlocked'? [-Werror=implicit-function-declaration] return drm_gem_object_unreference_unlocked(obj); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drm_gem_object_put_unlocked include/kcl/kcl_drm.h:347:9: warning: 'return' with a value, in function returning void return drm_gem_object_unreference_unlocked(obj); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h:344:20: note: declared here static inline void kcl_drm_gem_object_put_unlocked(struct drm_gem_object *obj) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h: At top level: include/kcl/kcl_drm.h:532:34: error: redefinition of 'drm_debug_printer' static inline struct drm_printer drm_debug_printer(const char *prefix) ^~~~~~~~~~~~~~~~~ In file included from include/drm/drm_mm.h:49:0, from include/drm/drm_vma_manager.h:26, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/drm/drm_print.h:219:34: note: previous definition of 'drm_debug_printer' was here static inline struct drm_printer drm_debug_printer(const char *prefix) ^~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h:607:20: error: static declaration of 'drm_dev_put' follows non-static declaration static inline void drm_dev_put(struct drm_device *dev) ^~~~~~~~~~~ In file included from include/drm/drmP.h:74:0, from include/kcl/kcl_drm.h:6, from drivers/gpu/drm/ttm/backport/backport.h:6, from <command-line>:0: include/drm/drm_drv.h:739:6: note: previous declaration of 'drm_dev_put' was here void drm_dev_put(struct drm_device *dev); ^~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:6:0, from <command-line>:0: include/kcl/kcl_drm.h: In function 'drm_dev_put': include/kcl/kcl_drm.h:609:9: error: implicit declaration of function 'drm_dev_unref'; did you mean 'drm_dev_enter'? [-Werror=implicit-function-declaration] return drm_dev_unref(dev); ^~~~~~~~~~~~~ drm_dev_enter include/kcl/kcl_drm.h:609:9: warning: 'return' with a value, in function returning void return drm_dev_unref(dev); ^~~~~~~~~~~~~~~~~~ include/kcl/kcl_drm.h:607:20: note: declared here static inline void drm_dev_put(struct drm_device *dev) ^~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h: In function 'kcl_get_user_pages': include/kcl/kcl_mm.h:43:24: warning: passing argument 1 of 'get_user_pages' makes integer from pointer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'long unsigned int' but argument is of type 'struct task_struct *' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:43:29: warning: passing argument 2 of 'get_user_pages' makes integer from pointer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'long unsigned int' but argument is of type 'struct mm_struct *' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:43:40: warning: passing argument 4 of 'get_user_pages' makes pointer from integer without a cast [-Wint-conversion] return get_user_pages(tsk, mm, start, nr_pages, ^~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'struct page **' but argument is of type 'long unsigned int' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:44:4: warning: passing argument 5 of 'get_user_pages' makes pointer from integer without a cast [-Wint-conversion] write, force, pages, vmas); ^~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: expected 'struct vm_area_struct **' but argument is of type 'int' long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: >> include/kcl/kcl_mm.h:43:9: error: too many arguments to function 'get_user_pages' return get_user_pages(tsk, mm, start, nr_pages, ^~~~~~~~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:1556:6: note: declared here long get_user_pages(unsigned long start, unsigned long nr_pages, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h: At top level: include/kcl/kcl_mm.h:50:28: error: redefinition of 'memalloc_nofs_save' static inline unsigned int memalloc_nofs_save(void) ^~~~~~~~~~~~~~~~~~ In file included from include/kcl/kcl_mm.h:5:0, from drivers/gpu/drm/ttm/backport/backport.h:8, from <command-line>:0: include/linux/sched/mm.h:248:28: note: previous definition of 'memalloc_nofs_save' was here static inline unsigned int memalloc_nofs_save(void) ^~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:55:20: error: redefinition of 'memalloc_nofs_restore' static inline void memalloc_nofs_restore(unsigned int flags) ^~~~~~~~~~~~~~~~~~~~~ In file included from include/kcl/kcl_mm.h:5:0, from drivers/gpu/drm/ttm/backport/backport.h:8, from <command-line>:0: include/linux/sched/mm.h:263:20: note: previous definition of 'memalloc_nofs_restore' was here static inline void memalloc_nofs_restore(unsigned int flags) ^~~~~~~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:61:21: error: redefinition of 'kvmalloc' static inline void *kvmalloc(size_t size, gfp_t flags) ^~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:635:21: note: previous definition of 'kvmalloc' was here static inline void *kvmalloc(size_t size, gfp_t flags) ^~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:71:21: error: redefinition of 'kvzalloc' static inline void *kvzalloc(size_t size, gfp_t flags) ^~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:643:21: note: previous definition of 'kvzalloc' was here static inline void *kvzalloc(size_t size, gfp_t flags) ^~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:81:20: error: static declaration of 'kvfree' follows non-static declaration static inline void kvfree(const void *addr) ^~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:663:13: note: previous declaration of 'kvfree' was here extern void kvfree(const void *addr); ^~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:101:21: error: redefinition of 'kvmalloc_array' static inline void *kvmalloc_array(size_t n, size_t size, gfp_t flags) ^~~~~~~~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:648:21: note: previous definition of 'kvmalloc_array' was here static inline void *kvmalloc_array(size_t n, size_t size, gfp_t flags) ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:114:21: error: redefinition of 'kvcalloc' static inline void *kvcalloc(size_t n, size_t size, gfp_t flags) ^~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:658:21: note: previous definition of 'kvcalloc' was here static inline void *kvcalloc(size_t n, size_t size, gfp_t flags) ^~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:8:0, from <command-line>:0: include/kcl/kcl_mm.h:121:20: error: redefinition of 'mmgrab' static inline void mmgrab(struct mm_struct *mm) ^~~~~~ In file included from include/kcl/kcl_mm.h:5:0, from drivers/gpu/drm/ttm/backport/backport.h:8, from <command-line>:0: .. vim +/get_user_pages +43 include/kcl/kcl_mm.h b4f7d254be169a Junwei Zhang 2016-12-23 12 b4f7d254be169a Junwei Zhang 2016-12-23 13 static inline int kcl_get_user_pages(struct task_struct *tsk, struct mm_struct *mm, b4f7d254be169a Junwei Zhang 2016-12-23 14 unsigned long start, unsigned long nr_pages, b4f7d254be169a Junwei Zhang 2016-12-23 15 int write, int force, struct page **pages, b4f7d254be169a Junwei Zhang 2016-12-23 16 struct vm_area_struct **vmas, int *locked) b4f7d254be169a Junwei Zhang 2016-12-23 17 { f56288ab7a001e Slava Grigorev 2019-07-10 18 #if !defined(HAVE_8ARGS_GET_USER_PAGES) f56288ab7a001e Slava Grigorev 2019-07-10 19 if (mm == current->mm) { f56288ab7a001e Slava Grigorev 2019-07-10 20 #if defined(HAVE_5ARGS_GET_USER_PAGES) f56288ab7a001e Slava Grigorev 2019-07-10 21 write = ((!!write) & FOLL_WRITE) | ((!!force) & FOLL_FORCE); b4f7d254be169a Junwei Zhang 2016-12-23 22 return get_user_pages(start, nr_pages, write, pages, vmas); f56288ab7a001e Slava Grigorev 2019-07-10 23 #else f56288ab7a001e Slava Grigorev 2019-07-10 24 return get_user_pages(start, nr_pages, write, force, pages, f56288ab7a001e Slava Grigorev 2019-07-10 25 vmas); f56288ab7a001e Slava Grigorev 2019-07-10 26 #endif f56288ab7a001e Slava Grigorev 2019-07-10 27 } else { f56288ab7a001e Slava Grigorev 2019-07-10 28 #if defined(HAVE_8ARGS_GET_USER_PAGES_REMOTE) f56288ab7a001e Slava Grigorev 2019-07-10 29 write = ((!!write) & FOLL_WRITE) | ((!!force) & FOLL_FORCE); b4f7d254be169a Junwei Zhang 2016-12-23 30 return get_user_pages_remote(tsk, mm, start, nr_pages, b4f7d254be169a Junwei Zhang 2016-12-23 31 write, pages, vmas, locked); f56288ab7a001e Slava Grigorev 2019-07-10 32 #elif defined(HAVE_7ARGS_GET_USER_PAGES_REMOTE) f56288ab7a001e Slava Grigorev 2019-07-10 33 write = ((!!write) & FOLL_WRITE) | ((!!force) & FOLL_FORCE); b4f7d254be169a Junwei Zhang 2016-12-23 34 return get_user_pages_remote(tsk, mm, start, nr_pages, b4f7d254be169a Junwei Zhang 2016-12-23 35 write, pages, vmas); f56288ab7a001e Slava Grigorev 2019-07-10 36 #else b4f7d254be169a Junwei Zhang 2016-12-23 37 return get_user_pages_remote(tsk, mm, start, nr_pages, b4f7d254be169a Junwei Zhang 2016-12-23 38 write, force, pages, vmas); f56288ab7a001e Slava Grigorev 2019-07-10 39 #endif f56288ab7a001e Slava Grigorev 2019-07-10 40 } b4f7d254be169a Junwei Zhang 2016-12-23 41 #else b4f7d254be169a Junwei Zhang 2016-12-23 42 write = !!(write & FOLL_WRITE); b4f7d254be169a Junwei Zhang 2016-12-23 @43 return get_user_pages(tsk, mm, start, nr_pages, b4f7d254be169a Junwei Zhang 2016-12-23 44 write, force, pages, vmas); b4f7d254be169a Junwei Zhang 2016-12-23 45 #endif b4f7d254be169a Junwei Zhang 2016-12-23 46 } b4f7d254be169a Junwei Zhang 2016-12-23 47 :::::: The code at line 43 was first introduced by commit :::::: b4f7d254be169a27d8759eff4cdc418427ad10a3 drm/amdkcl: [4.6] fix kcl_get_user_pages() :::::: TO: Junwei Zhang <Jerry.Zhang(a)amd.com> :::::: CC: Chengming Gui <Jack.Gui(a)amd.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[PATCH] video: hyperv: hyperv_fb: Use physical memory for fb on HyperV Gen 1 VMs.
by Wei Hu 02 Nov '19

02 Nov '19

On Hyper-V, Generation 1 VMs can directly use VM's physical memory for their framebuffers. This can improve the efficiency of framebuffer and overall performence for VM. The physical memory assigned to framebuffer must be contiguous. We use CMA allocator to get contiguouse physicial memory when the framebuffer size is greater than 4MB. For size under 4MB, we use alloc_pages to achieve this. To enable framebuffer memory allocation from CMA, supply a kernel parameter to give enough space to CMA allocator at boot time. For example: cma=130m This gives 130MB memory to CAM allocator that can be allocated to framebuffer. If this fails, we fall back to the old way of using mmio for framebuffer. Signed-off-by: Wei Hu <weh(a)microsoft.com> --- drivers/video/fbdev/Kconfig | 1 + drivers/video/fbdev/hyperv_fb.c | 179 +++++++++++++++++++++++++------- kernel/dma/contiguous.c | 2 + 3 files changed, 147 insertions(+), 35 deletions(-) diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index aa9541bf964b..f534059461ee 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig @@ -2215,6 +2215,7 @@ config FB_HYPERV select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT select FB_DEFERRED_IO + select DMA_CMA help This framebuffer driver supports Microsoft Hyper-V Synthetic Video. diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c index 3f60b7bc8589..ea2fd3481225 100644 --- a/drivers/video/fbdev/hyperv_fb.c +++ b/drivers/video/fbdev/hyperv_fb.c @@ -31,6 +31,16 @@ * "set-vmvideo" command. For example * set-vmvideo -vmname name -horizontalresolution:1920 \ * -verticalresolution:1200 -resolutiontype single + * + * Gen 1 VMs also support directly using VM's phyiscal memory for framebuffer. + * It could improve the efficiency and performance for framebuffer and VM. + * This requires to allocate contiguous physical memory from Linux kernel's + * CMA memory allocator. To enable this, supply a kernel parameter to give + * enough memory space to CMA allocator for framebuffer. For example: + * cma=130m + * This gives 130MB memory to CMA allocator that can be allocated to + * framebuffer. For reference, 8K resolution (7680x4320) takes about + * 127MB memory. */ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt @@ -42,6 +52,7 @@ #include <linux/fb.h> #include <linux/pci.h> #include <linux/efi.h> +#include <linux/dma-contiguous.h> #include <linux/hyperv.h> @@ -227,7 +238,6 @@ struct synthvid_msg { } __packed; - /* FB driver definitions and structures */ #define HVFB_WIDTH 1152 /* default screen width */ #define HVFB_HEIGHT 864 /* default screen height */ @@ -256,6 +266,9 @@ struct hvfb_par { /* If true, the VSC notifies the VSP on every framebuffer change */ bool synchronous_fb; + /* If true, need to copy from deferred IO mem to framebuffer mem */ + bool need_docopy; + struct notifier_block hvfb_panic_nb; /* Memory for deferred IO and frame buffer itself */ @@ -432,7 +445,7 @@ static void synthvid_deferred_io(struct fb_info *p, maxy = max_t(int, maxy, y2); /* Copy from dio space to mmio address */ - if (par->fb_ready) + if (par->fb_ready && par->need_docopy) hvfb_docopy(par, start, PAGE_SIZE); } @@ -749,12 +762,12 @@ static void hvfb_update_work(struct work_struct *w) return; /* Copy the dirty rectangle to frame buffer memory */ - for (j = y1; j < y2; j++) { - hvfb_docopy(par, - j * info->fix.line_length + - (x1 * screen_depth / 8), - (x2 - x1) * screen_depth / 8); - } + if (par->need_docopy) + for (j = y1; j < y2; j++) + hvfb_docopy(par, + j * info->fix.line_length + + (x1 * screen_depth / 8), + (x2 - x1) * screen_depth / 8); /* Refresh */ if (par->fb_ready && par->update) @@ -799,7 +812,8 @@ static int hvfb_on_panic(struct notifier_block *nb, par = container_of(nb, struct hvfb_par, hvfb_panic_nb); par->synchronous_fb = true; info = par->info; - hvfb_docopy(par, 0, dio_fb_size); + if (par->need_docopy) + hvfb_docopy(par, 0, dio_fb_size); synthvid_update(info, 0, 0, INT_MAX, INT_MAX); return NOTIFY_DONE; @@ -938,6 +952,62 @@ static void hvfb_get_option(struct fb_info *info) return; } +/* + * Allocate enough contiguous physical memory. + * Return physical address if succeeded or -1 if failed. + */ +static unsigned long hvfb_get_phymem(unsigned int request_size) +{ + struct page *page = NULL; + unsigned int request_pages; + unsigned long paddr = 0; + unsigned int order = get_order(request_size); + + if (request_size == 0) + return -1; + + /* Try call alloc_pages if the size is less than 2^MAX_ORDER */ + if (order < MAX_ORDER) { + page = alloc_pages(GFP_KERNEL | __GFP_ZERO, order); + if (!page) + return -1; + + request_pages = (1 << order); + goto get_phymem1; + } + + /* Allocate from CMA */ + // request_pages = (request_size >> PAGE_SHIFT) + 1; + request_pages = (round_up(request_size, PAGE_SIZE) >> PAGE_SHIFT); + page = dma_alloc_from_contiguous(NULL, request_pages, 0, false); + + if (page == NULL) + return -1; + +get_phymem1: + paddr = (page_to_pfn(page) << PAGE_SHIFT); + + pr_info("Allocated %d pages starts at physical addr 0x%lx\n", + request_pages, paddr); + + return paddr; +} + +/* Release contiguous physical memory */ +static void hvfb_release_phymem(unsigned long paddr, unsigned int size) +{ + unsigned int order = get_order(size); + + if (order < MAX_ORDER) + __free_pages(pfn_to_page(paddr >> PAGE_SHIFT), order); + else + dma_release_from_contiguous(NULL, + pfn_to_page(paddr >> PAGE_SHIFT), + (round_up(size, PAGE_SIZE) >> + PAGE_SHIFT)); + // (size >> PAGE_SHIFT) + 1); +} + /* Get framebuffer memory from Hyper-V video pci space */ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info) @@ -947,8 +1017,58 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info) void __iomem *fb_virt; int gen2vm = efi_enabled(EFI_BOOT); resource_size_t pot_start, pot_end; + unsigned long paddr; int ret; + if (!gen2vm) { + pdev = pci_get_device(PCI_VENDOR_ID_MICROSOFT, + PCI_DEVICE_ID_HYPERV_VIDEO, NULL); + if (!pdev) { + pr_err("Unable to find PCI Hyper-V video\n"); + return -ENODEV; + } + } + + info->apertures = alloc_apertures(1); + if (!info->apertures) + goto err1; + + if (gen2vm) { + info->apertures->ranges[0].base = screen_info.lfb_base; + info->apertures->ranges[0].size = screen_info.lfb_size; + } else { + info->apertures->ranges[0].base = pci_resource_start(pdev, 0); + info->apertures->ranges[0].size = pci_resource_len(pdev, 0); + } + + /* + * For Gen 1 VM, we can directly use the contiguous memory + * from VM. If we success, deferred IO happens directly + * on this allocated framebuffer memory, avoiding extra + * memory copy. + */ + if (!gen2vm) { + paddr = hvfb_get_phymem(screen_fb_size); + if (paddr != (unsigned long) -1) { + par->mmio_pp = paddr; + par->mmio_vp = par->dio_vp = __va(paddr); + + info->fix.smem_start = paddr; + info->fix.smem_len = screen_fb_size; + info->screen_base = par->mmio_vp; + info->screen_size = screen_fb_size; + + par->need_docopy = false; + goto getmem1; + } else { + pr_info("Unable to allocate enough contiguous physical memory on Gen 1 VM. Use MMIO instead.\n"); + } + } + + /* + * Cannot use the contiguous physical memory. + * Allocate mmio space for framebuffer. + */ dio_fb_size = screen_width * screen_height * screen_depth / 8; @@ -956,13 +1076,6 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info) pot_start = 0; pot_end = -1; } else { - pdev = pci_get_device(PCI_VENDOR_ID_MICROSOFT, - PCI_DEVICE_ID_HYPERV_VIDEO, NULL); - if (!pdev) { - pr_err("Unable to find PCI Hyper-V video\n"); - return -ENODEV; - } - if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM) || pci_resource_len(pdev, 0) < screen_fb_size) { pr_err("Resource not available or (0x%lx < 0x%lx)\n", @@ -991,20 +1104,6 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info) if (par->dio_vp == NULL) goto err3; - info->apertures = alloc_apertures(1); - if (!info->apertures) - goto err4; - - if (gen2vm) { - info->apertures->ranges[0].base = screen_info.lfb_base; - info->apertures->ranges[0].size = screen_info.lfb_size; - remove_conflicting_framebuffers(info->apertures, - KBUILD_MODNAME, false); - } else { - info->apertures->ranges[0].base = pci_resource_start(pdev, 0); - info->apertures->ranges[0].size = pci_resource_len(pdev, 0); - } - /* Physical address of FB device */ par->mmio_pp = par->mem->start; /* Virtual address of FB device */ @@ -1015,13 +1114,17 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info) info->screen_base = par->dio_vp; info->screen_size = dio_fb_size; + par->need_docopy = true; + +getmem1: + remove_conflicting_framebuffers(info->apertures, + KBUILD_MODNAME, false); + if (!gen2vm) pci_dev_put(pdev); return 0; -err4: - vfree(par->dio_vp); err3: iounmap(fb_virt); err2: @@ -1039,9 +1142,14 @@ static void hvfb_putmem(struct fb_info *info) { struct hvfb_par *par = info->par; - vfree(par->dio_vp); - iounmap(info->screen_base); - vmbus_free_mmio(par->mem->start, screen_fb_size); + if (par->need_docopy) { + vfree(par->dio_vp); + iounmap(info->screen_base); + vmbus_free_mmio(par->mem->start, screen_fb_size); + } else { + hvfb_release_phymem(info->fix.smem_start, screen_fb_size); + } + par->mem = NULL; } @@ -1060,6 +1168,7 @@ static int hvfb_probe(struct hv_device *hdev, par = info->par; par->info = info; par->fb_ready = false; + par->need_docopy = false; init_completion(&par->wait); INIT_DELAYED_WORK(&par->dwork, hvfb_update_work); diff --git a/kernel/dma/contiguous.c b/kernel/dma/contiguous.c index 69cfb4345388..4553f4cca80e 100644 --- a/kernel/dma/contiguous.c +++ b/kernel/dma/contiguous.c @@ -197,6 +197,7 @@ struct page *dma_alloc_from_contiguous(struct device *dev, size_t count, return cma_alloc(dev_get_cma_area(dev), count, align, no_warn); } +EXPORT_SYMBOL(dma_alloc_from_contiguous); /** * dma_release_from_contiguous() - release allocated pages @@ -213,6 +214,7 @@ bool dma_release_from_contiguous(struct device *dev, struct page *pages, { return cma_release(dev_get_cma_area(dev), pages, count); } +EXPORT_SYMBOL(dma_release_from_contiguous); /** * dma_alloc_contiguous() - allocate contiguous pages -- 2.20.1

3 2

[radeon-alex:amd-mainline-dkms-5.2 2158/2647] drivers/gpu/drm/ttm/ttm_bo_vm.c:128:6: error: 'vma' undeclared; did you mean 'vmf'?
by kbuild test robot 02 Nov '19

02 Nov '19

tree: git://people.freedesktop.org/~agd5f/linux.git amd-mainline-dkms-5.2 head: b027ed8d9051470f4ed6bc071fcde172fe1fc595 commit: 607b18ba116eb1642b01fb9d38a164cc492e9044 [2158/2647] drm/amdkcl: Test whether vm_fault->{address/vma} is available config: x86_64-randconfig-g002-201943 (attached as .config) compiler: gcc-7 (Debian 7.4.0-14) 7.4.0 reproduce: git checkout 607b18ba116eb1642b01fb9d38a164cc492e9044 # save the attached .config to linux build tree make ARCH=x86_64 If you fix the issue, kindly add following tag Reported-by: kbuild test robot <lkp(a)intel.com> All errors (new ones prefixed by >>): from include/drm/drm_print.h:32, from include/drm/drm_mm.h:49, from include/drm/drm_vma_manager.h:26, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/kref.h:36:28: note: previous definition of 'kref_read' was here static inline unsigned int kref_read(const struct kref *kref) ^~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:11:0, from <command-line>:0: include/kcl/kcl_kref.h: In function 'kref_read': include/kcl/kcl_kref.h:9:21: error: passing argument 1 of 'atomic_read' from incompatible pointer type [-Werror=incompatible-pointer-types] return atomic_read(&kref->refcount); ^ In file included from arch/x86/include/asm/atomic.h:265:0, from include/linux/atomic.h:7, from include/linux/rcupdate.h:25, from include/linux/rbtree.h:34, from include/drm/drm_mm.h:41, from include/drm/drm_vma_manager.h:26, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/asm-generic/atomic-instrumented.h:24:1: note: expected 'const atomic_t * {aka const struct <anonymous> *}' but argument is of type 'const refcount_t * {aka const struct refcount_struct *}' atomic_read(const atomic_t *v) ^~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:12:0, from <command-line>:0: include/kcl/kcl_mm_types.h: At top level: include/kcl/kcl_mm_types.h:10:3: error: conflicting types for 'pfn_t' } pfn_t; ^~~~~ In file included from include/asm-generic/memory_model.h:5:0, from arch/x86/include/asm/page.h:76, from arch/x86/include/asm/thread_info.h:12, from include/linux/thread_info.h:38, from arch/x86/include/asm/preempt.h:7, from include/linux/preempt.h:78, from include/linux/rcupdate.h:27, from include/linux/rbtree.h:34, from include/drm/drm_mm.h:41, from include/drm/drm_vma_manager.h:26, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/pfn.h:15:3: note: previous declaration of 'pfn_t' was here } pfn_t; ^~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:12:0, from <command-line>:0: include/kcl/kcl_mm_types.h:33:13: error: conflicting types for 'vm_fault_t' typedef int vm_fault_t; ^~~~~~~~~~ In file included from include/drm/drm_mm.h:43:0, from include/drm/drm_vma_manager.h:26, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm_types.h:631:32: note: previous declaration of 'vm_fault_t' was here typedef __bitwise unsigned int vm_fault_t; ^~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:12:0, from <command-line>:0: include/kcl/kcl_mm_types.h:35:26: error: conflicting types for 'vmf_insert_mixed' static inline vm_fault_t vmf_insert_mixed(struct vm_area_struct *vma, ^~~~~~~~~~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:2587:12: note: previous declaration of 'vmf_insert_mixed' was here vm_fault_t vmf_insert_mixed(struct vm_area_struct *vma, unsigned long addr, ^~~~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:12:0, from <command-line>:0: include/kcl/kcl_mm_types.h: In function 'vmf_insert_mixed': include/kcl/kcl_mm_types.h:41:8: error: implicit declaration of function 'vm_insert_mixed'; did you mean 'vmf_insert_mixed'? [-Werror=implicit-function-declaration] err = vm_insert_mixed(vma, addr, pfn_t_to_pfn(pfn)); ^~~~~~~~~~~~~~~ vmf_insert_mixed include/kcl/kcl_mm_types.h: At top level: include/kcl/kcl_mm_types.h:53:26: error: conflicting types for 'vmf_insert_pfn' static inline vm_fault_t vmf_insert_pfn(struct vm_area_struct *vma, ^~~~~~~~~~~~~~ In file included from include/drm/drm_vma_manager.h:27:0, from include/kcl/kcl_drm_vma_manager.h:8, from drivers/gpu/drm/ttm/backport/backport.h:5, from <command-line>:0: include/linux/mm.h:2583:12: note: previous declaration of 'vmf_insert_pfn' was here vm_fault_t vmf_insert_pfn(struct vm_area_struct *vma, unsigned long addr, ^~~~~~~~~~~~~~ In file included from drivers/gpu/drm/ttm/backport/backport.h:12:0, from <command-line>:0: include/kcl/kcl_mm_types.h: In function 'vmf_insert_pfn': include/kcl/kcl_mm_types.h:56:13: error: implicit declaration of function 'vm_insert_pfn'; did you mean 'vmf_insert_pfn'? [-Werror=implicit-function-declaration] int err = vm_insert_pfn(vma, addr, pfn); ^~~~~~~~~~~~~ vmf_insert_pfn drivers/gpu/drm/ttm/ttm_bo_vm.c: In function 'ttm_bo_vm_fault': >> drivers/gpu/drm/ttm/ttm_bo_vm.c:128:6: error: 'vma' undeclared (first use in this function); did you mean 'vmf'? vma->vm_private_data; ^~~ vmf drivers/gpu/drm/ttm/ttm_bo_vm.c:128:6: note: each undeclared identifier is reported only once for each function it appears in >> drivers/gpu/drm/ttm/ttm_bo_vm.c:139:44: error: 'struct vm_fault' has no member named 'virtual_address' unsigned long address = (unsigned long)vmf->virtual_address; ^~ drivers/gpu/drm/ttm/ttm_bo_vm.c: At top level: drivers/gpu/drm/ttm/ttm_bo_vm.c:427:11: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] .fault = ttm_bo_vm_fault, ^~~~~~~~~~~~~~~ drivers/gpu/drm/ttm/ttm_bo_vm.c:427:11: note: (near initialization for 'ttm_bo_vm_ops.fault') cc1: some warnings being treated as errors vim +128 drivers/gpu/drm/ttm/ttm_bo_vm.c cbe12e74ee4e29 Thomas Hellstrom 2013-10-09 106 c67fa6edc8b11a Tan Xiaojun 2017-12-25 107 static unsigned long ttm_bo_io_mem_pfn(struct ttm_buffer_object *bo, c67fa6edc8b11a Tan Xiaojun 2017-12-25 108 unsigned long page_offset) c67fa6edc8b11a Tan Xiaojun 2017-12-25 109 { c67fa6edc8b11a Tan Xiaojun 2017-12-25 110 struct ttm_bo_device *bdev = bo->bdev; c67fa6edc8b11a Tan Xiaojun 2017-12-25 111 c67fa6edc8b11a Tan Xiaojun 2017-12-25 112 if (bdev->driver->io_mem_pfn) c67fa6edc8b11a Tan Xiaojun 2017-12-25 113 return bdev->driver->io_mem_pfn(bo, page_offset); c67fa6edc8b11a Tan Xiaojun 2017-12-25 114 e83bf4adf54ad3 Tan Xiaojun 2017-12-25 115 return ((bo->mem.bus.base + bo->mem.bus.offset) >> PAGE_SHIFT) e83bf4adf54ad3 Tan Xiaojun 2017-12-25 116 + page_offset; c67fa6edc8b11a Tan Xiaojun 2017-12-25 117 } c502e3166db12d Anatoli Antonovitch 2019-06-26 118 #if defined(HAVE_2ARGS_VIRTUAL_MM_FAULT_FUNCTION) 2880a38f4d3cf2 Evan Quan 2017-05-12 119 static vm_fault_t ttm_bo_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf) 2880a38f4d3cf2 Evan Quan 2017-05-12 120 #else 4daa4fba3a3899 Souptick Joarder 2018-06-02 121 static vm_fault_t ttm_bo_vm_fault(struct vm_fault *vmf) 2880a38f4d3cf2 Evan Quan 2017-05-12 122 #endif ba4e7d973dd09b Thomas Hellstrom 2009-06-10 123 { 607b18ba116eb1 Chengming Gui 2019-09-02 124 #if defined(HAVE_VM_FAULT_ADDRESS_VMA) 11bac80004499e Dave Jiang 2017-02-24 125 struct vm_area_struct *vma = vmf->vma; 2880a38f4d3cf2 Evan Quan 2017-05-12 126 #endif ba4e7d973dd09b Thomas Hellstrom 2009-06-10 127 struct ttm_buffer_object *bo = (struct ttm_buffer_object *) ba4e7d973dd09b Thomas Hellstrom 2009-06-10 @128 vma->vm_private_data; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 129 struct ttm_bo_device *bdev = bo->bdev; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 130 unsigned long page_offset; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 131 unsigned long page_last; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 132 unsigned long pfn; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 133 struct ttm_tt *ttm = NULL; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 134 struct page *page; 4daa4fba3a3899 Souptick Joarder 2018-06-02 135 int err; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 136 int i; 4daa4fba3a3899 Souptick Joarder 2018-06-02 137 vm_fault_t ret = VM_FAULT_NOPAGE; 607b18ba116eb1 Chengming Gui 2019-09-02 138 #ifndef HAVE_VM_FAULT_ADDRESS_VMA 2880a38f4d3cf2 Evan Quan 2017-05-12 @139 unsigned long address = (unsigned long)vmf->virtual_address; 2880a38f4d3cf2 Evan Quan 2017-05-12 140 #else 1a29d85eb0f19b Jan Kara 2016-12-14 141 unsigned long address = vmf->address; 2880a38f4d3cf2 Evan Quan 2017-05-12 142 #endif eba67093f53532 Thomas Hellstrom 2010-11-11 143 struct ttm_mem_type_manager *man = eba67093f53532 Thomas Hellstrom 2010-11-11 144 &bdev->man[bo->mem.mem_type]; 3943875e7b73fd Thomas Hellstrom 2013-11-06 145 struct vm_area_struct cvma; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 146 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 147 /* ba4e7d973dd09b Thomas Hellstrom 2009-06-10 148 * Work around locking order reversal in fault / nopfn ba4e7d973dd09b Thomas Hellstrom 2009-06-10 149 * between mmap_sem and bo_reserve: Perform a trylock operation c58f009e01c918 Thomas Hellstrom 2013-11-14 150 * for reserve, and if it fails, retry the fault after waiting c58f009e01c918 Thomas Hellstrom 2013-11-14 151 * for the buffer to become unreserved. ba4e7d973dd09b Thomas Hellstrom 2009-06-10 152 */ 7e18f7a415538c Evan Quan 2019-02-18 153 if (unlikely(!kcl_reservation_object_trylock(bo->resv))) { c58f009e01c918 Thomas Hellstrom 2013-11-14 154 if (vmf->flags & FAULT_FLAG_ALLOW_RETRY) { 0251eb85af434f Chengming Gui 2019-08-28 155 #ifdef FAULT_FLAG_RETRY_NOWAIT c58f009e01c918 Thomas Hellstrom 2013-11-14 156 if (!(vmf->flags & FAULT_FLAG_RETRY_NOWAIT)) { 8129fdad387ae3 Thomas Zimmermann 2018-06-21 157 ttm_bo_get(bo); 2880a38f4d3cf2 Evan Quan 2017-05-12 158 up_read(&vma->vm_mm->mmap_sem); c58f009e01c918 Thomas Hellstrom 2013-11-14 159 (void) ttm_bo_wait_unreserved(bo); f44907593d746d Thomas Zimmermann 2018-06-21 160 ttm_bo_put(bo); c58f009e01c918 Thomas Hellstrom 2013-11-14 161 } 2880a38f4d3cf2 Evan Quan 2017-05-12 162 #else 2880a38f4d3cf2 Evan Quan 2017-05-12 163 up_read(&vma->vm_mm->mmap_sem); 2880a38f4d3cf2 Evan Quan 2017-05-12 164 #endif c58f009e01c918 Thomas Hellstrom 2013-11-14 165 c58f009e01c918 Thomas Hellstrom 2013-11-14 166 return VM_FAULT_RETRY; c58f009e01c918 Thomas Hellstrom 2013-11-14 167 } c58f009e01c918 Thomas Hellstrom 2013-11-14 168 c58f009e01c918 Thomas Hellstrom 2013-11-14 169 /* c58f009e01c918 Thomas Hellstrom 2013-11-14 170 * If we'd want to change locking order to c58f009e01c918 Thomas Hellstrom 2013-11-14 171 * mmap_sem -> bo::reserve, we'd use a blocking reserve here c58f009e01c918 Thomas Hellstrom 2013-11-14 172 * instead of retrying the fault... c58f009e01c918 Thomas Hellstrom 2013-11-14 173 */ ba4e7d973dd09b Thomas Hellstrom 2009-06-10 174 return VM_FAULT_NOPAGE; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 175 } ba4e7d973dd09b Thomas Hellstrom 2009-06-10 176 667a50db0477d4 Thomas Hellstrom 2014-01-03 177 /* 667a50db0477d4 Thomas Hellstrom 2014-01-03 178 * Refuse to fault imported pages. This should be handled 667a50db0477d4 Thomas Hellstrom 2014-01-03 179 * (if at all) by redirecting mmap to the exporter. 667a50db0477d4 Thomas Hellstrom 2014-01-03 180 */ 667a50db0477d4 Thomas Hellstrom 2014-01-03 181 if (bo->ttm && (bo->ttm->page_flags & TTM_PAGE_FLAG_SG)) { de8dfb8e3449c7 Tom St Denis 2018-01-26 182 ret = VM_FAULT_SIGBUS; 667a50db0477d4 Thomas Hellstrom 2014-01-03 183 goto out_unlock; 667a50db0477d4 Thomas Hellstrom 2014-01-03 184 } 667a50db0477d4 Thomas Hellstrom 2014-01-03 185 82c5da6bf8b55a Jerome Glisse 2010-04-09 186 if (bdev->driver->fault_reserve_notify) { 5d50fcbda7b0ac Christian König 2019-01-11 187 struct dma_fence *moving = dma_fence_get(bo->moving); 5d50fcbda7b0ac Christian König 2019-01-11 188 4daa4fba3a3899 Souptick Joarder 2018-06-02 189 err = bdev->driver->fault_reserve_notify(bo); 4daa4fba3a3899 Souptick Joarder 2018-06-02 190 switch (err) { 82c5da6bf8b55a Jerome Glisse 2010-04-09 191 case 0: 82c5da6bf8b55a Jerome Glisse 2010-04-09 192 break; 82c5da6bf8b55a Jerome Glisse 2010-04-09 193 case -EBUSY: 82c5da6bf8b55a Jerome Glisse 2010-04-09 194 case -ERESTARTSYS: de8dfb8e3449c7 Tom St Denis 2018-01-26 195 ret = VM_FAULT_NOPAGE; 82c5da6bf8b55a Jerome Glisse 2010-04-09 196 goto out_unlock; 82c5da6bf8b55a Jerome Glisse 2010-04-09 197 default: de8dfb8e3449c7 Tom St Denis 2018-01-26 198 ret = VM_FAULT_SIGBUS; 82c5da6bf8b55a Jerome Glisse 2010-04-09 199 goto out_unlock; 82c5da6bf8b55a Jerome Glisse 2010-04-09 200 } 5d50fcbda7b0ac Christian König 2019-01-11 201 5d50fcbda7b0ac Christian König 2019-01-11 202 if (bo->moving != moving) { 5d50fcbda7b0ac Christian König 2019-01-11 203 spin_lock(&bdev->glob->lru_lock); 5d50fcbda7b0ac Christian König 2019-01-11 204 ttm_bo_move_to_lru_tail(bo, NULL); 5d50fcbda7b0ac Christian König 2019-01-11 205 spin_unlock(&bdev->glob->lru_lock); 5d50fcbda7b0ac Christian König 2019-01-11 206 } 5d50fcbda7b0ac Christian König 2019-01-11 207 dma_fence_put(moving); 82c5da6bf8b55a Jerome Glisse 2010-04-09 208 } e024e11070a0a0 Dave Airlie 2009-06-24 209 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 210 /* ba4e7d973dd09b Thomas Hellstrom 2009-06-10 211 * Wait for buffer data in transit, due to a pipelined ba4e7d973dd09b Thomas Hellstrom 2009-06-10 212 * move. ba4e7d973dd09b Thomas Hellstrom 2009-06-10 213 */ 2880a38f4d3cf2 Evan Quan 2017-05-12 214 ret = ttm_bo_vm_fault_idle(bo, vma, vmf); ba4e7d973dd09b Thomas Hellstrom 2009-06-10 215 if (unlikely(ret != 0)) { 0251eb85af434f Chengming Gui 2019-08-28 216 #ifdef FAULT_FLAG_RETRY_NOWAIT de8dfb8e3449c7 Tom St Denis 2018-01-26 217 if (ret == VM_FAULT_RETRY && 3089c1df10e293 Nicolai Hähnle 2017-02-18 218 !(vmf->flags & FAULT_FLAG_RETRY_NOWAIT)) { 2880a38f4d3cf2 Evan Quan 2017-05-12 219 #else 2880a38f4d3cf2 Evan Quan 2017-05-12 220 if (ret == VM_FAULT_RETRY) { 2880a38f4d3cf2 Evan Quan 2017-05-12 221 #endif 3089c1df10e293 Nicolai Hähnle 2017-02-18 222 /* The BO has already been unreserved. */ de8dfb8e3449c7 Tom St Denis 2018-01-26 223 return ret; 3089c1df10e293 Nicolai Hähnle 2017-02-18 224 } 3089c1df10e293 Nicolai Hähnle 2017-02-18 225 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 226 goto out_unlock; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 227 } ba4e7d973dd09b Thomas Hellstrom 2009-06-10 228 4daa4fba3a3899 Souptick Joarder 2018-06-02 229 err = ttm_mem_io_lock(man, true); 4daa4fba3a3899 Souptick Joarder 2018-06-02 230 if (unlikely(err != 0)) { de8dfb8e3449c7 Tom St Denis 2018-01-26 231 ret = VM_FAULT_NOPAGE; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 232 goto out_unlock; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 233 } 4daa4fba3a3899 Souptick Joarder 2018-06-02 234 err = ttm_mem_io_reserve_vm(bo); 4daa4fba3a3899 Souptick Joarder 2018-06-02 235 if (unlikely(err != 0)) { de8dfb8e3449c7 Tom St Denis 2018-01-26 236 ret = VM_FAULT_SIGBUS; eba67093f53532 Thomas Hellstrom 2010-11-11 237 goto out_io_unlock; eba67093f53532 Thomas Hellstrom 2010-11-11 238 } ba4e7d973dd09b Thomas Hellstrom 2009-06-10 239 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 240 page_offset = ((address - vma->vm_start) >> PAGE_SHIFT) + d386735588c3e2 Thomas Hellstrom 2013-12-08 241 vma->vm_pgoff - drm_vma_node_start(&bo->vma_node); d386735588c3e2 Thomas Hellstrom 2013-12-08 242 page_last = vma_pages(vma) + vma->vm_pgoff - d386735588c3e2 Thomas Hellstrom 2013-12-08 243 drm_vma_node_start(&bo->vma_node); ba4e7d973dd09b Thomas Hellstrom 2009-06-10 244 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 245 if (unlikely(page_offset >= bo->num_pages)) { de8dfb8e3449c7 Tom St Denis 2018-01-26 246 ret = VM_FAULT_SIGBUS; eba67093f53532 Thomas Hellstrom 2010-11-11 247 goto out_io_unlock; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 248 } ba4e7d973dd09b Thomas Hellstrom 2009-06-10 249 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 250 /* 3943875e7b73fd Thomas Hellstrom 2013-11-06 251 * Make a local vma copy to modify the page_prot member 3943875e7b73fd Thomas Hellstrom 2013-11-06 252 * and vm_flags if necessary. The vma parameter is protected 3943875e7b73fd Thomas Hellstrom 2013-11-06 253 * by mmap_sem in write mode. ba4e7d973dd09b Thomas Hellstrom 2009-06-10 254 */ 3943875e7b73fd Thomas Hellstrom 2013-11-06 255 cvma = *vma; 3943875e7b73fd Thomas Hellstrom 2013-11-06 256 cvma.vm_page_prot = vm_get_page_prot(cvma.vm_flags); 3943875e7b73fd Thomas Hellstrom 2013-11-06 257 82c5da6bf8b55a Jerome Glisse 2010-04-09 258 if (bo->mem.bus.is_iomem) { 3943875e7b73fd Thomas Hellstrom 2013-11-06 259 cvma.vm_page_prot = ttm_io_prot(bo->mem.placement, 3943875e7b73fd Thomas Hellstrom 2013-11-06 260 cvma.vm_page_prot); ba4e7d973dd09b Thomas Hellstrom 2009-06-10 261 } else { d0cef9fa4411eb Roger He 2017-12-21 262 struct ttm_operation_ctx ctx = { d0cef9fa4411eb Roger He 2017-12-21 263 .interruptible = false, aa7662b67bf6f5 Roger He 2018-01-17 264 .no_wait_gpu = false, aa7662b67bf6f5 Roger He 2018-01-17 265 .flags = TTM_OPT_FLAG_FORCE_ALLOC aa7662b67bf6f5 Roger He 2018-01-17 266 d0cef9fa4411eb Roger He 2017-12-21 267 }; d0cef9fa4411eb Roger He 2017-12-21 268 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 269 ttm = bo->ttm; 3943875e7b73fd Thomas Hellstrom 2013-11-06 270 cvma.vm_page_prot = ttm_io_prot(bo->mem.placement, 3943875e7b73fd Thomas Hellstrom 2013-11-06 271 cvma.vm_page_prot); b1e5f172325547 Jerome Glisse 2011-11-02 272 b1e5f172325547 Jerome Glisse 2011-11-02 273 /* Allocate all page at once, most common usage */ 25893a14c938d5 Christian König 2018-02-01 274 if (ttm_tt_populate(ttm, &ctx)) { de8dfb8e3449c7 Tom St Denis 2018-01-26 275 ret = VM_FAULT_OOM; b1e5f172325547 Jerome Glisse 2011-11-02 276 goto out_io_unlock; b1e5f172325547 Jerome Glisse 2011-11-02 277 } ba4e7d973dd09b Thomas Hellstrom 2009-06-10 278 } ba4e7d973dd09b Thomas Hellstrom 2009-06-10 279 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 280 /* ba4e7d973dd09b Thomas Hellstrom 2009-06-10 281 * Speculatively prefault a number of pages. Only error on ba4e7d973dd09b Thomas Hellstrom 2009-06-10 282 * first page. ba4e7d973dd09b Thomas Hellstrom 2009-06-10 283 */ ba4e7d973dd09b Thomas Hellstrom 2009-06-10 284 for (i = 0; i < TTM_BO_VM_NUM_PREFAULT; ++i) { 95cf9264d5f36c Tom Lendacky 2017-07-17 285 if (bo->mem.bus.is_iomem) { 2880a38f4d3cf2 Evan Quan 2017-05-12 286 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) 95cf9264d5f36c Tom Lendacky 2017-07-17 287 /* Iomem should not be marked encrypted */ 95cf9264d5f36c Tom Lendacky 2017-07-17 288 cvma.vm_page_prot = pgprot_decrypted(cvma.vm_page_prot); 2880a38f4d3cf2 Evan Quan 2017-05-12 289 #endif c67fa6edc8b11a Tan Xiaojun 2017-12-25 290 pfn = ttm_bo_io_mem_pfn(bo, page_offset); 95cf9264d5f36c Tom Lendacky 2017-07-17 291 } else { b1e5f172325547 Jerome Glisse 2011-11-02 292 page = ttm->pages[page_offset]; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 293 if (unlikely(!page && i == 0)) { de8dfb8e3449c7 Tom St Denis 2018-01-26 294 ret = VM_FAULT_OOM; eba67093f53532 Thomas Hellstrom 2010-11-11 295 goto out_io_unlock; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 296 } else if (unlikely(!page)) { ba4e7d973dd09b Thomas Hellstrom 2009-06-10 297 break; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 298 } 58aa6622d32af7 Thomas Hellstrom 2014-01-03 299 page->index = drm_vma_node_start(&bo->vma_node) + 58aa6622d32af7 Thomas Hellstrom 2014-01-03 300 page_offset; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 301 pfn = page_to_pfn(page); ba4e7d973dd09b Thomas Hellstrom 2009-06-10 302 } ba4e7d973dd09b Thomas Hellstrom 2009-06-10 303 7dfe8b6187f43d Thomas Hellstrom 2014-01-03 304 if (vma->vm_flags & VM_MIXEDMAP) 4daa4fba3a3899 Souptick Joarder 2018-06-02 305 ret = vmf_insert_mixed(&cvma, address, 1663f01b82777b Qiang Yu 2018-08-22 306 __pfn_to_pfn_t(pfn, PFN_DEV | (bo->ssg_can_map ? PFN_MAP : 0))); 7dfe8b6187f43d Thomas Hellstrom 2014-01-03 307 else 4daa4fba3a3899 Souptick Joarder 2018-06-02 308 ret = vmf_insert_pfn(&cvma, address, pfn); ba4e7d973dd09b Thomas Hellstrom 2009-06-10 309 /* ba4e7d973dd09b Thomas Hellstrom 2009-06-10 310 * Somebody beat us to this PTE or prefaulting to ba4e7d973dd09b Thomas Hellstrom 2009-06-10 311 * an already populated PTE, or prefaulting error. ba4e7d973dd09b Thomas Hellstrom 2009-06-10 312 */ ba4e7d973dd09b Thomas Hellstrom 2009-06-10 313 4daa4fba3a3899 Souptick Joarder 2018-06-02 314 if (unlikely((ret == VM_FAULT_NOPAGE && i > 0))) ba4e7d973dd09b Thomas Hellstrom 2009-06-10 315 break; 4daa4fba3a3899 Souptick Joarder 2018-06-02 316 else if (unlikely(ret & VM_FAULT_ERROR)) eba67093f53532 Thomas Hellstrom 2010-11-11 317 goto out_io_unlock; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 318 ba4e7d973dd09b Thomas Hellstrom 2009-06-10 319 address += PAGE_SIZE; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 320 if (unlikely(++page_offset >= page_last)) ba4e7d973dd09b Thomas Hellstrom 2009-06-10 321 break; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 322 } de8dfb8e3449c7 Tom St Denis 2018-01-26 323 ret = VM_FAULT_NOPAGE; eba67093f53532 Thomas Hellstrom 2010-11-11 324 out_io_unlock: eba67093f53532 Thomas Hellstrom 2010-11-11 325 ttm_mem_io_unlock(man); ba4e7d973dd09b Thomas Hellstrom 2009-06-10 326 out_unlock: 7e18f7a415538c Evan Quan 2019-02-18 327 kcl_reservation_object_unlock(bo->resv); de8dfb8e3449c7 Tom St Denis 2018-01-26 328 return ret; ba4e7d973dd09b Thomas Hellstrom 2009-06-10 329 } ba4e7d973dd09b Thomas Hellstrom 2009-06-10 330 :::::: The code at line 128 was first introduced by commit :::::: ba4e7d973dd09b66912ac4c0856add8b0703a997 drm: Add the TTM GPU memory manager subsystem. :::::: TO: Thomas Hellstrom <thellstrom(a)vmware.com> :::::: CC: Dave Airlie <airlied(a)redhat.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

Individuals interested in VESA memberships?
by Lyude Paul 02 Nov '19

02 Nov '19

Hi! Recently I've been working with the rest of the X.Org board to try to get X.org access to VESA memberships so that contributors that don't have an employer who is able/willing to join VESA can potentially get access to the various benefits of a VESA membership, such as access to DisplayPort specifications. Since I need to gather a list of interested X.org members, I'd like to know who all might be interested in a membership like this. There are no costs involved, as the VESA membership we're looking at in particular comes at no cost to us since we're a non-profit. The current plan is to extend VESA membership to X.Org members who specifically request it. If you think you'd be at all interested in this, or know any projects or contributors who would be, please feel free to respond to this message and let me know! -- Cheers, Lyude Paul

4 3

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel November 2019