dri-devel February 2020

dri-devel@lists.freedesktop.org

302 participants
679 discussions

Some eDP fixes/improvements.
by Mario Kleiner 28 Feb '20

28 Feb '20

Hi and happy new year! Since i now have a MBP 2017 to play with, with a 10 bit Retina panel, and Polaris gpu, i'm trying to get it to get 10 bits, and found one small bug [fix: patch1], and a quirk of Apples Retina eDP sink, for which i propose patch2 as solution. I sent a similar patch to i915 to make 10 bit Retina work with the Intel Kabylake igp on that machine. If these make sense, it would be cool to still get them into drm-fixes for Linux 5.5, so users of spring distro updates like Ubuntu 20.04 LTS can get a more colorful new year. thanks, -mario

4 10

[RFC] drm/omap: Create only one primary plane for CRTC
by Tony Lindgren 28 Feb '20

28 Feb '20

Hi, Looks like sway and wlroots won't work with omaprdrm because of the following error: backend/drm/drm.c:86: add_plane: Assertion !(type == DRM_PLANE_TYPE_PRIMARY && crtc->primary) Looks like there should only be one primary plane per CRTC? There's some discussion about that for a wlroots bug at: https://github.com/swaywm/wlroots/issues/1943 And there's a link pointing to the kms docs: https://01.org/linuxgraphics/gfx-docs/drm/gpu/drm-kms.html#plane-abstraction Below is a quick hack fix I used to get sway started. Not sure how the primary plane should be picked? I just used 0 as the primary plane to get things working :) I can start xterm on sway, but so far no fonts only the borders. Regards, Tony 8< ---------------------- diff --git a/drivers/gpu/drm/omapdrm/omap_drv.c b/drivers/gpu/drm/omapdrm/omap_drv.c index d2750f60f519..122f8c4cf45b 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.c +++ b/drivers/gpu/drm/omapdrm/omap_drv.c @@ -268,7 +268,7 @@ static int omap_modeset_init(struct drm_device *dev) plane_crtc_mask = (1 << priv->num_pipes) - 1; for (i = 0; i < num_ovls; i++) { - enum drm_plane_type type = i < priv->num_pipes + enum drm_plane_type type = i == 0 ? DRM_PLANE_TYPE_PRIMARY : DRM_PLANE_TYPE_OVERLAY; struct drm_plane *plane;

1 0

[PATCHv2] drm/omap: Fix drm_handle_vblank() handling for command mode panels
by Tony Lindgren 28 Feb '20

28 Feb '20

When trying to run weston on droid4 with the updated sgx blobs, the LCD is just black and not updating. Weston also displays the following on startup: Warning: computed repaint delay is insane: -205475 msec Weston runs fine on the HDMI alone though, and the issue was narrowed down to an issue with vblank as suggested by ruleh <ruleh(a)gmx.de>. Turns out that for command mode displays, we're not currently calling drm_handle_vblank() at all since omap_irq_handler() won't do it for us since we get no vblank interrupts. Let's fix the issue by calling drm_handle_vblank() and omap_crtc_vblank_irq() for command mode displays from omap_crtc_framedone_irq() and make the vblank handling the same for command mode panels as it is for normal displays. For reference, below is my current weston.ini. The repaint-window is maxed out to force immediate repaint instead of the default 7 ms. Otherwise it seems that the repaint is happening at about 60 fps with es2gears_wayland compared to about 130 fps where it seems to max out. [core] xwayland=true backend=drm-backend.so repaint-window=1000 pageflip-timeout=1000 [libinput] rotation=0 [output] name=DSI-1 transform=90 [output] name=HDMI-1 mode=1024x768@60 Fixes: 47103a80f55a ("drm/omap: add framedone interrupt support") Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75(a)gmail.com> Cc: Merlijn Wajer <merlijn(a)wizzup.org> Cc: Sebastian Reichel <sre(a)kernel.org> Cc: ruleh <ruleh(a)gmx.de> Signed-off-by: Tony Lindgren <tony(a)atomide.com> --- drivers/gpu/drm/omapdrm/omap_crtc.c | 41 +++++++++++------------------ drivers/gpu/drm/omapdrm/omap_crtc.h | 2 +- drivers/gpu/drm/omapdrm/omap_irq.c | 2 +- 3 files changed, 18 insertions(+), 27 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -325,23 +325,21 @@ void omap_crtc_vblank_irq(struct drm_crtc *crtc) DBG("%s: apply done", omap_crtc->name); } -void omap_crtc_framedone_irq(struct drm_crtc *crtc, uint32_t irqstatus) +void omap_crtc_framedone_irq(struct drm_crtc *crtc, int id, uint32_t irqstatus) { + struct omap_crtc_state *omap_state = to_omap_crtc_state(crtc->state); struct omap_crtc *omap_crtc = to_omap_crtc(crtc); + struct drm_device *dev = crtc->dev; if (!omap_crtc->framedone_handler) return; - omap_crtc->framedone_handler(omap_crtc->framedone_handler_data); - - spin_lock(&crtc->dev->event_lock); - /* Send the vblank event if one has been requested. */ - if (omap_crtc->event) { - drm_crtc_send_vblank_event(crtc, omap_crtc->event); - omap_crtc->event = NULL; + if (omap_state->manually_updated) { + drm_handle_vblank(dev, id); + omap_crtc_vblank_irq(crtc); } - omap_crtc->pending = false; - spin_unlock(&crtc->dev->event_lock); + + omap_crtc->framedone_handler(omap_crtc->framedone_handler_data); /* Wake up omap_atomic_complete. */ wake_up(&omap_crtc->pending_wait); @@ -439,8 +437,12 @@ static void omap_crtc_destroy(struct drm_crtc *crtc) static void omap_crtc_arm_event(struct drm_crtc *crtc) { + struct omap_crtc_state *omap_crtc_state = to_omap_crtc_state(crtc->state); struct omap_crtc *omap_crtc = to_omap_crtc(crtc); + if (omap_crtc->pending && omap_crtc_state->manually_updated) + return; + WARN_ON(omap_crtc->pending); omap_crtc->pending = true; @@ -455,17 +457,12 @@ static void omap_crtc_atomic_enable(struct drm_crtc *crtc, { struct omap_drm_private *priv = crtc->dev->dev_private; struct omap_crtc *omap_crtc = to_omap_crtc(crtc); - struct omap_crtc_state *omap_state = to_omap_crtc_state(crtc->state); int ret; DBG("%s", omap_crtc->name); priv->dispc_ops->runtime_get(priv->dispc); - /* manual updated display will not trigger vsync irq */ - if (omap_state->manually_updated) - return; - spin_lock_irq(&crtc->dev->event_lock); drm_crtc_vblank_on(crtc); ret = drm_crtc_vblank_get(crtc); @@ -646,20 +643,14 @@ static void omap_crtc_atomic_flush(struct drm_crtc *crtc, DBG("%s: GO", omap_crtc->name); - if (omap_crtc_state->manually_updated) { - /* send new image for page flips and modeset changes */ - spin_lock_irq(&crtc->dev->event_lock); - omap_crtc_flush(crtc); - omap_crtc_arm_event(crtc); - spin_unlock_irq(&crtc->dev->event_lock); - return; - } - ret = drm_crtc_vblank_get(crtc); WARN_ON(ret != 0); spin_lock_irq(&crtc->dev->event_lock); - priv->dispc_ops->mgr_go(priv->dispc, omap_crtc->channel); + if (omap_crtc_state->manually_updated) + omap_crtc_flush(crtc); + else + priv->dispc_ops->mgr_go(priv->dispc, omap_crtc->channel); omap_crtc_arm_event(crtc); spin_unlock_irq(&crtc->dev->event_lock); } diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.h b/drivers/gpu/drm/omapdrm/omap_crtc.h --- a/drivers/gpu/drm/omapdrm/omap_crtc.h +++ b/drivers/gpu/drm/omapdrm/omap_crtc.h @@ -30,7 +30,7 @@ struct drm_crtc *omap_crtc_init(struct drm_device *dev, int omap_crtc_wait_pending(struct drm_crtc *crtc); void omap_crtc_error_irq(struct drm_crtc *crtc, u32 irqstatus); void omap_crtc_vblank_irq(struct drm_crtc *crtc); -void omap_crtc_framedone_irq(struct drm_crtc *crtc, uint32_t irqstatus); +void omap_crtc_framedone_irq(struct drm_crtc *crtc, int id, uint32_t irqstatus); void omap_crtc_flush(struct drm_crtc *crtc); #endif /* __OMAPDRM_CRTC_H__ */ diff --git a/drivers/gpu/drm/omapdrm/omap_irq.c b/drivers/gpu/drm/omapdrm/omap_irq.c --- a/drivers/gpu/drm/omapdrm/omap_irq.c +++ b/drivers/gpu/drm/omapdrm/omap_irq.c @@ -232,7 +232,7 @@ static irqreturn_t omap_irq_handler(int irq, void *arg) omap_crtc_error_irq(crtc, irqstatus); if (irqstatus & priv->dispc_ops->mgr_get_framedone_irq(priv->dispc, channel)) - omap_crtc_framedone_irq(crtc, irqstatus); + omap_crtc_framedone_irq(crtc, id, irqstatus); } omap_irq_ocp_error_handler(dev, irqstatus); -- 2.25.1

2 1

[PATCH v4 0/4] drm: Provide a simple encoder
by Thomas Zimmermann 28 Feb '20

28 Feb '20

Many DRM drivers implement an encoder with an empty implementation. This patchset adds drm_simple_encoder_init(), which drivers can use instead. Except for the destroy callback, the simple encoder's implementation is empty. The patchset also converts 4 encoder instances to use the simple-encoder helpers. But there are at least 11 other drivers which can use the helper and I think I did not examine all drivers yet. The patchset was smoke-tested on mgag200 by running the fbdev console and Gnome on X11. v4: * print error messages with drm_err() (Sam) * qxl: handle errors of drm_simple_encoder_init() (Sam) v3: * remove drm_simple_encoder_create() for lack of users (Sam, Daniel) * provide more precise documentation (Sam) v2: * move simple encoder to KMS helpers (Daniel) * remove name argument; simplifies implementation (Gerd) * don't allocate with devm_ interfaces; unsafe with DRM (Noralf) Thomas Zimmermann (4): drm/simple-kms: Add drm_simple_encoder_{init,create}() drm/ast: Use simple encoder drm/mgag200: Use simple encoder drm/qxl: Use simple encoder drivers/gpu/drm/ast/ast_drv.h | 6 +- drivers/gpu/drm/ast/ast_mode.c | 25 +++---- drivers/gpu/drm/drm_simple_kms_helper.c | 34 +++++++++- drivers/gpu/drm/mgag200/mgag200_drv.h | 9 +-- drivers/gpu/drm/mgag200/mgag200_mode.c | 86 ++++--------------------- drivers/gpu/drm/qxl/qxl_display.c | 29 ++++----- include/drm/drm_simple_kms_helper.h | 4 ++ 7 files changed, 71 insertions(+), 122 deletions(-) -- 2.25.0

2 5

[Bug 206705] New: ida_free called for id=32782 which is not allocated.
by bugzilla-daemon＠bugzilla.kernel.org 28 Feb '20

28 Feb '20

https://bugzilla.kernel.org/show_bug.cgi?id=206705 Bug ID: 206705 Summary: ida_free called for id=32782 which is not allocated. Product: Drivers Version: 2.5 Kernel Version: 5.5.4 Hardware: All OS: Linux Tree: Mainline Status: NEW Severity: normal Priority: P1 Component: Video(DRI - non Intel) Assignee: drivers_video-dri(a)kernel-bugs.osdl.org Reporter: ansla80(a)yahoo.com Regression: No Created attachment 287699 --> https://bugzilla.kernel.org/attachment.cgi?id=287699&action=edit Output of rocminfo Video Card: Radeon RX 580 OpenCL: ROCm 3.0.0 After I left the computer overnight to perform a btrfs balance while it was also running boinc (Amicable Numbers being the only project using OpenCL), I found this in dmesg among all the expected btrfs messages: [17350.059221] Failed to create process VM object [17350.162949] ------------[ cut here ]------------ [17350.162950] ida_free called for id=32782 which is not allocated. [17350.162966] WARNING: CPU: 4 PID: 8428 at lib/idr.c:521 ida_free+0x11a/0x130 [17350.162967] Modules linked in: snd_usb_audio snd_usbmidi_lib snd_rawmidi tpm_crb tpm_tis tpm_tis_core [17350.162971] CPU: 4 PID: 8428 Comm: amicable_OpenCL Tainted: G W 5.5.4-gentoo #2 [17350.162971] Hardware name: System manufacturer System Product Name/ROG STRIX B450-F GAMING, BIOS 3003 12/09/2019 [17350.162973] RIP: 0010:ida_free+0x11a/0x130 [17350.162975] Code: 6c f3 61 ff 31 f6 48 89 e7 e8 c2 eb 00 00 eb 9c 48 8b 3c 24 4c 89 ee e8 84 ff 01 00 89 ee 48 c7 c7 60 81 75 82 e8 23 b4 47 ff <0f> 0b eb 8a 0f 0b e8 9b b1 47 ff 66 66 2e 0f 1f 84 00 00 00 00 00 [17350.162976] RSP: 0018:ffffc900005f3cc8 EFLAGS: 00010282 [17350.162976] RAX: 0000000000000000 RBX: 000000000000000e RCX: 0000000000000007 [17350.162977] RDX: 0000000000000007 RSI: 0000000000000082 RDI: ffff888fde9183c0 [17350.162978] RBP: 000000000000800e R08: 0000000000000001 R09: 0000000000000a0e [17350.162978] R10: 0000000000033110 R11: 0000000000000001 R12: 000000000007bfff [17350.162979] R13: 0000000000000202 R14: 000000000000800e R15: ffff888e166ea6c8 [17350.162979] FS: 00007f5db5302740(0000) GS:ffff888fde900000(0000) knlGS:0000000000000000 [17350.162980] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [17350.162981] CR2: 00007f5bc4f3dee0 CR3: 000000000280a000 CR4: 00000000003406e0 [17350.162981] Call Trace: [17350.162985] amdgpu_pasid_free_delayed+0x10c/0x2a0 [17350.162988] amdgpu_driver_postclose_kms+0x1fb/0x220 [17350.162990] drm_file_free.part.0+0x1df/0x280 [17350.162992] drm_release+0xa2/0xe0 [17350.162994] __fput+0xb4/0x240 [17350.162997] task_work_run+0x84/0xa0 [17350.162999] do_exit+0x358/0xb30 [17350.163001] do_group_exit+0x35/0x90 [17350.163002] __x64_sys_exit_group+0xf/0x10 [17350.163004] do_syscall_64+0x50/0x170 [17350.163005] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [17350.163006] RIP: 0033:0x7f5db53e2206 [17350.163010] Code: Bad RIP value. [17350.163010] RSP: 002b:00007ffd961c0ca8 EFLAGS: 00000246 ORIG_RAX: 00000000000000e7 [17350.163011] RAX: ffffffffffffffda RBX: 00007f5db54d98a0 RCX: 00007f5db53e2206 [17350.163011] RDX: 00000000ffffffff RSI: 000000000000003c RDI: 00000000ffffffff [17350.163012] RBP: 00007f5db54d98a0 R08: 00000000000000e7 R09: ffffffffffffff68 [17350.163012] R10: fffffffffffffcf8 R11: 0000000000000246 R12: 00000000ffffffff [17350.163013] R13: 0000000000000000 R14: 00000000000002af R15: 0000000000000000 [17350.163014] ---[ end trace aae51382bec0201b ]--- -- You are receiving this mail because: You are watching the assignee of the bug.

1 0

[PATCH][V2] backlight: sky81452: insure while loop does not allow negative array indexing
by Colin King 28 Feb '20

28 Feb '20

From: Colin Ian King <colin.king(a)canonical.com> In the unlikely event that num_entry is zero, the while loop pre-decrements num_entry to cause negative array indexing into the array sources. Fix this by iterating only if num_entry >= 0. Addresses-Coverity: ("Out-of-bounds read") Fixes: f705806c9f35 ("backlight: Add support Skyworks SKY81452 backlight driver") Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- V2: fix typo in commit subject line --- drivers/video/backlight/sky81452-backlight.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/backlight/sky81452-backlight.c b/drivers/video/backlight/sky81452-backlight.c index 2355f00f5773..f456930ce78e 100644 --- a/drivers/video/backlight/sky81452-backlight.c +++ b/drivers/video/backlight/sky81452-backlight.c @@ -200,7 +200,7 @@ static struct sky81452_bl_platform_data *sky81452_bl_parse_dt( } pdata->enable = 0; - while (--num_entry) + while (--num_entry >= 0) pdata->enable |= (1 << sources[num_entry]); } -- 2.25.0

4 5

[PATCH v5 0/7] drm/mediatek: fix cursor issue and apply CMDQ in MTK DRM
by Bibby Hsieh 28 Feb '20

28 Feb '20

The CMDQ (Command Queue) in MT8183 is used to help update all relevant display controller registers with critical time limation. This patch add cmdq interface in ddp_comp interface, let all ddp_comp interface can support cpu/cmdq function at the same time. These patches also can fixup cursor moving is not smooth when heavy load in webgl. This patch depends on ptach: add drm support for MT8183 (https://patchwork.kernel.org/cover/11121519/) support gce on mt8183 platform (https://patchwork.kernel.org/cover/11255147/) drm/mediatek: Check return value of mtk_drm_ddp_comp_for_plane (https://lore.kernel.org/patchwork/patch/1154517/) Changes since v4: - rebase to Linux 5.5-rc1 - add fixes tag Changes since v3: - remove redundant code and variable Changes since v2: - move some changes to another patch - disable layer in atomic_disable() Changes since v1: - remove redundant code - merge the duplicate code - use async instead of cursor Changes since v0: - remove redundant code - remove patch "drm/mediatek: fix atomic_state reference counting" After remove this patch, the issue we met before is gone. So I do not add any extra code to do something. Bibby Hsieh (7): drm/mediatek: use DRM core's atomic commit helper drm/mediatek: handle events when enabling/disabling crtc drm/mediatek: update cursors by using async atomic update drm/mediatek: disable all the planes in atomic_disable drm/mediatek: remove unused external function drm/mediatek: support CMDQ interface in ddp component drm/mediatek: apply CMDQ control flow drivers/gpu/drm/mediatek/mtk_disp_color.c | 7 +- drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 67 ++++---- drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 43 ++--- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 165 ++++++++++++++++---- drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 2 + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 131 ++++++++++++---- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 47 +++--- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 86 +--------- drivers/gpu/drm/mediatek/mtk_drm_drv.h | 7 - drivers/gpu/drm/mediatek/mtk_drm_plane.c | 47 ++++++ drivers/gpu/drm/mediatek/mtk_drm_plane.h | 2 + 11 files changed, 380 insertions(+), 224 deletions(-) -- 2.18.0

4 11

[PATCH resend 0/2] drm/i915: Some upside-down panel handling fixes
by Hans de Goede 28 Feb '20

28 Feb '20

Hi All, This is a resend of 2 patches which I submitted a while ago, rebased on top of the latest dinq to fix some conflicts. The first patch has already been reviewed. There were some questions about the second patch, which I have answered, see: https://patchwork.freedesktop.org/patch/345305/?series=70952&rev=2 A review of the second patch would be appreciated. Regards, Hans

2 3

[PATCH] drm/dp_mst: Check crc4 value while building sideband message
by Benjamin Gaignard 28 Feb '20

28 Feb '20

Check that computed crc value is matching the one encoded in the message. Signed-off-by: Benjamin Gaignard <benjamin.gaignard(a)st.com> --- CC: lyude(a)redhat.com CC: airlied(a)linux.ie CC: jani.nikula(a)linux.intel.com drivers/gpu/drm/drm_dp_mst_topology.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 822d2f177f90..eee899d6742b 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -736,6 +736,10 @@ static bool drm_dp_sideband_msg_build(struct drm_dp_sideband_msg_rx *msg, if (msg->curchunk_idx >= msg->curchunk_len) { /* do CRC */ crc4 = drm_dp_msg_data_crc4(msg->chunk, msg->curchunk_len - 1); + if (crc4 != msg->chunk[msg->curchunk_len - 1]) + print_hex_dump(KERN_DEBUG, "wrong crc", + DUMP_PREFIX_NONE, 16, 1, + msg->chunk, msg->curchunk_len, false); /* copy chunk into bigger msg */ memcpy(&msg->msg[msg->curlen], msg->chunk, msg->curchunk_len - 1); msg->curlen += msg->curchunk_len - 1; -- 2.15.0

3 2

[PATCH v6] drm/dp_mst: Fix W=1 warnings
by Benjamin Gaignard 28 Feb '20

28 Feb '20

Fix the warnings that show up with W=1. They are all about unused but set variables. If functions returns are not used anymore make them void. Signed-off-by: Benjamin Gaignard <benjamin.gaignard(a)st.com> Reviewed-by: Lyude Paul <lyude(a)redhat.com> --- version 6: - change drm_dp_check_mstb_guid() prototype to be able to return an error - add check for drm_dp_check_mstb_guid() return value - check drm_dp_dpcd_read() return value in drm_dp_mst_dump_topology() version 5: - fix indentation version 4: - do not touch crc4 unused variable in this patch CC: lyude(a)redhat.com CC: airlied(a)linux.ie CC: jani.nikula(a)linux.intel.com drivers/gpu/drm/drm_dp_mst_topology.c | 114 +++++++++++++++++++--------------- 1 file changed, 65 insertions(+), 49 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 4104f15f4594..0ced7a204985 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -1034,7 +1034,8 @@ static bool drm_dp_sideband_parse_req(struct drm_dp_sideband_msg_rx *raw, } } -static int build_dpcd_write(struct drm_dp_sideband_msg_tx *msg, u8 port_num, u32 offset, u8 num_bytes, u8 *bytes) +static void build_dpcd_write(struct drm_dp_sideband_msg_tx *msg, + u8 port_num, u32 offset, u8 num_bytes, u8 *bytes) { struct drm_dp_sideband_msg_req_body req; @@ -1044,17 +1045,14 @@ static int build_dpcd_write(struct drm_dp_sideband_msg_tx *msg, u8 port_num, u32 req.u.dpcd_write.num_bytes = num_bytes; req.u.dpcd_write.bytes = bytes; drm_dp_encode_sideband_req(&req, msg); - - return 0; } -static int build_link_address(struct drm_dp_sideband_msg_tx *msg) +static void build_link_address(struct drm_dp_sideband_msg_tx *msg) { struct drm_dp_sideband_msg_req_body req; req.req_type = DP_LINK_ADDRESS; drm_dp_encode_sideband_req(&req, msg); - return 0; } static int build_clear_payload_id_table(struct drm_dp_sideband_msg_tx *msg) @@ -1066,7 +1064,8 @@ static int build_clear_payload_id_table(struct drm_dp_sideband_msg_tx *msg) return 0; } -static int build_enum_path_resources(struct drm_dp_sideband_msg_tx *msg, int port_num) +static int build_enum_path_resources(struct drm_dp_sideband_msg_tx *msg, + int port_num) { struct drm_dp_sideband_msg_req_body req; @@ -1077,10 +1076,11 @@ static int build_enum_path_resources(struct drm_dp_sideband_msg_tx *msg, int por return 0; } -static int build_allocate_payload(struct drm_dp_sideband_msg_tx *msg, int port_num, - u8 vcpi, uint16_t pbn, - u8 number_sdp_streams, - u8 *sdp_stream_sink) +static void build_allocate_payload(struct drm_dp_sideband_msg_tx *msg, + int port_num, + u8 vcpi, uint16_t pbn, + u8 number_sdp_streams, + u8 *sdp_stream_sink) { struct drm_dp_sideband_msg_req_body req; memset(&req, 0, sizeof(req)); @@ -1093,11 +1093,10 @@ static int build_allocate_payload(struct drm_dp_sideband_msg_tx *msg, int port_n number_sdp_streams); drm_dp_encode_sideband_req(&req, msg); msg->path_msg = true; - return 0; } -static int build_power_updown_phy(struct drm_dp_sideband_msg_tx *msg, - int port_num, bool power_up) +static void build_power_updown_phy(struct drm_dp_sideband_msg_tx *msg, + int port_num, bool power_up) { struct drm_dp_sideband_msg_req_body req; @@ -1109,7 +1108,6 @@ static int build_power_updown_phy(struct drm_dp_sideband_msg_tx *msg, req.u.port_num.port_number = port_num; drm_dp_encode_sideband_req(&req, msg); msg->path_msg = true; - return 0; } static int drm_dp_mst_assign_payload_id(struct drm_dp_mst_topology_mgr *mgr, @@ -2052,29 +2050,24 @@ ssize_t drm_dp_mst_dpcd_write(struct drm_dp_aux *aux, offset, size, buffer); } -static void drm_dp_check_mstb_guid(struct drm_dp_mst_branch *mstb, u8 *guid) +static int drm_dp_check_mstb_guid(struct drm_dp_mst_branch *mstb, u8 *guid) { - int ret; + int ret = 0; memcpy(mstb->guid, guid, 16); if (!drm_dp_validate_guid(mstb->mgr, mstb->guid)) { if (mstb->port_parent) { - ret = drm_dp_send_dpcd_write( - mstb->mgr, - mstb->port_parent, - DP_GUID, - 16, - mstb->guid); + ret = drm_dp_send_dpcd_write(mstb->mgr, + mstb->port_parent, + DP_GUID, 16, mstb->guid); } else { - - ret = drm_dp_dpcd_write( - mstb->mgr->aux, - DP_GUID, - mstb->guid, - 16); + ret = drm_dp_dpcd_write(mstb->mgr->aux, + DP_GUID, mstb->guid, 16); } } + + return ret; } static void build_mst_prop_path(const struct drm_dp_mst_branch *mstb, @@ -2595,7 +2588,8 @@ static bool drm_dp_validate_guid(struct drm_dp_mst_topology_mgr *mgr, return false; } -static int build_dpcd_read(struct drm_dp_sideband_msg_tx *msg, u8 port_num, u32 offset, u8 num_bytes) +static void build_dpcd_read(struct drm_dp_sideband_msg_tx *msg, + u8 port_num, u32 offset, u8 num_bytes) { struct drm_dp_sideband_msg_req_body req; @@ -2604,8 +2598,6 @@ static int build_dpcd_read(struct drm_dp_sideband_msg_tx *msg, u8 port_num, u32 req.u.dpcd_read.dpcd_address = offset; req.u.dpcd_read.num_bytes = num_bytes; drm_dp_encode_sideband_req(&req, msg); - - return 0; } static int drm_dp_send_sideband_msg(struct drm_dp_mst_topology_mgr *mgr, @@ -2828,7 +2820,7 @@ static int drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_sideband_msg_tx *txmsg; struct drm_dp_link_address_ack_reply *reply; struct drm_dp_mst_port *port, *tmp; - int i, len, ret, port_mask = 0; + int i, ret, port_mask = 0; bool changed = false; txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL); @@ -2836,7 +2828,7 @@ static int drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr, return -ENOMEM; txmsg->dst = mstb; - len = build_link_address(txmsg); + build_link_address(txmsg); mstb->link_address_sent = true; drm_dp_queue_down_tx(mgr, txmsg); @@ -2857,7 +2849,9 @@ static int drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr, DRM_DEBUG_KMS("link address reply: %d\n", reply->nports); drm_dp_dump_link_address(reply); - drm_dp_check_mstb_guid(mstb, reply->guid); + ret = drm_dp_check_mstb_guid(mstb, reply->guid); + if (ret) + goto out; for (i = 0; i < reply->nports; i++) { port_mask |= BIT(reply->ports[i].port_number); @@ -2898,14 +2892,14 @@ void drm_dp_send_clear_payload_id_table(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_branch *mstb) { struct drm_dp_sideband_msg_tx *txmsg; - int len, ret; + int ret; txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL); if (!txmsg) return; txmsg->dst = mstb; - len = build_clear_payload_id_table(txmsg); + build_clear_payload_id_table(txmsg); drm_dp_queue_down_tx(mgr, txmsg); @@ -2923,7 +2917,6 @@ drm_dp_send_enum_path_resources(struct drm_dp_mst_topology_mgr *mgr, { struct drm_dp_enum_path_resources_ack_reply *path_res; struct drm_dp_sideband_msg_tx *txmsg; - int len; int ret; txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL); @@ -2931,7 +2924,7 @@ drm_dp_send_enum_path_resources(struct drm_dp_mst_topology_mgr *mgr, return -ENOMEM; txmsg->dst = mstb; - len = build_enum_path_resources(txmsg, port->port_num); + build_enum_path_resources(txmsg, port->port_num); drm_dp_queue_down_tx(mgr, txmsg); @@ -3014,7 +3007,7 @@ static int drm_dp_payload_send_msg(struct drm_dp_mst_topology_mgr *mgr, { struct drm_dp_sideband_msg_tx *txmsg; struct drm_dp_mst_branch *mstb; - int len, ret, port_num; + int ret, port_num; u8 sinks[DRM_DP_MAX_SDP_STREAMS]; int i; @@ -3039,9 +3032,9 @@ static int drm_dp_payload_send_msg(struct drm_dp_mst_topology_mgr *mgr, sinks[i] = i; txmsg->dst = mstb; - len = build_allocate_payload(txmsg, port_num, - id, - pbn, port->num_sdp_streams, sinks); + build_allocate_payload(txmsg, port_num, + id, + pbn, port->num_sdp_streams, sinks); drm_dp_queue_down_tx(mgr, txmsg); @@ -3070,7 +3063,7 @@ int drm_dp_send_power_updown_phy(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, bool power_up) { struct drm_dp_sideband_msg_tx *txmsg; - int len, ret; + int ret; port = drm_dp_mst_topology_get_port_validated(mgr, port); if (!port) @@ -3083,7 +3076,7 @@ int drm_dp_send_power_updown_phy(struct drm_dp_mst_topology_mgr *mgr, } txmsg->dst = port->parent; - len = build_power_updown_phy(txmsg, port->port_num, power_up); + build_power_updown_phy(txmsg, port->port_num, power_up); drm_dp_queue_down_tx(mgr, txmsg); ret = drm_dp_mst_wait_tx_reply(port->parent, txmsg); @@ -3305,7 +3298,6 @@ static int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, int offset, int size, u8 *bytes) { - int len; int ret = 0; struct drm_dp_sideband_msg_tx *txmsg; struct drm_dp_mst_branch *mstb; @@ -3320,7 +3312,7 @@ static int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr, goto fail_put; } - len = build_dpcd_read(txmsg, port->port_num, offset, size); + build_dpcd_read(txmsg, port->port_num, offset, size); txmsg->dst = port->parent; drm_dp_queue_down_tx(mgr, txmsg); @@ -3358,7 +3350,6 @@ static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr, struct drm_dp_mst_port *port, int offset, int size, u8 *bytes) { - int len; int ret; struct drm_dp_sideband_msg_tx *txmsg; struct drm_dp_mst_branch *mstb; @@ -3373,7 +3364,7 @@ static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr, goto fail_put; } - len = build_dpcd_write(txmsg, port->port_num, offset, size, bytes); + build_dpcd_write(txmsg, port->port_num, offset, size, bytes); txmsg->dst = mstb; drm_dp_queue_down_tx(mgr, txmsg); @@ -3619,7 +3610,12 @@ int drm_dp_mst_topology_mgr_resume(struct drm_dp_mst_topology_mgr *mgr, DRM_DEBUG_KMS("dpcd read failed - undocked during suspend?\n"); goto out_fail; } - drm_dp_check_mstb_guid(mgr->mst_primary, guid); + + ret = drm_dp_check_mstb_guid(mgr->mst_primary, guid); + if (ret) { + DRM_DEBUG_KMS("check mstb failed - undocked during suspend?\n"); + goto out_fail; + } /* * For the final step of resuming the topology, we need to bring the @@ -4532,15 +4528,34 @@ void drm_dp_mst_dump_topology(struct seq_file *m, int ret; ret = drm_dp_dpcd_read(mgr->aux, DP_DPCD_REV, buf, DP_RECEIVER_CAP_SIZE); + if (ret) { + seq_printf(m, "dpcd read failed\n"); + goto out; + } seq_printf(m, "dpcd: %*ph\n", DP_RECEIVER_CAP_SIZE, buf); + ret = drm_dp_dpcd_read(mgr->aux, DP_FAUX_CAP, buf, 2); + if (ret) { + seq_printf(m, "faux/mst read failed\n"); + goto out; + } seq_printf(m, "faux/mst: %*ph\n", 2, buf); + ret = drm_dp_dpcd_read(mgr->aux, DP_MSTM_CTRL, buf, 1); + if (ret) { + seq_printf(m, "mst ctrl read failed\n"); + goto out; + } seq_printf(m, "mst ctrl: %*ph\n", 1, buf); /* dump the standard OUI branch header */ ret = drm_dp_dpcd_read(mgr->aux, DP_BRANCH_OUI, buf, DP_BRANCH_OUI_HEADER_SIZE); + if (ret) { + seq_printf(m, "branch oui read failed\n"); + goto out; + } seq_printf(m, "branch oui: %*phN devid: ", 3, buf); + for (i = 0x3; i < 0x8 && buf[i]; i++) seq_printf(m, "%c", buf[i]); seq_printf(m, " revision: hw: %x.%x sw: %x.%x\n", @@ -4549,6 +4564,7 @@ void drm_dp_mst_dump_topology(struct seq_file *m, seq_printf(m, "payload table: %*ph\n", DP_PAYLOAD_TABLE_SIZE, buf); } +out: mutex_unlock(&mgr->lock); } -- 2.15.0

2 1

← Newer
1
...
21
22
23
24
25
26
27
...
68
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel February 2020