dri-devel May 2022

dri-devel@lists.freedesktop.org

344 participants
736 discussions

[PATCH] drm/amdgpu/gfx: fix typos in comments
by Julia Lawall 23 May '22

23 May '22

Spelling mistakes (triple letters) in comments. Detected with the help of Coccinelle. Signed-off-by: Julia Lawall <Julia.Lawall(a)inria.fr> --- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c index 02754ee86c81..c5f46d264b23 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c @@ -5111,7 +5111,7 @@ static void gfx_v10_0_init_compute_vmid(struct amdgpu_device *adev) mutex_unlock(&adev->srbm_mutex); /* Initialize all compute VMIDs to have no GDS, GWS, or OA - acccess. These should be enabled by FW for target VMIDs. */ + access. These should be enabled by FW for target VMIDs. */ for (i = adev->vm_manager.first_kfd_vmid; i < AMDGPU_NUM_VMID; i++) { WREG32_SOC15_OFFSET(GC, 0, mmGDS_VMID0_BASE, 2 * i, 0); WREG32_SOC15_OFFSET(GC, 0, mmGDS_VMID0_SIZE, 2 * i, 0); diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c index fb9302910742..7f0b18b0d4c4 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c @@ -3714,7 +3714,7 @@ static void gfx_v8_0_init_compute_vmid(struct amdgpu_device *adev) mutex_unlock(&adev->srbm_mutex); /* Initialize all compute VMIDs to have no GDS, GWS, or OA - acccess. These should be enabled by FW for target VMIDs. */ + access. These should be enabled by FW for target VMIDs. */ for (i = adev->vm_manager.first_kfd_vmid; i < AMDGPU_NUM_VMID; i++) { WREG32(amdgpu_gds_reg_offset[i].mem_base, 0); WREG32(amdgpu_gds_reg_offset[i].mem_size, 0); @@ -5815,7 +5815,7 @@ static void gfx_v8_0_update_coarse_grain_clock_gating(struct amdgpu_device *adev /* wait for RLC_SERDES_CU_MASTER & RLC_SERDES_NONCU_MASTER idle */ gfx_v8_0_wait_for_rlc_serdes(adev); - /* write cmd to Set CGCG Overrride */ + /* write cmd to Set CGCG Override */ gfx_v8_0_send_serdes_cmd(adev, BPM_REG_CGCG_OVERRIDE, SET_BPM_SERDES_CMD); /* wait for RLC_SERDES_CU_MASTER & RLC_SERDES_NONCU_MASTER idle */ diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c index f12ae6e2359a..5349ca4d19e3 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c @@ -2535,7 +2535,7 @@ static void gfx_v9_0_init_compute_vmid(struct amdgpu_device *adev) mutex_unlock(&adev->srbm_mutex); /* Initialize all compute VMIDs to have no GDS, GWS, or OA - acccess. These should be enabled by FW for target VMIDs. */ + access. These should be enabled by FW for target VMIDs. */ for (i = adev->vm_manager.first_kfd_vmid; i < AMDGPU_NUM_VMID; i++) { WREG32_SOC15_OFFSET(GC, 0, mmGDS_VMID0_BASE, 2 * i, 0); WREG32_SOC15_OFFSET(GC, 0, mmGDS_VMID0_SIZE, 2 * i, 0);

2 1

[PATCH] drm/nouveau/tegra: remove needless NULL check
by Guo Zhengkui 23 May '22

23 May '22

There has already been NULL check in clk_prepare_enable() and clk_disable_unprepare(), so remove needless NULL check before calling them. Signed-off-by: Guo Zhengkui <guozhengkui(a)vivo.com> --- drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c index 2ed528c065fa..ac9e122586bc 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c @@ -41,11 +41,9 @@ nvkm_device_tegra_power_up(struct nvkm_device_tegra *tdev) ret = clk_prepare_enable(tdev->clk); if (ret) goto err_clk; - if (tdev->clk_ref) { - ret = clk_prepare_enable(tdev->clk_ref); - if (ret) - goto err_clk_ref; - } + ret = clk_prepare_enable(tdev->clk_ref); + if (ret) + goto err_clk_ref; ret = clk_prepare_enable(tdev->clk_pwr); if (ret) goto err_clk_pwr; @@ -70,8 +68,7 @@ nvkm_device_tegra_power_up(struct nvkm_device_tegra *tdev) err_clamp: clk_disable_unprepare(tdev->clk_pwr); err_clk_pwr: - if (tdev->clk_ref) - clk_disable_unprepare(tdev->clk_ref); + clk_disable_unprepare(tdev->clk_ref); err_clk_ref: clk_disable_unprepare(tdev->clk); err_clk: @@ -87,8 +84,7 @@ nvkm_device_tegra_power_down(struct nvkm_device_tegra *tdev) int ret; clk_disable_unprepare(tdev->clk_pwr); - if (tdev->clk_ref) - clk_disable_unprepare(tdev->clk_ref); + clk_disable_unprepare(tdev->clk_ref); clk_disable_unprepare(tdev->clk); udelay(10); -- 2.20.1

2 1

nouveau lockdep deadlock report with 5.18-rc6
by Hans de Goede 23 May '22

23 May '22

Hi All, I just noticed the below lockdep possible deadlock report with a 5.18-rc6 kernel on a Dell Latitude E6430 laptop with the following nvidia GPU: 01:00.0 VGA compatible controller [0300]: NVIDIA Corporation GF108GLM [NVS 5200M] [10de:0dfc] (rev a1) 01:00.1 Audio device [0403]: NVIDIA Corporation GF108 High Definition Audio Controller [10de:0bea] (rev a1) This is with the laptop in Optimus mode, so with the Intel integrated gfx from the i5-3320M CPU driving the LCD panel and with nothing connected to the HDMI connector, which is always routed to the NVIDIA GPU on this laptop. The lockdep possible deadlock warning seems to happen when the NVIDIA GPU is runtime suspended shortly after gdm has loaded: [ 24.859171] ====================================================== [ 24.859173] WARNING: possible circular locking dependency detected [ 24.859175] 5.18.0-rc6+ #34 Tainted: G E [ 24.859178] ------------------------------------------------------ [ 24.859179] kworker/1:1/46 is trying to acquire lock: [ 24.859181] ffff92b0c0ee0518 (&cli->mutex){+.+.}-{3:3}, at: nouveau_vga_lastclose+0x910/0x1030 [nouveau] [ 24.859231] but task is already holding lock: [ 24.859233] ffff92b0c4bf35a0 (reservation_ww_class_mutex){+.+.}-{3:3}, at: ttm_bo_wait+0x7d/0x140 [ttm] [ 24.859243] which lock already depends on the new lock. [ 24.859244] the existing dependency chain (in reverse order) is: [ 24.859246] -> #1 (reservation_ww_class_mutex){+.+.}-{3:3}: [ 24.859249] __ww_mutex_lock.constprop.0+0xb3/0xfb0 [ 24.859256] ww_mutex_lock+0x38/0xa0 [ 24.859259] nouveau_bo_pin+0x30/0x380 [nouveau] [ 24.859297] nouveau_channel_del+0x1d7/0x3e0 [nouveau] [ 24.859328] nouveau_channel_new+0x48/0x730 [nouveau] [ 24.859358] nouveau_abi16_ioctl_channel_alloc+0x113/0x360 [nouveau] [ 24.859389] drm_ioctl_kernel+0xa1/0x150 [ 24.859392] drm_ioctl+0x21c/0x410 [ 24.859395] nouveau_drm_ioctl+0x56/0x1820 [nouveau] [ 24.859431] __x64_sys_ioctl+0x8d/0xc0 [ 24.859436] do_syscall_64+0x5b/0x80 [ 24.859440] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 24.859443] -> #0 (&cli->mutex){+.+.}-{3:3}: [ 24.859446] __lock_acquire+0x12e2/0x1f90 [ 24.859450] lock_acquire+0xad/0x290 [ 24.859453] __mutex_lock+0x90/0x830 [ 24.859456] nouveau_vga_lastclose+0x910/0x1030 [nouveau] [ 24.859493] ttm_bo_move_to_lru_tail+0x32c/0x980 [ttm] [ 24.859498] ttm_mem_evict_first+0x25c/0x4b0 [ttm] [ 24.859503] ttm_resource_manager_evict_all+0x93/0x1b0 [ttm] [ 24.859509] nouveau_debugfs_fini+0x161/0x260 [nouveau] [ 24.859545] nouveau_drm_ioctl+0xa4a/0x1820 [nouveau] [ 24.859582] pci_pm_runtime_suspend+0x5c/0x180 [ 24.859585] __rpm_callback+0x48/0x1b0 [ 24.859589] rpm_callback+0x5a/0x70 [ 24.859591] rpm_suspend+0x10a/0x6f0 [ 24.859594] pm_runtime_work+0xa0/0xb0 [ 24.859596] process_one_work+0x254/0x560 [ 24.859601] worker_thread+0x4f/0x390 [ 24.859604] kthread+0xe6/0x110 [ 24.859607] ret_from_fork+0x22/0x30 [ 24.859611] other info that might help us debug this: [ 24.859612] Possible unsafe locking scenario: [ 24.859613] CPU0 CPU1 [ 24.859615] ---- ---- [ 24.859616] lock(reservation_ww_class_mutex); [ 24.859618] lock(&cli->mutex); [ 24.859620] lock(reservation_ww_class_mutex); [ 24.859622] lock(&cli->mutex); [ 24.859624] *** DEADLOCK *** [ 24.859625] 3 locks held by kworker/1:1/46: [ 24.859627] #0: ffff92b0c0bb4338 ((wq_completion)pm){+.+.}-{0:0}, at: process_one_work+0x1d0/0x560 [ 24.859634] #1: ffffa8ffc02dfe80 ((work_completion)(&dev->power.work)){+.+.}-{0:0}, at: process_one_work+0x1d0/0x560 [ 24.859641] #2: ffff92b0c4bf35a0 (reservation_ww_class_mutex){+.+.}-{3:3}, at: ttm_bo_wait+0x7d/0x140 [ttm] [ 24.859649] stack backtrace: [ 24.859651] CPU: 1 PID: 46 Comm: kworker/1:1 Tainted: G E 5.18.0-rc6+ #34 [ 24.859654] Hardware name: Dell Inc. Latitude E6430/0H3MT5, BIOS A21 05/08/2017 [ 24.859656] Workqueue: pm pm_runtime_work [ 24.859660] Call Trace: [ 24.859662] <TASK> [ 24.859665] dump_stack_lvl+0x5b/0x74 [ 24.859669] check_noncircular+0xdf/0x100 [ 24.859672] ? register_lock_class+0x38/0x470 [ 24.859678] __lock_acquire+0x12e2/0x1f90 [ 24.859683] lock_acquire+0xad/0x290 [ 24.859686] ? nouveau_vga_lastclose+0x910/0x1030 [nouveau] [ 24.859724] ? lock_is_held_type+0xa6/0x120 [ 24.859730] __mutex_lock+0x90/0x830 [ 24.859733] ? nouveau_vga_lastclose+0x910/0x1030 [nouveau] [ 24.859770] ? nvif_vmm_map+0x114/0x130 [nouveau] [ 24.859791] ? nouveau_vga_lastclose+0x910/0x1030 [nouveau] [ 24.859829] ? nouveau_vga_lastclose+0x910/0x1030 [nouveau] [ 24.859866] nouveau_vga_lastclose+0x910/0x1030 [nouveau] [ 24.859905] ttm_bo_move_to_lru_tail+0x32c/0x980 [ttm] [ 24.859912] ttm_mem_evict_first+0x25c/0x4b0 [ttm] [ 24.859919] ? lock_release+0x20/0x2a0 [ 24.859923] ttm_resource_manager_evict_all+0x93/0x1b0 [ttm] [ 24.859930] nouveau_debugfs_fini+0x161/0x260 [nouveau] [ 24.859968] nouveau_drm_ioctl+0xa4a/0x1820 [nouveau] [ 24.860005] pci_pm_runtime_suspend+0x5c/0x180 [ 24.860008] ? pci_dev_put+0x20/0x20 [ 24.860011] __rpm_callback+0x48/0x1b0 [ 24.860014] ? pci_dev_put+0x20/0x20 [ 24.860018] rpm_callback+0x5a/0x70 [ 24.860020] ? pci_dev_put+0x20/0x20 [ 24.860023] rpm_suspend+0x10a/0x6f0 [ 24.860025] ? process_one_work+0x1d0/0x560 [ 24.860031] pm_runtime_work+0xa0/0xb0 [ 24.860034] process_one_work+0x254/0x560 [ 24.860039] worker_thread+0x4f/0x390 [ 24.860043] ? process_one_work+0x560/0x560 [ 24.860046] kthread+0xe6/0x110 [ 24.860049] ? kthread_complete_and_exit+0x20/0x20 [ 24.860053] ret_from_fork+0x22/0x30 [ 24.860059] </TASK> Regards, Hans

3 4

[PATCH] drm/nouveau/mmu: fix typo in comment
by Julia Lawall 23 May '22

23 May '22

Spelling mistake (triple letters) in comment. Detected with the help of Coccinelle. Signed-off-by: Julia Lawall <Julia.Lawall(a)inria.fr> --- drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c index 8bf00b396ec1..8b11dfa0998d 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c @@ -280,7 +280,7 @@ nvkm_vmm_unref_ptes(struct nvkm_vmm_iter *it, bool pfn, u32 ptei, u32 ptes) if (desc->type == SPT && (pgt->refs[0] || pgt->refs[1])) nvkm_vmm_unref_sptes(it, pgt, desc, ptei, ptes); - /* PT no longer neeed? Destroy it. */ + /* PT no longer needed? Destroy it. */ if (!pgt->refs[type]) { it->lvl++; TRA(it, "%s empty", nvkm_vmm_desc_type(desc));

2 1

[PATCH v3] drm/nouveau: clear output poll workers before nouveau_fbcon_destroy()
by Mark Menzynski 23 May '22

23 May '22

Resources needed for output poll workers are destroyed in nouveau_fbcon_fini() before output poll workers are cleared in nouveau_display_fini(). This means there is a time between fbcon_fini() and display_fini(), where if output poll happens, it crashes. This patch introduces another output poll clearing before fbcon resources are destroyed. BUG: KASAN: use-after-free in __drm_fb_helper_initial_config_and_unlock.cold+0x1f3/0x291 [drm_kms_helper] Cc: Ben Skeggs <bskeggs(a)redhat.com> Cc: Karol Herbst <kherbst(a)redhat.com> Cc: Lyude Paul <lyude(a)redhat.com> Cc: David Airlie <airlied(a)linux.ie> Cc: Daniel Vetter <daniel(a)ffwll.ch> Cc: dri-devel(a)lists.freedesktop.org Cc: nouveau(a)lists.freedesktop.org Cc: linux-kernel(a)vger.kernel.org Signed-off-by: Mark Menzynski <mmenzyns(a)redhat.com> --- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 4f9b3aa5deda..5226323e55d3 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c @@ -39,6 +39,7 @@ #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> +#include <drm/drm_probe_helper.h> #include <drm/drm_fb_helper.h> #include <drm/drm_fourcc.h> #include <drm/drm_atomic.h> @@ -605,6 +606,7 @@ nouveau_fbcon_fini(struct drm_device *dev) if (!drm->fbcon) return; + drm_kms_helper_poll_fini(dev); nouveau_fbcon_accel_fini(dev); nouveau_fbcon_destroy(dev, drm->fbcon); kfree(drm->fbcon); -- 2.32.0

2 1

[PATCH v2 1/2] Revert "drm/bridge: anx7625: Use DPI bus type"
by Robert Foss 23 May '22

23 May '22

This reverts commit a77c2af0994e24ee36c7ffb6dc852770bdf06fb1. This patch depends on the patches just aplied to the media tree, and will not build without them, which leaves drm-misc-next in a broken state. Let's revert the two latter patches until rc1 has been branched, and rc1 has been backmerged into drm-misc-next. Signed-off-by: Robert Foss <robert.foss(a)linaro.org> Acked-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> --- drivers/gpu/drm/bridge/analogix/anx7625.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c index 0fab2aa47c67..e92eb4a40745 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.c +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c @@ -1623,14 +1623,14 @@ static int anx7625_parse_dt(struct device *dev, anx7625_get_swing_setting(dev, pdata); - pdata->is_dpi = 0; /* default dsi mode */ + pdata->is_dpi = 1; /* default dpi mode */ pdata->mipi_host_node = of_graph_get_remote_node(np, 0, 0); if (!pdata->mipi_host_node) { DRM_DEV_ERROR(dev, "fail to get internal panel.\n"); return -ENODEV; } - bus_type = 0; + bus_type = V4L2_FWNODE_BUS_TYPE_PARALLEL; mipi_lanes = MAX_LANES_SUPPORT; ep0 = of_graph_get_endpoint_by_regs(np, 0, 0); if (ep0) { @@ -1641,8 +1641,8 @@ static int anx7625_parse_dt(struct device *dev, of_node_put(ep0); } - if (bus_type == V4L2_FWNODE_BUS_TYPE_DPI) /* bus type is DPI */ - pdata->is_dpi = 1; + if (bus_type == V4L2_FWNODE_BUS_TYPE_PARALLEL) /* bus type is Parallel(DSI) */ + pdata->is_dpi = 0; pdata->mipi_lanes = mipi_lanes; if (pdata->mipi_lanes > MAX_LANES_SUPPORT || pdata->mipi_lanes <= 0) -- 2.34.1

1 2

[PATCH v1 1/2] Revert "drm/bridge: anx7625: Use DPI bus type"
by Robert Foss 23 May '22

23 May '22

This reverts commit a77c2af0994e24ee36c7ffb6dc852770bdf06fb1. --- drivers/gpu/drm/bridge/analogix/anx7625.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c index 01f46d9189c1..53a5da6c49dd 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.c +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c @@ -1623,14 +1623,14 @@ static int anx7625_parse_dt(struct device *dev, anx7625_get_swing_setting(dev, pdata); - pdata->is_dpi = 0; /* default dsi mode */ + pdata->is_dpi = 1; /* default dpi mode */ pdata->mipi_host_node = of_graph_get_remote_node(np, 0, 0); if (!pdata->mipi_host_node) { DRM_DEV_ERROR(dev, "fail to get internal panel.\n"); return -ENODEV; } - bus_type = 0; + bus_type = V4L2_FWNODE_BUS_TYPE_PARALLEL; mipi_lanes = MAX_LANES_SUPPORT; ep0 = of_graph_get_endpoint_by_regs(np, 0, 0); if (ep0) { @@ -1640,8 +1640,8 @@ static int anx7625_parse_dt(struct device *dev, mipi_lanes = of_property_count_u32_elems(ep0, "data-lanes"); } - if (bus_type == V4L2_FWNODE_BUS_TYPE_DPI) /* bus type is DPI */ - pdata->is_dpi = 1; + if (bus_type == V4L2_FWNODE_BUS_TYPE_PARALLEL) /* bus type is Parallel(DSI) */ + pdata->is_dpi = 0; pdata->mipi_lanes = mipi_lanes; if (pdata->mipi_lanes > MAX_LANES_SUPPORT || pdata->mipi_lanes <= 0) -- 2.34.1

2 6

[PATCH 0/4] ttm for internal
by Robert Beckett 23 May '22

23 May '22

This series refactors i915's internal buffer backend to use ttm. It uses ttm's pool allocator to allocate volatile pages in place of the old code which rolled its own via alloc_pages. This is continuing progress to align all backends on using ttm. Robert Beckett (4): drm/i915: add gen6 ppgtt dummy creation function drm/i915: setup ggtt scratch page after memory regions drm/i915: allow volatile buffers to use ttm pool allocator drm/i915: internal buffers use ttm backend drivers/gpu/drm/i915/gem/i915_gem_internal.c | 264 ++++++++----------- drivers/gpu/drm/i915/gem/i915_gem_internal.h | 5 - drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 15 +- drivers/gpu/drm/i915/gem/i915_gem_ttm.h | 12 +- drivers/gpu/drm/i915/gt/gen6_ppgtt.c | 43 ++- drivers/gpu/drm/i915/gt/intel_gt_gmch.c | 20 +- drivers/gpu/drm/i915/gt/intel_gt_gmch.h | 6 + drivers/gpu/drm/i915/i915_driver.c | 16 +- 8 files changed, 201 insertions(+), 180 deletions(-) -- 2.25.1

2 11

[PATCH 01/11] drm: of: Add drm_of_get_data_lanes and drm_of_get_data_lanes_ep
by Marek Vasut 23 May '22

23 May '22

Add helper function to count and sanitize DT "data-lanes" property and return either error or the data-lanes count. This is useful for both DSI and (e)DP "data-lanes" property. The later version of the function is an extra wrapper which handles the endpoint look up by regs, that's what majority of the drivers duplicate too, but not all of them. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Andrzej Hajda <andrzej.hajda(a)intel.com> Cc: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> Cc: Lucas Stach <l.stach(a)pengutronix.de> Cc: Maxime Ripard <maxime(a)cerno.tech> Cc: Robert Foss <robert.foss(a)linaro.org> Cc: Sam Ravnborg <sam(a)ravnborg.org> To: dri-devel(a)lists.freedesktop.org --- drivers/gpu/drm/drm_of.c | 61 ++++++++++++++++++++++++++++++++++++++++ include/drm/drm_of.h | 20 +++++++++++++ 2 files changed, 81 insertions(+) diff --git a/drivers/gpu/drm/drm_of.c b/drivers/gpu/drm/drm_of.c index 9a2cfab3a177f..2186f966d2820 100644 --- a/drivers/gpu/drm/drm_of.c +++ b/drivers/gpu/drm/drm_of.c @@ -430,3 +430,64 @@ int drm_of_lvds_get_data_mapping(const struct device_node *port) return -EINVAL; } EXPORT_SYMBOL_GPL(drm_of_lvds_get_data_mapping); + +/** + * drm_of_get_data_lanes - Get DSI/(e)DP data lane count + * @endpoint: DT endpoint node of the DSI/(e)DP source or sink + * @min: minimum supported number of data lanes + * @max: maximum supported number of data lanes + * + * Count DT "data-lanes" property elements and check for validity. + * + * Return: + * * min..max - positive integer count of "data-lanes" elements + * * -ve - the "data-lanes" property is missing or invalid + * * -EINVAL - the "data-lanes" property is unsupported + */ +int drm_of_get_data_lanes(const struct device_node *endpoint, + const unsigned int min, const unsigned int max) +{ + int ret; + + ret = of_property_count_u32_elems(endpoint, "data-lanes"); + if (ret < 0) + return ret; + + if (ret < min || ret > max) + return -EINVAL; + + return ret; +} +EXPORT_SYMBOL_GPL(drm_of_get_data_lanes); + +/** + * drm_of_get_data_lanes_ep - Get DSI/(e)DP data lane count by endpoint + * @port: DT port node of the DSI/(e)DP source or sink + * @port_reg: identifier (value of reg property) of the parent port node + * @reg: identifier (value of reg property) of the endpoint node + * @min: minimum supported number of data lanes + * @max: maximum supported number of data lanes + * + * Count DT "data-lanes" property elements and check for validity. + * This variant uses endpoint specifier. + * + * Return: + * * min..max - positive integer count of "data-lanes" elements + * * -EINVAL - the "data-mapping" property is unsupported + * * -ENODEV - the "data-mapping" property is missing + */ +int drm_of_get_data_lanes_ep(const struct device_node *port, + int port_reg, int reg, + const unsigned int min, + const unsigned int max) +{ + struct device_node *endpoint; + int ret; + + endpoint = of_graph_get_endpoint_by_regs(port, port_reg, reg); + ret = drm_of_get_data_lanes(endpoint, min, max); + of_node_put(endpoint); + + return ret; +} +EXPORT_SYMBOL_GPL(drm_of_get_data_lanes_ep); diff --git a/include/drm/drm_of.h b/include/drm/drm_of.h index 99f79ac8b4cd7..b559c53756196 100644 --- a/include/drm/drm_of.h +++ b/include/drm/drm_of.h @@ -50,6 +50,12 @@ int drm_of_find_panel_or_bridge(const struct device_node *np, int drm_of_lvds_get_dual_link_pixel_order(const struct device_node *port1, const struct device_node *port2); int drm_of_lvds_get_data_mapping(const struct device_node *port); +int drm_of_get_data_lanes(const struct device_node *endpoint, + const unsigned int min, const unsigned int max); +int drm_of_get_data_lanes_ep(const struct device_node *port, + int port_reg, int reg, + const unsigned int min, + const unsigned int max); #else static inline uint32_t drm_of_crtc_port_mask(struct drm_device *dev, struct device_node *port) @@ -105,6 +111,20 @@ drm_of_lvds_get_data_mapping(const struct device_node *port) { return -EINVAL; } + +int drm_of_get_data_lanes(const struct device_node *endpoint, + const unsigned int min, const unsigned int max) +{ + return -EINVAL; +} + +int drm_of_get_data_lanes_ep(const struct device_node *port, + int port_reg, int reg + const unsigned int min, + const unsigned int max) +{ + return -EINVAL; +} #endif /* -- 2.35.1

3 15

[PATCH] drm/st7735r: Fix module autoloading for Okaya RH128128T
by Javier Martinez Canillas 23 May '22

23 May '22

The SPI core always reports a "MODALIAS=spi:<foo>", even if the device was registered via OF. This means that the st7735r.ko module won't autoload if a DT has a node with a compatible "okaya,rh128128t" string. In that case, kmod expects a "MODALIAS=of:N*T*Cokaya,rh128128t" uevent but instead will get a "MODALIAS=spi:rh128128t", which is not present in the list of aliases: $ modinfo drivers/gpu/drm/tiny/st7735r.ko | grep alias alias: of:N*T*Cokaya,rh128128tC* alias: of:N*T*Cokaya,rh128128t alias: of:N*T*Cjianda,jd-t18003-t01C* alias: of:N*T*Cjianda,jd-t18003-t01 alias: spi:jd-t18003-t01 To workaround this issue, add in the SPI table an entry for that device. Fixes: d1d511d516f7 ("drm: tiny: st7735r: Add support for Okaya RH128128T") Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com> --- drivers/gpu/drm/tiny/st7735r.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/tiny/st7735r.c b/drivers/gpu/drm/tiny/st7735r.c index 29d618093e94..e0f02d367d88 100644 --- a/drivers/gpu/drm/tiny/st7735r.c +++ b/drivers/gpu/drm/tiny/st7735r.c @@ -174,6 +174,7 @@ MODULE_DEVICE_TABLE(of, st7735r_of_match); static const struct spi_device_id st7735r_id[] = { { "jd-t18003-t01", (uintptr_t)&jd_t18003_t01_cfg }, + { "rh128128t", (uintptr_t)&rh128128t_cfg }, { }, }; MODULE_DEVICE_TABLE(spi, st7735r_id); -- 2.36.1

3 3

← Newer
1
...
28
29
30
31
32
33
34
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel May 2022