dri-devel March 2022

dri-devel@lists.freedesktop.org

370 participants
780 discussions

[RESEND v13 00/22] Add MediaTek SoC DRM (vdosys1) support for mt8195
by Nancy.Lin 10 Mar '22

10 Mar '22

The hardware path of vdosys1 with DPTx output need to go through by several modules, such as, OVL_ADAPTOR and MERGE. Add DRM and these modules support by the patches below: Resend v13 - add related maintainer in maillist Changes in v13: - fix reviewer comment in v12 - fix rdma dt-binding format - fix dts node naming - fix 32 bit build error - modify 64bit dependency for mtk-mmsys - rebase to vdosys0 series v16. (ref [5]) Changes in v12: - fix reviewer comment in v11 - modify mbox index - refine dma dev for ovl_adaptor sub driver Changes in v11: - remove ethdr vblank spin lock - refine ovl_adaptor print message Changes in v10: - refine ethdr reset control using devm_reset_control_array_get_optional_exclusive - fix ovl_adaptor mtk_ovl_adaptor_clk_enable error handle issue Changes in v9: - rebase on kernel-5.16-rc1 - rebase on vdosys0 series v13. (ref [5]) - fix ovl_adaptor sub driver is brought up unintentionally - fix clang build test fail- duplicate ethdr/mdp_rdma init_module/cleanup_module symbol issue Changes in v8: - separate merge async reset to new patch. - separate drm ovl_adaptor sub driver to new patch. - fix reviewer comment in v7. Changes in v7: - rebase on vdosys0 series v12 (ref[5]) - add dma description in ethdr binding document. - refine vdosys1 bit definition of mmsys routing table. - separate merge modification into 3 pathces. - separate mutex modification into 2 patches. - add plane color coding for mdp_rdma csc. - move mdp_rdma pm control to ovl_adaptor. - fix reviewer comment in v6. Changes in v6: - rebase on kernel-5.15-rc1. - change mbox label to gce0 for dts node of vdosys1. - modify mmsys reset num for mt8195. - rebase on vdosys0 series v10. (ref [5]) - use drm to bring up ovl_adaptor driver. - move drm iommu/mutex check from kms init to drm bind. - modify rdma binding doc location. (Documentation/devicetree/bindings/arm/) - modify for reviewer's comment in v5. Changes in v5: - add mmsys reset controller reference. Changes in v4: - use merge common driver for merge1~4. - refine ovl_adaptor rdma driver. - use ovl_adaptor ddp_comp function instead of ethdr. - modify for reviewer's comment in v3. Changes in v3: - modify for reviewer's comment in v2. - add vdosys1 2 pixels align limit. - add mixer odd offset support. Changes in v2: - Merge PSEUDO_OVL and ETHDR into one DRM component. - Add mmsys config API for vdosys1 hardware setting. - Add mmsys reset control using linux reset framework. Signed-off-by: Nancy.Lin <nancy.lin(a)mediatek.com> This series are based on the following patch: [1] arm64: dts: Add mediatek SoC mt8195 and evaluation board https://patchwork.kernel.org/project/linux-mediatek/patch/20220112114724.19… [2] arm64: dts: mt8195: add IOMMU and smi nodes https://patchwork.kernel.org/project/linux-mediatek/patch/20210615173233.26… [3] arm64: dts: mt8195: add gce node https://patchwork.kernel.org/project/linux-mediatek/patch/20220126090109.32… [4] [v2] arm64: dts: mt8195: add display node for vdosys0 https://patchwork.kernel.org/project/linux-mediatek/patch/20220225021535.26… [5] Add MediaTek SoC DRM (vdosys0) support for mt8195 https://patchwork.kernel.org/project/linux-mediatek/list/?series=620795 Nancy.Lin (22): dt-bindings: mediatek: add vdosys1 RDMA definition for mt8195 dt-bindings: reset: mt8195: add vdosys1 reset control bit soc: mediatek: add mtk-mmsys support for mt8195 vdosys1 soc: mediatek: add mtk-mmsys config API for mt8195 vdosys1 soc: mediatek: add cmdq support of mtk-mmsys config API for mt8195 vdosys1 soc: mediatek: mmsys: modify reset controller for MT8195 vdosys1 soc: mediatek: mmsys: Specify 64BIT dependency for MTK_MMSYS soc: mediatek: change the mutex defines and the mutex_mod type soc: mediatek: add mtk-mutex support for mt8195 vdosys1 drm/mediatek: add display MDP RDMA support for MT8195 drm/mediatek: add display merge advance config API for MT8195 drm/mediatek: add display merge start/stop API for cmdq support drm/mediatek: add display merge mute/unmute support for MT8195 drm/mediatek: add display merge async reset control drm/mediatek: add ETHDR support for MT8195 drm/mediatek: add mediatek-drm plane color encoding info drm/mediatek: add ovl_adaptor support for MT8195 drm/mediatek: add dma dev get function drm/mediatek: modify mediatek-drm for mt8195 multi mmsys support drm/mediatek: add drm ovl_adaptor sub driver for MT8195 drm/mediatek: add mediatek-drm of vdosys1 support for MT8195 arm64: dts: mt8195: add display node for vdosys1 .../arm/mediatek/mediatek,mdp-rdma.yaml | 86 ++++ arch/arm64/boot/dts/mediatek/mt8195.dtsi | 223 +++++++++ drivers/gpu/drm/mediatek/Makefile | 5 +- drivers/gpu/drm/mediatek/mtk_disp_drv.h | 29 ++ drivers/gpu/drm/mediatek/mtk_disp_merge.c | 89 +++- .../gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 443 ++++++++++++++++++ drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 55 ++- drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 4 +- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 31 +- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 9 + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 329 +++++++++---- drivers/gpu/drm/mediatek/mtk_drm_drv.h | 13 +- drivers/gpu/drm/mediatek/mtk_drm_plane.c | 1 + drivers/gpu/drm/mediatek/mtk_drm_plane.h | 1 + drivers/gpu/drm/mediatek/mtk_ethdr.c | 376 +++++++++++++++ drivers/gpu/drm/mediatek/mtk_ethdr.h | 23 + drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 315 +++++++++++++ drivers/gpu/drm/mediatek/mtk_mdp_rdma.h | 20 + drivers/soc/mediatek/Kconfig | 1 + drivers/soc/mediatek/mt8195-mmsys.h | 199 ++++++++ drivers/soc/mediatek/mtk-mmsys.c | 79 +++- drivers/soc/mediatek/mtk-mmsys.h | 11 + drivers/soc/mediatek/mtk-mutex.c | 318 +++++++------ include/dt-bindings/reset/mt8195-resets.h | 12 + include/linux/soc/mediatek/mtk-mmsys.h | 22 + 25 files changed, 2439 insertions(+), 255 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mdp-rdma.yaml create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c create mode 100644 drivers/gpu/drm/mediatek/mtk_ethdr.c create mode 100644 drivers/gpu/drm/mediatek/mtk_ethdr.h create mode 100644 drivers/gpu/drm/mediatek/mtk_mdp_rdma.c create mode 100644 drivers/gpu/drm/mediatek/mtk_mdp_rdma.h -- 2.18.0

2 26

[PATCH 00/16] DEPT(Dependency Tracker)
by Byungchul Park 10 Mar '22

10 Mar '22

Hi Linus and folks, I've been developing a tool for detecting deadlock possibilities by tracking wait/event rather than lock(?) acquisition order to try to cover all synchonization machanisms. It's done on v5.17-rc1 tag. https://github.com/lgebyungchulpark/linux-dept/commits/dept1.12_on_v5.17-rc1 Benifit: 0. Works with all lock primitives. 1. Works with wait_for_completion()/complete(). 2. Works with 'wait' on PG_locked. 3. Works with 'wait' on PG_writeback. 4. Works with swait/wakeup. 5. Works with waitqueue. 6. Multiple reports are allowed. 7. Deduplication control on multiple reports. 8. Withstand false positives thanks to 6. 9. Easy to tag any wait/event. Future work: 0. To make it more stable. 1. To separates Dept from Lockdep. 2. To improves performance in terms of time and space. 3. To use Dept as a dependency engine for Lockdep. 4. To add any missing tags of wait/event in the kernel. 5. To deduplicate stack trace. I've got several reports from the tool. Some of them look like false alarms and some others look like real deadlock possibility. Because of my unfamiliarity of the domain, it's hard to confirm if it's a real one. Let me add the reports on this email thread. How to interpret the report is: 1. E(event) in each context cannot be triggered because of the W(wait) that cannot be woken. 2. The stack trace helping find the problematic code is located in each conext's detail. Changes from RFC: 1. Prevent adding a wait tag at prepare_to_wait() but __schedule(). 2. Use try version at lockdep_acquire_cpus_lock() annotation. 3. Distinguish each syscall context from another. Thanks, Byungchul Byungchul Park (16): llist: Move llist_{head,node} definition to types.h dept: Implement Dept(Dependency Tracker) dept: Embed Dept data in Lockdep dept: Apply Dept to spinlock dept: Apply Dept to mutex families dept: Apply Dept to rwlock dept: Apply Dept to wait_for_completion()/complete() dept: Apply Dept to seqlock dept: Apply Dept to rwsem dept: Add proc knobs to show stats and dependency graph dept: Introduce split map concept and new APIs for them dept: Apply Dept to wait/event of PG_{locked,writeback} dept: Apply SDT to swait dept: Apply SDT to wait(waitqueue) locking/lockdep, cpu/hotplus: Use a weaker annotation in AP thread dept: Distinguish each syscall context from another include/linux/completion.h | 42 +- include/linux/dept.h | 523 +++++++ include/linux/dept_page.h | 78 ++ include/linux/dept_sdt.h | 62 + include/linux/hardirq.h | 3 + include/linux/irqflags.h | 33 +- include/linux/llist.h | 8 - include/linux/lockdep.h | 156 ++- include/linux/lockdep_types.h | 3 + include/linux/mutex.h | 31 + include/linux/page-flags.h | 45 +- include/linux/pagemap.h | 7 +- include/linux/percpu-rwsem.h | 10 +- include/linux/rtmutex.h | 7 + include/linux/rwlock.h | 48 + include/linux/rwlock_api_smp.h | 8 +- include/linux/rwlock_types.h | 7 + include/linux/rwsem.h | 31 + include/linux/sched.h | 7 + include/linux/seqlock.h | 59 +- include/linux/spinlock.h | 24 + include/linux/spinlock_types_raw.h | 13 + include/linux/swait.h | 4 + include/linux/types.h | 8 + include/linux/wait.h | 6 +- init/init_task.c | 2 + init/main.c | 4 + kernel/Makefile | 1 + kernel/cpu.c | 2 +- kernel/dependency/Makefile | 5 + kernel/dependency/dept.c | 2702 ++++++++++++++++++++++++++++++++++++ kernel/dependency/dept_hash.h | 10 + kernel/dependency/dept_internal.h | 26 + kernel/dependency/dept_object.h | 13 + kernel/dependency/dept_proc.c | 93 ++ kernel/entry/common.c | 3 + kernel/exit.c | 1 + kernel/fork.c | 2 + kernel/locking/lockdep.c | 12 +- kernel/module.c | 2 + kernel/sched/completion.c | 12 +- kernel/sched/core.c | 3 + kernel/sched/swait.c | 10 + kernel/sched/wait.c | 16 + kernel/softirq.c | 6 +- kernel/trace/trace_preemptirq.c | 19 +- lib/Kconfig.debug | 21 + mm/filemap.c | 68 + mm/page_ext.c | 5 + 49 files changed, 4204 insertions(+), 57 deletions(-) create mode 100644 include/linux/dept.h create mode 100644 include/linux/dept_page.h create mode 100644 include/linux/dept_sdt.h create mode 100644 kernel/dependency/Makefile create mode 100644 kernel/dependency/dept.c create mode 100644 kernel/dependency/dept_hash.h create mode 100644 kernel/dependency/dept_internal.h create mode 100644 kernel/dependency/dept_object.h create mode 100644 kernel/dependency/dept_proc.c -- 1.9.1

7 63

[PATCH] drm/i915/uapi: Add DRM_I915_QUERY_GEOMETRY_SUBSLICES
by Matt Atwood 10 Mar '22

10 Mar '22

Newer platforms have DSS that aren't necessarily available for both geometry and compute, two queries will need to exist. This introduces the first, when passing a valid engine class and engine instance in the flags returns a topology describing geometry. Cc: Ashutosh Dixit <ashutosh.dixit(a)intel.com> Cc: Matt Roper <matthew.d.roper(a)intel.com> UMD (mesa): https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14143 Signed-off-by: Matt Atwood <matthew.s.atwood(a)intel.com> --- drivers/gpu/drm/i915/i915_query.c | 68 ++++++++++++++++++++++--------- include/uapi/drm/i915_drm.h | 24 +++++++---- 2 files changed, 65 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_query.c b/drivers/gpu/drm/i915/i915_query.c index 2dfbc22857a3..0cc2670ae09c 100644 --- a/drivers/gpu/drm/i915/i915_query.c +++ b/drivers/gpu/drm/i915/i915_query.c @@ -9,6 +9,7 @@ #include "i915_drv.h" #include "i915_perf.h" #include "i915_query.h" +#include "gt/intel_engine_user.h" #include <uapi/drm/i915_drm.h> static int copy_query_item(void *query_hdr, size_t query_sz, @@ -28,36 +29,30 @@ static int copy_query_item(void *query_hdr, size_t query_sz, return 0; } -static int query_topology_info(struct drm_i915_private *dev_priv, - struct drm_i915_query_item *query_item) +static int fill_topology_info(const struct sseu_dev_info *sseu, + struct drm_i915_query_item *query_item, + const u8 *subslice_mask) { - const struct sseu_dev_info *sseu = &to_gt(dev_priv)->info.sseu; struct drm_i915_query_topology_info topo; u32 slice_length, subslice_length, eu_length, total_length; int ret; - if (query_item->flags != 0) - return -EINVAL; + BUILD_BUG_ON(sizeof(u8) != sizeof(sseu->slice_mask)); if (sseu->max_slices == 0) return -ENODEV; - BUILD_BUG_ON(sizeof(u8) != sizeof(sseu->slice_mask)); - slice_length = sizeof(sseu->slice_mask); subslice_length = sseu->max_slices * sseu->ss_stride; eu_length = sseu->max_slices * sseu->max_subslices * sseu->eu_stride; total_length = sizeof(topo) + slice_length + subslice_length + eu_length; - ret = copy_query_item(&topo, sizeof(topo), total_length, - query_item); + ret = copy_query_item(&topo, sizeof(topo), total_length, query_item); + if (ret != 0) return ret; - if (topo.flags != 0) - return -EINVAL; - memset(&topo, 0, sizeof(topo)); topo.max_slices = sseu->max_slices; topo.max_subslices = sseu->max_subslices; @@ -69,27 +64,61 @@ static int query_topology_info(struct drm_i915_private *dev_priv, topo.eu_stride = sseu->eu_stride; if (copy_to_user(u64_to_user_ptr(query_item->data_ptr), - &topo, sizeof(topo))) + &topo, sizeof(topo))) return -EFAULT; if (copy_to_user(u64_to_user_ptr(query_item->data_ptr + sizeof(topo)), - &sseu->slice_mask, slice_length)) + &sseu->slice_mask, slice_length)) return -EFAULT; if (copy_to_user(u64_to_user_ptr(query_item->data_ptr + - sizeof(topo) + slice_length), - sseu->subslice_mask, subslice_length)) + sizeof(topo) + slice_length), + subslice_mask, subslice_length)) return -EFAULT; if (copy_to_user(u64_to_user_ptr(query_item->data_ptr + - sizeof(topo) + - slice_length + subslice_length), - sseu->eu_mask, eu_length)) + sizeof(topo) + + slice_length + subslice_length), + sseu->eu_mask, eu_length)) return -EFAULT; return total_length; } +static int query_topology_info(struct drm_i915_private *dev_priv, + struct drm_i915_query_item *query_item) +{ + const struct sseu_dev_info *sseu = &to_gt(dev_priv )->info.sseu; + + if (query_item->flags != 0) + return -EINVAL; + + return fill_topology_info(sseu, query_item, sseu->subslice_mask); +} + +static int query_geometry_subslices(struct drm_i915_private *i915, + struct drm_i915_query_item *query_item) +{ + const struct sseu_dev_info *sseu; + struct intel_engine_cs *engine; + u8 engine_class, engine_instance; + + if (GRAPHICS_VER_FULL(i915) < IP_VER(12, 50)) + return -ENODEV; + + engine_class = query_item->flags & 0xFF; + engine_instance = (query_item->flags >>8) & 0xFF; + + engine = intel_engine_lookup_user(i915, engine_class, engine_instance); + + if(!engine) + return -EINVAL; + + sseu = &engine->gt->info.sseu; + + return fill_topology_info(sseu, query_item, sseu->geometry_subslice_mask); +} + static int query_engine_info(struct drm_i915_private *i915, struct drm_i915_query_item *query_item) @@ -485,6 +514,7 @@ static int (* const i915_query_funcs[])(struct drm_i915_private *dev_priv, query_engine_info, query_perf_config, query_memregion_info, + query_geometry_subslices, }; int i915_query_ioctl(struct drm_device *dev, void *data, struct drm_file *file) diff --git a/include/uapi/drm/i915_drm.h b/include/uapi/drm/i915_drm.h index 05c3642aaece..ac75d8b85803 100644 --- a/include/uapi/drm/i915_drm.h +++ b/include/uapi/drm/i915_drm.h @@ -2687,10 +2687,11 @@ struct drm_i915_perf_oa_config { struct drm_i915_query_item { /** @query_id: The id for this query */ __u64 query_id; -#define DRM_I915_QUERY_TOPOLOGY_INFO 1 -#define DRM_I915_QUERY_ENGINE_INFO 2 -#define DRM_I915_QUERY_PERF_CONFIG 3 -#define DRM_I915_QUERY_MEMORY_REGIONS 4 +#define DRM_I915_QUERY_TOPOLOGY_INFO 1 +#define DRM_I915_QUERY_ENGINE_INFO 2 +#define DRM_I915_QUERY_PERF_CONFIG 3 +#define DRM_I915_QUERY_MEMORY_REGIONS 4 +#define DRM_I915_QUERY_GEOMETRY_SUBSLICES 5 /* Must be kept compact -- no holes and well documented */ /** @@ -2714,6 +2715,9 @@ struct drm_i915_query_item { * - DRM_I915_QUERY_PERF_CONFIG_LIST * - DRM_I915_QUERY_PERF_CONFIG_DATA_FOR_UUID * - DRM_I915_QUERY_PERF_CONFIG_FOR_UUID + * + * When query_id == DRM_I915_QUERY_GEOMETRY_SUBSLICES must have bits 0:7 set + * as a valid engine class, and bits 8:15 must have a valid engine instance. */ __u32 flags; #define DRM_I915_QUERY_PERF_CONFIG_LIST 1 @@ -2772,16 +2776,20 @@ struct drm_i915_query { }; /* - * Data written by the kernel with query DRM_I915_QUERY_TOPOLOGY_INFO : + * Data written by the kernel with query DRM_I915_QUERY_TOPOLOGY_INFO, + * DRM_I915_QUERY_GEOMETRY_SUBSLICE: * * data: contains the 3 pieces of information : * - * - the slice mask with one bit per slice telling whether a slice is - * available. The availability of slice X can be queried with the following - * formula : + * - For DRM_I915_QUERY_TOPOLOGY_INFO the slice mask with one bit per slice + * telling whether a slice is available. The availability of slice X can be + * queried with the following formula : * * (data[X / 8] >> (X % 8)) & 1 * + * - For DRM_I915_QUERY_GEOMETRY_SUBSLICES Slices are equal to 1 and this field + * is not used. + * * - the subslice mask for each slice with one bit per subslice telling * whether a subslice is available. Gen12 has dual-subslices, which are * similar to two gen11 subslices. For gen12, this array represents dual- -- 2.21.3

1 0

[pull] amdgpu, amdkfd drm-next-5.18
by Alex Deucher 09 Mar '22

09 Mar '22

Hi Dave, Daniel, Same PR from last week with fixed Fixes tag, clang warning fix, and a CS rework regression fix. The following changes since commit 38a15ad9488e21cad8f42d3befca20f91e5b2874: Merge tag 'amd-drm-next-5.18-2022-02-25' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2022-03-01 16:19:02 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.18-2022-03-09 for you to fetch changes up to 96a2f0f2c8006d338a9647e068a15c6eb299f864: drm/amdgpu: fix a wrong ib reference (2022-03-09 17:28:37 -0500) ---------------------------------------------------------------- amd-drm-next-5.18-2022-03-09: amdgpu: - Misc code cleanups - Misc display fixes - PSR display fixes - More RAS cleanup - Hotplug fix - Bump minor version for hotplug tests - SR-IOV fixes - GC 10.3.7 updates - Remove some firmwares which are no longer used - Mode2 reset refactor - Aldebaran fixes - Add VCN fwlog feature for VCN debugging - CS code cleanup - Fix clang warning - Fix CS clean up rebase breakage amdkfd: - SVM fixes - SMI event fixes and cleanups - vmid_pasid mapping fix for gfx10.3 ---------------------------------------------------------------- Alex Deucher (4): drm/amdgpu: Use IP versions in convert_tiling_flags_to_modifier() drm/amdgpu: remove unused gpu_info firmwares drm/amdgpu/gfx10: drop unused cyan skillfish firmware drm/amdgpu/sdma5: drop unused cyan skillfish firmware Andrey Grodzovsky (2): drm/amdgpu: Fix sigsev when accessing MMIO on hot unplug. drm/amdgpu: Bump minor version for hot plug tests enabling. Anthony Koo (1): drm/amd/display: [FW Promotion] Release 0.0.106.0 Aric Cyr (1): drm/amd/display: 3.2.175 Charlene Liu (1): drm/amd/display: add verify_link_cap back for hdmi Chris Park (1): drm/amd/display: Reset VIC if HDMI_VIC is present Christian König (5): drm/amdgpu: install ctx entities with cmpxchg drm/amdgpu: header cleanup drm/amdgpu: use job and ib structures directly in CS parsers drm/amdgpu: properly embed the IBs into the job drm/amdgpu: initialize the vmid_wait with the stub fence Danijel Slivka (1): drm/amd/pm: new v3 SmuMetrics data structure for Sienna Cichlid David Yu (1): drm/amdgpu: Add DFC CAP support for aldebaran Dillon Varone (2): drm/amd/display: Add frame alternate 3D & restrict HW packed on dongles drm/amd/display: Modify plane removal sequence to avoid hangs. George Shen (1): drm/amd/display: Refactor fixed VS w/a for PHY tests Hansen Dsouza (1): drm/amd/display: Remove invalid RDPCS Programming in DAL Harish Kasiviswanathan (1): drm/amdgpu: Set correct DMA mask for aldebaran Jingwen Chen (1): drm/amd/amdgpu: set disabled vcn to no_schduler Lang Yu (1): drm/amdgpu: fix a wrong ib reference Lijo Lazar (1): drm/amdgpu: Refactor mode2 reset logic for v13.0.2 Luben Tuikov (1): drm/amd/display: Don't fill up the logs Meng Tang (1): gpu/amd: vega10_hwmgr: fix inappropriate private variable name Michael Strauss (1): drm/amd/display: Pass HostVM enable flag into DCN3.1 DML Nicholas Kazlauskas (1): drm/amd/display: Make functional resource functions non-static Philip Yang (4): Revert "drm/amdkfd: process_info lock not needed for svm" drm/amdkfd: Correct SMI event read size drm/amdkfd: Add SMI add event helper drm/amdkfd: Add format attribute to kfd_smi_event_add Prike Liang (4): drm/amdgpu: enable gfx clock gating control for GC 10.3.7 drm/amdgpu/nv: enable clock gating for GC 10.3.7 subblock drm/amdgpu: enable gfx power gating for GC 10.3.7 drm/amdgpu: enable gfxoff routine for GC 10.3.7 Qiang Yu (1): drm/amdgpu: fix suspend/resume hang regression Robin Chen (1): drm/amd/display: Pass deep sleep disabled allow info to dmub fw Ruijing Dong (2): drm/amdgpu/vcn: Update fw shared data structure drm/amdgpu/vcn: Add vcn firmware log Shah Dharati (1): drm/amd/display: Adding a dc_debug option and dmub setting to use PHY FSM for PSR Tom Rix (1): drm/amdgpu: Fix realloc of ptr Weiguo Li (1): drm/amdgpu: remove redundant null check Wesley Chalmers (1): drm/amd/display: Program OPP before ODM Yifan Zha (1): drm/amdgpu: Move CAP firmware loading to the beginning of PSP firmware list Yifan Zhang (5): drm/amdgpu: move amdgpu_gmc_noretry_set after ip_versions populated drm/amdgpu: convert code name to ip version for noretry set drm/amdkfd: judge get_atc_vmid_pasid_mapping_info before call drm/amdkfd: implement get_atc_vmid_pasid_mapping_info for gfx10.3 drm/amdkfd: bail out early if no get_atc_vmid_pasid_mapping_info jinzh (1): drm/amd/display: refine the EDID override yipechai (12): drm/amdgpu: Modify .ras_fini function pointer parameter drm/amdgpu: Optimize xxx_ras_fini function of each ras block drm/amdgpu: centrally calls the .ras_fini function of all ras blocks drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in gfx ras block drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in mmhub ras block drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in nbio ras block drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in umc ras block drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in xgmi ras block drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in hdp ras block drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in sdma ras block drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in mca ras block drm/amdgpu: Remove redundant .ras_fini initialization in some ras blocks drivers/gpu/drm/amd/amdgpu/aldebaran.c | 66 ++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 98 +---------- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h | 80 +++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 24 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 19 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 25 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 7 - drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 21 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 6 - drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 3 - drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 7 - drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 28 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 58 ++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 7 - drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 7 - drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 37 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 117 ++++++------- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 134 ++++++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 30 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 8 - drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 18 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 - drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 4 - drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 15 +- drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 1 - drivers/gpu/drm/amd/amdgpu/mca_v3_0.c | 18 -- drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 1 - drivers/gpu/drm/amd/amdgpu/nv.c | 15 +- drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 1 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 - drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 3 - drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 14 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 7 + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 22 ++- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 21 ++- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 51 +++--- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 5 + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 74 +++------ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 9 + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 8 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 14 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 16 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 + drivers/gpu/drm/amd/display/dc/dc.h | 4 +- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 1 + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 49 +++--- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 5 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 21 +-- .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 9 - .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 5 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h | 5 + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 3 + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 12 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 68 ++++---- .../inc/pmfw_if/smu11_driver_if_sienna_cichlid.h | 58 +++++++ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 181 ++++++++++++++------- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 1 + include/uapi/linux/kfd_ioctl.h | 1 + 84 files changed, 983 insertions(+), 671 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h

1 0

[pull] amdgpu, amdkfd drm-next-5.18
by Alex Deucher 09 Mar '22

09 Mar '22

Hi Dave, Daniel, Same PR as last week, just fixed up a bad Fixes tag. The following changes since commit 38a15ad9488e21cad8f42d3befca20f91e5b2874: Merge tag 'amd-drm-next-5.18-2022-02-25' of https://gitlab.freedesktop.org/agd5f/linux into drm-next (2022-03-01 16:19:02 +1000) are available in the Git repository at: https://gitlab.freedesktop.org/agd5f/linux.git tags/amd-drm-next-5.18-2022-03-07 for you to fetch changes up to 53b97af4a44abd21344cc9f13986ba53051287bb: drm/amdkfd: Add format attribute to kfd_smi_event_add (2022-03-07 14:59:59 -0500) ---------------------------------------------------------------- amd-drm-next-5.18-2022-03-07: amdgpu: - Misc code cleanups - Misc display fixes - PSR display fixes - More RAS cleanup - Hotplug fix - Bump minor version for hotplug tests - SR-IOV fixes - GC 10.3.7 updates - Remove some firmwares which are no longer used - Mode2 reset refactor - Aldebaran fixes - Add VCN fwlog feature for VCN debugging - CS code cleanup amdkfd: - SVM fixes - SMI event fixes and cleanups - vmid_pasid mapping fix for gfx10.3 ---------------------------------------------------------------- Alex Deucher (4): drm/amdgpu: Use IP versions in convert_tiling_flags_to_modifier() drm/amdgpu: remove unused gpu_info firmwares drm/amdgpu/gfx10: drop unused cyan skillfish firmware drm/amdgpu/sdma5: drop unused cyan skillfish firmware Andrey Grodzovsky (2): drm/amdgpu: Fix sigsev when accessing MMIO on hot unplug. drm/amdgpu: Bump minor version for hot plug tests enabling. Anthony Koo (1): drm/amd/display: [FW Promotion] Release 0.0.106.0 Aric Cyr (1): drm/amd/display: 3.2.175 Charlene Liu (1): drm/amd/display: add verify_link_cap back for hdmi Chris Park (1): drm/amd/display: Reset VIC if HDMI_VIC is present Christian König (5): drm/amdgpu: install ctx entities with cmpxchg drm/amdgpu: header cleanup drm/amdgpu: use job and ib structures directly in CS parsers drm/amdgpu: properly embed the IBs into the job drm/amdgpu: initialize the vmid_wait with the stub fence Danijel Slivka (1): drm/amd/pm: new v3 SmuMetrics data structure for Sienna Cichlid David Yu (1): drm/amdgpu: Add DFC CAP support for aldebaran Dillon Varone (2): drm/amd/display: Add frame alternate 3D & restrict HW packed on dongles drm/amd/display: Modify plane removal sequence to avoid hangs. George Shen (1): drm/amd/display: Refactor fixed VS w/a for PHY tests Hansen Dsouza (1): drm/amd/display: Remove invalid RDPCS Programming in DAL Harish Kasiviswanathan (1): drm/amdgpu: Set correct DMA mask for aldebaran Jingwen Chen (1): drm/amd/amdgpu: set disabled vcn to no_schduler Lijo Lazar (1): drm/amdgpu: Refactor mode2 reset logic for v13.0.2 Luben Tuikov (1): drm/amd/display: Don't fill up the logs Meng Tang (1): gpu/amd: vega10_hwmgr: fix inappropriate private variable name Michael Strauss (1): drm/amd/display: Pass HostVM enable flag into DCN3.1 DML Nicholas Kazlauskas (1): drm/amd/display: Make functional resource functions non-static Philip Yang (4): Revert "drm/amdkfd: process_info lock not needed for svm" drm/amdkfd: Correct SMI event read size drm/amdkfd: Add SMI add event helper drm/amdkfd: Add format attribute to kfd_smi_event_add Prike Liang (4): drm/amdgpu: enable gfx clock gating control for GC 10.3.7 drm/amdgpu/nv: enable clock gating for GC 10.3.7 subblock drm/amdgpu: enable gfx power gating for GC 10.3.7 drm/amdgpu: enable gfxoff routine for GC 10.3.7 Qiang Yu (1): drm/amdgpu: fix suspend/resume hang regression Robin Chen (1): drm/amd/display: Pass deep sleep disabled allow info to dmub fw Ruijing Dong (2): drm/amdgpu/vcn: Update fw shared data structure drm/amdgpu/vcn: Add vcn firmware log Shah Dharati (1): drm/amd/display: Adding a dc_debug option and dmub setting to use PHY FSM for PSR Tom Rix (1): drm/amdgpu: Fix realloc of ptr Weiguo Li (1): drm/amdgpu: remove redundant null check Wesley Chalmers (1): drm/amd/display: Program OPP before ODM Yifan Zha (1): drm/amdgpu: Move CAP firmware loading to the beginning of PSP firmware list Yifan Zhang (4): drm/amdgpu: move amdgpu_gmc_noretry_set after ip_versions populated drm/amdgpu: convert code name to ip version for noretry set drm/amdkfd: judge get_atc_vmid_pasid_mapping_info before call drm/amdkfd: implement get_atc_vmid_pasid_mapping_info for gfx10.3 jinzh (1): drm/amd/display: refine the EDID override yipechai (12): drm/amdgpu: Modify .ras_fini function pointer parameter drm/amdgpu: Optimize xxx_ras_fini function of each ras block drm/amdgpu: centrally calls the .ras_fini function of all ras blocks drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in gfx ras block drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in mmhub ras block drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in nbio ras block drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in umc ras block drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in xgmi ras block drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in hdp ras block drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in sdma ras block drm/amdgpu: Remove redundant calls of amdgpu_ras_block_late_fini in mca ras block drm/amdgpu: Remove redundant .ras_fini initialization in some ras blocks drivers/gpu/drm/amd/amdgpu/aldebaran.c | 66 ++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 98 +---------- .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h | 80 +++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 24 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 19 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 25 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 11 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 7 - drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 21 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 9 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 6 - drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 3 - drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 7 - drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 28 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 8 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 58 ++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 7 - drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 7 - drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 37 ++--- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 4 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 117 ++++++------- drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 7 +- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 134 ++++++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 30 +++- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 3 +- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 8 - drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 18 +- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 7 - drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 4 - drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 15 +- drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 1 - drivers/gpu/drm/amd/amdgpu/mca_v3_0.c | 18 -- drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 1 - drivers/gpu/drm/amd/amdgpu/nv.c | 15 +- drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 1 + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 8 - drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/soc15.c | 3 - drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 14 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 7 + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 22 ++- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 21 ++- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 51 +++--- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 18 +- drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 74 +++------ drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 9 + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 8 +- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 14 +- drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 16 +- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 2 + drivers/gpu/drm/amd/display/dc/dc.h | 4 +- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 1 + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 49 +++--- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 5 +- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 21 +-- .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 9 - .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 5 +- .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.h | 5 + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 1 + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 3 + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 12 +- .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 68 ++++---- .../inc/pmfw_if/smu11_driver_if_sienna_cichlid.h | 58 +++++++ .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 181 ++++++++++++++------- drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 1 + include/uapi/linux/kfd_ioctl.h | 1 + 84 files changed, 991 insertions(+), 679 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h

3 3

[PATCH] fixup! drm/amdkfd: CRIU export dmabuf handles for GTT BOs
by David Yat Sin 09 Mar '22

09 Mar '22

Signed-off-by: David Yat Sin <david.yatsin(a)amd.com> --- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 ++++++ include/uapi/linux/kfd_ioctl.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c index e1e2362841f8..607f65ab39ac 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c @@ -1767,7 +1767,10 @@ static int criu_checkpoint_bos(struct kfd_process *p, &bo_bucket->dmabuf_fd); if (ret) goto exit; + } else { + bo_bucket->dmabuf_fd = KFD_INVALID_FD; } + if (bo_bucket->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL) bo_bucket->offset = KFD_MMAP_TYPE_DOORBELL | KFD_MMAP_GPU_ID(pdd->dev->id); @@ -2219,7 +2222,10 @@ static int criu_restore_bo(struct kfd_process *p, &bo_bucket->dmabuf_fd); if (ret) return ret; + } else { + bo_bucket->dmabuf_fd = KFD_INVALID_FD; } + return 0; } diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h index eb9ff85f8556..42975e940758 100644 --- a/include/uapi/linux/kfd_ioctl.h +++ b/include/uapi/linux/kfd_ioctl.h @@ -196,6 +196,8 @@ struct kfd_ioctl_dbg_wave_control_args { __u32 buf_size_in_bytes; /*including gpu_id and buf_size */ }; +#define KFD_INVALID_FD 0xffffffff + /* Matching HSA_EVENTTYPE */ #define KFD_IOC_EVENT_SIGNAL 0 #define KFD_IOC_EVENT_NODECHANGE 1 -- 2.35.1

3 2

[PATCH] drm/amdkfd: Set handle to invalid for non GTT/VRAM BOs
by David Yat Sin 09 Mar '22

09 Mar '22

Set dmabuf handle to invalid for BOs that cannot be accessed using SDMA during checkpoint/restore. Signed-off-by: David Yat Sin <david.yatsin(a)amd.com> --- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 8 ++++++-- include/uapi/linux/kfd_ioctl.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c index e1e2362841f8..1ffa976ad318 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_chardev.c @@ -1767,7 +1767,9 @@ static int criu_checkpoint_bos(struct kfd_process *p, &bo_bucket->dmabuf_fd); if (ret) goto exit; - } + } else + bo_bucket->dmabuf_fd = KFD_INVALID_FD; + if (bo_bucket->alloc_flags & KFD_IOC_ALLOC_MEM_FLAGS_DOORBELL) bo_bucket->offset = KFD_MMAP_TYPE_DOORBELL | KFD_MMAP_GPU_ID(pdd->dev->id); @@ -2219,7 +2221,9 @@ static int criu_restore_bo(struct kfd_process *p, &bo_bucket->dmabuf_fd); if (ret) return ret; - } + } else + bo_bucket->dmabuf_fd = KFD_INVALID_FD; + return 0; } diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h index eb9ff85f8556..42975e940758 100644 --- a/include/uapi/linux/kfd_ioctl.h +++ b/include/uapi/linux/kfd_ioctl.h @@ -196,6 +196,8 @@ struct kfd_ioctl_dbg_wave_control_args { __u32 buf_size_in_bytes; /*including gpu_id and buf_size */ }; +#define KFD_INVALID_FD 0xffffffff + /* Matching HSA_EVENTTYPE */ #define KFD_IOC_EVENT_SIGNAL 0 #define KFD_IOC_EVENT_NODECHANGE 1 -- 2.35.1

3 3

[PATCH v6 0/6] drm: Add driver for Solomon SSD130x OLED displays
by Javier Martinez Canillas 09 Mar '22

09 Mar '22

This patch series adds a DRM driver for the Solomon OLED SSD1305, SSD1306, SSD1307 and SSD1309 displays. It is a port of the ssd1307fb fbdev driver. Using the DRM fbdev emulation, all the tests from Geert Uytterhoeven repo (https://git.kernel.org/pub/scm/linux/kernel/git/geert/fbtest.git) passes. I've also tested it using the display as a VT output and even though fbcon seems to work, it is mostly unusable on a 128x64 SSD1306 display. This is a v6 that addresses the issues pointed in v5. Thanks a lot to all reviewers that gave me feedback and comments. I didn't include the patch that adds the SPI support this time, because it will require changes in the existing Device Tree binding. And I wanted to avoid that bikesheeding for now, to focus on the core and I2C parts. Once this series land, I'll post patches for the SPI support. But the WIP patch posted in v3 should still apply cleanly on top of this v6: https://patchwork.kernel.org/project/dri-devel/patch/20220209091204.2513437… Patch #1 splits per-line conversion logic in drm_fb_xrgb8888_to_gray8() to a separate drm_fb_xrgb8888_to_gray8_line() helper function. Patch #2 adds a new drm_fb_xrgb8888_to_mono_reversed() helper function to convert from XR24 to reversed monochrome. The latter internally converts each line first to 8-bit grayscale and then to 1-bit reversed monochrome. Patch #3 adds the driver. This only has the core support and doesn't have any bus specific code, separate drivers are needed for the transport used. Patch #4 adds a driver to use the I2C bus to communicate with the device. Patch #5 adds a MAINTAINERS entry for the DRM driver and patch #6 adds myself as co-maintainer of the existing DT binding for the ssd1307fb, since the same DT binding is used for both the fbdev and DRM drivers. Best regards, Javier Changes in v6: - Add Andy Shevchenko's Reviewed-by to patch #1. - Add Andy Shevchenko's Reviewed-by to patch #2. - Just return regmap_bulk_write() in ssd130x_write_data() (Andy Shevchenko) - Remove unnecessary cast in ssd130x_write_cmd() (Andy Shevchenko) - Return ERR_PTR(dev_err_probe(...)) everywhere in probe (Andy Shevchenko) Changes in v5: - Add Thomas Zimmermann's Reviewed-by to patch #1. - Use drm_WARN_ON* macros instead of deprecated ones (Thomas Zimmermann) - Include <linux/bits.h> header (Andy Shevchenko) - Drop parenthesis for command options macros (Andy Shevchenko) - Explain in ssd130x_write_cmd() comment how commands are sent (Andy Shevchenko) - The pwm_*() functions check for NULL already (Andy Shevchenko) - Remove unnecesary blank line (Andy Shevchenko) - Simplify error handling for backlight registration failure (Geert Uytterhoeven) - Don't clear screen on enable, instead send the full buffer (Thomas Zimmermann) - Add Andy Shevchenko's Reviewed-by tag to patch #4. - Add Andy Shevchenko's Reviewed-by tag to patch #5. - Add Andy Shevchenko's Reviewed-by tag to patch #6. Changes in v4: - Rename end_offset to end_len (Thomas Zimmermann) - Warn once if dst_pitch is not a multiple of 8 (Thomas Zimmermann) - Drop drm_fb_gray8_to_mono_reversed() that's not used (Thomas Zimmermann) - Allocate single buffer for both copy cma memory and gray8 (Thomas Zimmermann) - Add Thomas Zimmermann Reviewed-by tag to patch adding XR24 -> mono helper. - Rename vbat supply to vcc since is how's labeled in the device (Mark Brown) - Don't make the regulator option since is always needed (Mark Brown) - Add solomon Kconfig source and directory inclusion sorted (Andy Shevchenko) - Use SSD130x instead of SSD130X to denote is not a model name (Andy Shevchenko) - Check if there's a reset pin in the callee and not the caller (Andy Shevchenko) - Define missing commands instead of using magic numbers (Andy Shevchenko) - Use GENMASK() and FIELD_PREP() macros when possible (Andy Shevchenko) - Avoid using ternary operators to ease code readablity (Andy Shevchenko) - Use i++ instead of --i on some for loops (Andy Shevchenko) - Remove redundant blank lines (Andy Shevchenko) - Rename power_off label to out_power_off (Andy Shevchenko) - Use dev_err_probe() even if no -EPROBE_DEFER (Andy Shevchenko) - Don't use plural Authors if there's only one (Andy Shevchenko) - Remove unnecessary casting (Geert Uytterhoeven) - Remove redundant blank lines (Andy Shevchenko) - Remove comma after of_device_id table terminator (Andy Shevchenko) - Add Rob Herring Acked-by tag to patch adding as DT binding co-maintainer. Changes in v3: - Add a drm_fb_xrgb8888_to_gray8_line() helper function (Thomas Zimmermann) - Also add a drm_fb_xrgb8888_to_mono_reversed() helper (Thomas Zimmermann) - Split lines copy to drm_fb_gray8_to_mono_reversed_line() (Thomas Zimmermann) - Handle case where the source buffer is not aligned to 8 (Thomas Zimmermann) - Move driver from tiny sub-dir to drivers/gpu/drm/solomon (Sam Ravnborg) - Split driver in a bus agnostic core and bus specific (Andy Shevchenko) - Use regmap to access the chip registers (Andy Shevchenko) - Remove unnecessary blank lines (Andy Shevchenko) - Remove unneeded inline specifier in functions (Andy Shevchenko) - Add a comment about always returning a single mode (Andy Shevchenko) - Change write command logic to use do while loop (Andy Shevchenko) - Use "firmware description" instead of "device tree" (Andy Shevchenko) - Use return foo() instead of returning the return value (Andy Shevchenko) - Don't split lines longer than 80 chars if makes less readable (Andy Shevchenko) - Remove redundant else statements in .mode_valid callback (Andy Shevchenko) - Rename powero{n,ff}() functions to power_o{n,ff)() (Andy Shevchenko) - Use dev_err_probe() to prevent spam logs on probe deferral (Andy Shevchenko) - Remove ',' after sentinel terminator in array (Andy Shevchenko) - Fix a bug when doing partial updates (Geert Uytterhoeven) - Add a separate driver for SSD130X chips I2C support (Andy Shevchenko) - Adapt MAINTAINERS entry to point to the new drivers/gpu/drm/solomon directory. Changes in v2: - Drop patch that was adding a DRM_MODE_CONNECTOR_I2C type. - Invert order of backlight {en,dis}able and display {on,off} (Sam Ravnborg) - Don't clear the screen and turn on display on probe (Sam Ravnborg) - Use backlight_get_brightness() macro to get BL brightness (Sam Ravnborg) - Use dev managed version of devm_backlight_device_register() (Sam Ravnborg) - Use dev_name(dev) for backlight name instead of an array (Sam Ravnborg) - Drop the .get_brightness callback since isn't needed (Sam Ravnborg) - Rename driver to ssd130x since supports a display family (Thomas Zimmermann) - Drop the TINY prefix from the Kconfig symbol (Thomas Zimmermann) - Sort the Kconfig symbol dependencies alphabetically (Thomas Zimmermann) - Rename struct ssd130x_array to struct ssd130x_i2c_msg (Thomas Zimmermann) - Rename struct ssd130x_i2c_msg .type member to .cmd (Thomas Zimmermann) - Use sizeof(*foo) instead of sizeof(struct foo) (Thomas Zimmermann) - Use struct_size() macro to calculate sizeof(*foo) + len (Thomas Zimmermann) - Use kcalloc() instead of kmalloc_array() + memset() (Thomas Zimmermann) - Use shadow plane helpers virtual screen support (Thomas Zimmermann) - Remove unused goto label in ssd1307_fb_blit_rect() (Thomas Zimmermann) - Use drm_set_preferred_mode() inset of manually set (Thomas Zimmermann) - Use shadow plane helpers virtual screen support (Thomas Zimmermann) - Remove unused goto label in ssd1307_fb_blit_rect() (Thomas Zimmermann) - Use drm_set_preferred_mode() inset of manually set (Thomas Zimmermann) - Reorganize code in probe to make it more legible (Thomas Zimmermann) - ssd130x_write_cmd() uses varargs to simplify I2C code (Thomas Zimmermann) - Move regulator/pwm init logic to display pipe enable callback. - Add Sam Ravnborg's acked-by to patch adding a MAINTAINERS entry (Sam Ravnborg) - Add myself as co-maintainer of the ssd1370fb DT binding (Sam Ravnborg). Javier Martinez Canillas (6): drm/format-helper: Add drm_fb_xrgb8888_to_gray8_line() drm/format-helper: Add drm_fb_xrgb8888_to_mono_reversed() drm: Add driver for Solomon SSD130x OLED displays drm/solomon: Add SSD130x OLED displays I2C support MAINTAINERS: Add entry for Solomon SSD130x OLED displays DRM driver dt-bindings: display: ssd1307fb: Add myself as binding co-maintainer .../bindings/display/solomon,ssd1307fb.yaml | 1 + MAINTAINERS | 7 + drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/drm_format_helper.c | 141 ++- drivers/gpu/drm/solomon/Kconfig | 21 + drivers/gpu/drm/solomon/Makefile | 2 + drivers/gpu/drm/solomon/ssd130x-i2c.c | 116 +++ drivers/gpu/drm/solomon/ssd130x.c | 843 ++++++++++++++++++ drivers/gpu/drm/solomon/ssd130x.h | 76 ++ include/drm/drm_format_helper.h | 4 + 11 files changed, 1202 insertions(+), 12 deletions(-) create mode 100644 drivers/gpu/drm/solomon/Kconfig create mode 100644 drivers/gpu/drm/solomon/Makefile create mode 100644 drivers/gpu/drm/solomon/ssd130x-i2c.c create mode 100644 drivers/gpu/drm/solomon/ssd130x.c create mode 100644 drivers/gpu/drm/solomon/ssd130x.h -- 2.34.1

3 21

[PATCH AUTOSEL 5.4 14/19] drm/vrr: Set VRR capable prop only if it is attached to connector
by Sasha Levin 09 Mar '22

09 Mar '22

From: Manasi Navare <manasi.d.navare(a)intel.com> [ Upstream commit 62929726ef0ec72cbbe9440c5d125d4278b99894 ] VRR capable property is not attached by default to the connector It is attached only if VRR is supported. So if the driver tries to call drm core set prop function without it being attached that causes NULL dereference. Cc: Jani Nikula <jani.nikula(a)intel.com> Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Cc: dri-devel(a)lists.freedesktop.org Signed-off-by: Manasi Navare <manasi.d.navare(a)intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220225013055.9282-1-manasi.… Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/gpu/drm/drm_connector.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 2337b3827e6a..11a81e8ba963 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -1984,6 +1984,9 @@ EXPORT_SYMBOL(drm_connector_attach_max_bpc_property); void drm_connector_set_vrr_capable_property( struct drm_connector *connector, bool capable) { + if (!connector->vrr_capable_property) + return; + drm_object_property_set_value(&connector->base, connector->vrr_capable_property, capable); -- 2.34.1

1 0

[PATCH AUTOSEL 5.10 15/20] drm/vrr: Set VRR capable prop only if it is attached to connector
by Sasha Levin 09 Mar '22

09 Mar '22

From: Manasi Navare <manasi.d.navare(a)intel.com> [ Upstream commit 62929726ef0ec72cbbe9440c5d125d4278b99894 ] VRR capable property is not attached by default to the connector It is attached only if VRR is supported. So if the driver tries to call drm core set prop function without it being attached that causes NULL dereference. Cc: Jani Nikula <jani.nikula(a)intel.com> Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Cc: dri-devel(a)lists.freedesktop.org Signed-off-by: Manasi Navare <manasi.d.navare(a)intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220225013055.9282-1-manasi.… Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- drivers/gpu/drm/drm_connector.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 717c4e7271b0..5163433ac561 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -2155,6 +2155,9 @@ EXPORT_SYMBOL(drm_connector_attach_max_bpc_property); void drm_connector_set_vrr_capable_property( struct drm_connector *connector, bool capable) { + if (!connector->vrr_capable_property) + return; + drm_object_property_set_value(&connector->base, connector->vrr_capable_property, capable); -- 2.34.1

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
78
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel March 2022