dri-devel April 2016

dri-devel@lists.freedesktop.org

197 participants
1285 discussions

[PATCH 1/3] drm: Make drm.h uapi header safe for C++
by Daniel Vetter 06 Apr '16

06 Apr '16

virtual is a protected keyword in C++ and can't be used at all. Ugh. This aligns the kernel versions of the drm headers with the ones in libdrm. Cc: Emil Velikov <emil.l.velikov(a)gmail.com> Signed-off-by: Daniel Vetter <daniel.vetter(a)intel.com> --- include/uapi/drm/drm.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index a0ebfe7c9a28..d299c7749091 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -373,7 +373,11 @@ struct drm_buf_pub { */ struct drm_buf_map { int count; /**< Length of the buffer list */ +#ifdef __cplusplus + void *virt; +#else void __user *virtual; /**< Mmap'd area in user-virtual */ +#endif struct drm_buf_pub __user *list; /**< Buffer information */ }; -- 2.8.0.rc3

5 20

[pull] radeon and amdgpu drm-fixes-4.6
by Alex Deucher 06 Apr '16

06 Apr '16

Hi Dave, Lots of misc bug fixes for radeon and amdgpu and one for ttm. - fix vram info fetching on Fiji and unposted boards - additional vblank fixes from the conversion to drm_vblank_on/off - UVD dGPU suspend and resume fixes - lots of powerplay fixes - fix a fence leak in the pageflip code - ttm fix for platforms where CPU is 32 bit, but physical addresses are >32bits The following changes since commit 72b9ff0612ad8fc969b910cd00ac16b57a1a9ba4: drm/udl: Use unlocked gem unreferencing (2016-04-01 13:22:33 +1000) are available in the git repository at: git://people.freedesktop.org/~agd5f/linux drm-fixes-4.6 for you to fetch changes up to 7c0ecda15b01bc88d762d9263d2cf0f69ffd4c23: drm/amdgpu: total vram size also reduces pin size (2016-04-05 15:23:31 -0400) ---------------------------------------------------------------- Alex Deucher (4): drm/amdgpu/gmc: move vram type fetching into sw_init drm/amdgpu/gmc: use proper register for vram type on Fiji drm/amdgpu: print vram type rather than just DDR drm/ttm: use phys_addr_t for ttm_bus_placement Christian König (1): drm/amdgpu: fix leaking fence in the pageflip code Chunming Zhou (2): drm/amdgpu: fence wait old rcu slot drm/amdgpu: total vram size also reduces pin size Leo Liu (2): drm/amdgpu: save and restore UVD context with suspend and resume drm/amdgpu: save and restore the firwmware cache part when suspend resume Michel Dänzer (3): drm/radeon: Set vblank_disable_allowed = true drm/amdgpu: Set vblank_disable_allowed = true drm/radeon: Only call drm_vblank_on/off between drm_vblank_init/cleanup Rex Zhu (9): drm/amd/powerplay: fix segment fault issue in multi-display case. drm/amdgpu: add an cgs interface to notify amdgpu the dpm state. drm/amdgpu: Not support disable dpm in powerplay. drm/amd/powerplay: notify amdgpu whether dpm is enabled or not. drm/amdgpu: check dpm state before pm system fs initialized. drm/amd/powerplay: add new Fiji function for not setting same ps. drm/amd/powerplay: Need to change boot to performance state in resume. drm/amd/powerplay: fix issue that resume back, dpm can't work on FIJI. drm/amd/powerplay: add uvd/vce dpm enabling flag default. drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 24 ++++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 8 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 15 ++++- drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 10 +--- drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 58 +++++++++--------- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 16 ++--- drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 23 +++++--- drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 4 +- drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 7 ++- drivers/gpu/drm/amd/include/cgs_common.h | 8 +++ .../drm/amd/powerplay/eventmgr/eventactionchains.c | 4 +- drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 69 ++++++++++++++++++++++ .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 16 ++++- drivers/gpu/drm/radeon/atombios_crtc.c | 6 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 6 +- include/drm/ttm/ttm_bo_api.h | 2 +- 22 files changed, 210 insertions(+), 78 deletions(-)

1 0

[PATCH] mdfld_dsi: remove bogus if check
by Alan 06 Apr '16

06 Apr '16

From: Alan <gnomes(a)lxorguk.ukuu.org.uk> Both cases produce the same result. Kill the junk code. Signed-off-by: Alan Cox <alan(a)linux.intel.com> --- drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c index 7cd87a0..a05c0206 100644 --- a/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c +++ b/drivers/gpu/drm/gma500/mdfld_dsi_dpi.c @@ -979,11 +979,7 @@ struct mdfld_dsi_encoder *mdfld_dsi_dpi_init(struct drm_device *dev, return NULL; } - if (dsi_connector->pipe) - dpi_output->panel_on = 0; - else - dpi_output->panel_on = 0; - + dpi_output->panel_on = 0; dpi_output->dev = dev; if (mdfld_get_panel_type(dev, pipe) != TC35876X) dpi_output->p_funcs = p_funcs;

1 0

[PATCH 5/6] drm,i915: Introduce drm_malloc_gfp()
by Chris Wilson 06 Apr '16

06 Apr '16

I have instances where I want to use drm_malloc_ab() but with a custom gfp mask. And with those, where I want a temporary allocation, I want to try a high-order kmalloc() before using a vmalloc(). So refactor my usage into drm_malloc_gfp(). Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: dri-devel(a)lists.freedesktop.org Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Acked-by: Dave Airlie <airlied(a)redhat.com> --- drivers/gpu/drm/i915/i915_gem.c | 4 +--- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 8 +++----- drivers/gpu/drm/i915/i915_gem_gtt.c | 5 +++-- drivers/gpu/drm/i915/i915_gem_userptr.c | 15 ++++----------- include/drm/drm_mem_util.h | 19 +++++++++++++++++++ 5 files changed, 30 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index be4cf13343d5..985f067c1f0e 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2421,9 +2421,7 @@ void *i915_gem_object_pin_vmap(struct drm_i915_gem_object *obj) int n; n = obj->base.size >> PAGE_SHIFT; - pages = kmalloc(n*sizeof(*pages), GFP_TEMPORARY | __GFP_NOWARN); - if (pages == NULL) - pages = drm_malloc_ab(n, sizeof(*pages)); + pages = drm_malloc_gfp(n, sizeof(*pages), GFP_TEMPORARY); if (pages != NULL) { n = 0; for_each_sg_page(obj->pages->sgl, &sg_iter, obj->pages->nents, 0) diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c index 0ee61fd014df..6ee4f00f620c 100644 --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c @@ -1783,11 +1783,9 @@ i915_gem_execbuffer2(struct drm_device *dev, void *data, return -EINVAL; } - exec2_list = kmalloc(sizeof(*exec2_list)*args->buffer_count, - GFP_TEMPORARY | __GFP_NOWARN | __GFP_NORETRY); - if (exec2_list == NULL) - exec2_list = drm_malloc_ab(sizeof(*exec2_list), - args->buffer_count); + exec2_list = drm_malloc_gfp(args->buffer_count, + sizeof(*exec2_list), + GFP_TEMPORARY); if (exec2_list == NULL) { DRM_DEBUG("Failed to allocate exec list for %d buffers\n", args->buffer_count); diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index ae9cb2735767..18f2bd7caad5 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -3413,8 +3413,9 @@ intel_rotate_fb_obj_pages(struct intel_rotation_info *rot_info, int ret = -ENOMEM; /* Allocate a temporary list of source pages for random access. */ - page_addr_list = drm_malloc_ab(obj->base.size / PAGE_SIZE, - sizeof(dma_addr_t)); + page_addr_list = drm_malloc_gfp(obj->base.size / PAGE_SIZE, + sizeof(dma_addr_t), + GFP_TEMPORARY); if (!page_addr_list) return ERR_PTR(ret); diff --git a/drivers/gpu/drm/i915/i915_gem_userptr.c b/drivers/gpu/drm/i915/i915_gem_userptr.c index 291a9393493d..67883ebf9504 100644 --- a/drivers/gpu/drm/i915/i915_gem_userptr.c +++ b/drivers/gpu/drm/i915/i915_gem_userptr.c @@ -494,10 +494,7 @@ __i915_gem_userptr_get_pages_worker(struct work_struct *_work) ret = -ENOMEM; pinned = 0; - pvec = kmalloc(npages*sizeof(struct page *), - GFP_TEMPORARY | __GFP_NOWARN | __GFP_NORETRY); - if (pvec == NULL) - pvec = drm_malloc_ab(npages, sizeof(struct page *)); + pvec = drm_malloc_gfp(npages, sizeof(struct page *), GFP_TEMPORARY); if (pvec != NULL) { struct mm_struct *mm = obj->userptr.mm->mm; @@ -634,14 +631,10 @@ i915_gem_userptr_get_pages(struct drm_i915_gem_object *obj) pvec = NULL; pinned = 0; if (obj->userptr.mm->mm == current->mm) { - pvec = kmalloc(num_pages*sizeof(struct page *), - GFP_TEMPORARY | __GFP_NOWARN | __GFP_NORETRY); + pvec = drm_malloc_gfp(num_pages, sizeof(struct page *), GFP_TEMPORARY); if (pvec == NULL) { - pvec = drm_malloc_ab(num_pages, sizeof(struct page *)); - if (pvec == NULL) { - __i915_gem_userptr_set_active(obj, false); - return -ENOMEM; - } + __i915_gem_userptr_set_active(obj, false); + return -ENOMEM; } pinned = __get_user_pages_fast(obj->userptr.ptr, num_pages, diff --git a/include/drm/drm_mem_util.h b/include/drm/drm_mem_util.h index e42495ad8136..741ce75a72b4 100644 --- a/include/drm/drm_mem_util.h +++ b/include/drm/drm_mem_util.h @@ -54,6 +54,25 @@ static __inline__ void *drm_malloc_ab(size_t nmemb, size_t size) GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL); } +static __inline__ void *drm_malloc_gfp(size_t nmemb, size_t size, gfp_t gfp) +{ + if (size != 0 && nmemb > SIZE_MAX / size) + return NULL; + + if (size * nmemb <= PAGE_SIZE) + return kmalloc(nmemb * size, gfp); + + if (gfp & __GFP_RECLAIMABLE) { + void *ptr = kmalloc(nmemb * size, + gfp | __GFP_NOWARN | __GFP_NORETRY); + if (ptr) + return ptr; + } + + return __vmalloc(size * nmemb, + gfp | __GFP_HIGHMEM, PAGE_KERNEL); +} + static __inline void drm_free_large(void *ptr) { kvfree(ptr); -- 2.8.0.rc3

2 3

[Bug 94043] Distorted graphics when running Battle.net app under Wine with Radeon hardware
by bugzilla-daemon＠freedesktop.org 06 Apr '16

06 Apr '16

https://bugs.freedesktop.org/show_bug.cgi?id=94043 --- Comment #13 from Erik Brangs <erik.brangs(a)gmx.de> --- Created attachment 122756 --> https://bugs.freedesktop.org/attachment.cgi?id=122756&action=edit dumped state from apitrace (from bug 87496) at index 14156 -- You are receiving this mail because: You are the assignee for the bug.

1 0

[Bug 94043] Distorted graphics when running Battle.net app under Wine with Radeon hardware
by bugzilla-daemon＠freedesktop.org 06 Apr '16

06 Apr '16

https://bugs.freedesktop.org/show_bug.cgi?id=94043 --- Comment #12 from Erik Brangs <erik.brangs(a)gmx.de> --- Created attachment 122755 --> https://bugs.freedesktop.org/attachment.cgi?id=122755&action=edit dumped state from apitrace (from bug 87496) at index 13655 -- You are receiving this mail because: You are the assignee for the bug.

1 0

[Bug 94043] Distorted graphics when running Battle.net app under Wine with Radeon hardware
by bugzilla-daemon＠freedesktop.org 06 Apr '16

06 Apr '16

https://bugs.freedesktop.org/show_bug.cgi?id=94043 --- Comment #11 from Erik Brangs <erik.brangs(a)gmx.de> --- When I replay the trace from bug 87496 with qapitrace, there are two message about an incomplete FBO: 13655: message: api issue 1: FBO incomplete: driver marked FBO as incomplete [-1] 14156: message: api issue 1: FBO incomplete: driver marked FBO as incomplete [-1] Enabling thumbnails shows that all frames are broken. Frames either don't have useful content (only colored rectangles) or the content is distorted as described above. -- You are receiving this mail because: You are the assignee for the bug.

1 0

Black screen with KABINI with kernel 4.5 with or without DAL
by Boszormenyi Zoltan 06 Apr '16

06 Apr '16

Hi, we have a bunch of Zotac ZBOX NANO-AQ01 with this APU: [ 2.234372] [drm] initializing kernel modesetting (KABINI 0x1002:0x9832 0x1002:0x0123). For our application, we force 1440x900 resolution via this modeline ("cvt 1440 900"): Modeline "1440x900" 106.50 1440 1528 1672 1904 900 903 909 934 -hsync +vsync The application is Chromium in kiosk mode. The problem is that sometimes the screen stays black after KMS kicks in. Currently the kernel is 4.5 with or without the DAL WIP patchset, i.e. a "git diff" between b562e44f507e863c6792946e4e1b1449fbbac85d from Linus's GIT and 629edeae23ba531f6f5ceacf3f1fa71ba5132303 from git://people.freedesktop.org/~agd5f/linux : commit 629edeae23ba531f6f5ceacf3f1fa71ba5132303 Author: Eric Yang <eric.yang2(a)amd.com> Date: Wed Mar 16 16:38:28 2016 -0400 drm/amd/dal: fix division by 0 on boot for dce80 DCE80 used to have bandwidth parameters initialized with the dce110 numbers. This was taken out a while ago, leaving the parameters to be uninitialized. This causes division by 0 on boot. This change resolves this by skipping bandwidth calculation and displaymark programming. For now, we will have dce80 always running safemark Reviewed-by: Eagle Yeh <eagle.yeh(a)amd.com> Signed-off-by: Eric Yang <eric.yang2(a)amd.com> Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> We use Xorg 1.16.4 and xf86-video-ati GIT with TearFree, commit ID 10b7c3def58bb34acc38f076bc230e25b454ab79. The same behaviour is present with 4693b1bd5b5c381e8b7b68a6f7f0c6696d6a68df. Attached is the dmesg and Xorg logs from both good and bad booting with the DAL kernel, with "drm.debug=0x1e log_buf_len=1M" kernel options. Our extra xorg.conf to force the 1440x900 is this: Section "Monitor" Identifier "HDMI-0" Option "AutoServerLayout" "on" Option "Position" "0 0" Modeline "1440x900" 106.50 1440 1528 1672 1904 900 903 909 934 -hsync +vsync EndSection Section "Monitor" Identifier "DisplayPort-0" Option "AutoServerLayout" "on" Option "Position" "0 0" Modeline "1440x900" 106.50 1440 1528 1672 1904 900 903 909 934 -hsync +vsync EndSection Section "Device" Identifier "RADEON" Driver "radeon" Option "AutoServerLayout" "on" Option "Monitor-HDMI-0" "HDMI-0" Option "Monitor-DisplayPort-0" "DisplayPort-0" Option "TearFree" "on" EndSection Section "Screen" Identifier "SCREEN" Option "AutoServerLayout" "on" SubSection "Display" Viewport 0 0 Modes "1440x900" Depth 24 EndSubSection EndSection Can someone fix this black screen problem? Thanks in advance, Zoltán Böszörményi

2 4

[PATCH] drm/radeon: add support for SET_APPEND_CNT packet3
by Dave Airlie 06 Apr '16

06 Apr '16

From: Dave Airlie <airlied(a)redhat.com> This adds support to the command parser for the set append counter packet3, this is required to support atomic counters on evergreen/cayman GPUs. Signed-off-by: Dave Airlie <airlied(a)redhat.com> --- drivers/gpu/drm/radeon/evergreen_cs.c | 38 +++++++++++++++++++++++++++++++++++ drivers/gpu/drm/radeon/evergreend.h | 20 ++++++++++++++++++ drivers/gpu/drm/radeon/radeon_drv.c | 3 ++- 3 files changed, 60 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c index 9e93205..1f618c5 100644 --- a/drivers/gpu/drm/radeon/evergreen_cs.c +++ b/drivers/gpu/drm/radeon/evergreen_cs.c @@ -2608,6 +2608,44 @@ static int evergreen_packet3_check(struct radeon_cs_parser *p, } } break; + case PACKET3_SET_APPEND_CNT: + { + uint32_t areg; + if (pkt->count != 2) { + DRM_ERROR("bad SET_APPEND_CNT (invalid count)\n"); + return -EINVAL; + } + + areg = idx_value >> 16; + if (areg < 0x1cb || areg > 0x1cb + 8) { + dev_warn(p->dev, "forbidden register for append cnt 0x%08x at %d\n", + areg, idx); + return -EINVAL; + } + + if ((idx_value & 0x3) == 0x3) { /* Read from memory address */ + uint64_t offset; + uint32_t swap; + r = radeon_cs_packet_next_reloc(p, &reloc, 0); + if (r) { + DRM_ERROR("bad SET_APPEND_CNT (missing reloc)\n"); + return -EINVAL; + } + offset = radeon_get_ib_value(p, idx+1); + swap = offset & 0x3; + offset &= ~0x3; + + offset += ((u64)(radeon_get_ib_value(p, idx+2) & 0xff)) << 32; + + offset += reloc->gpu_offset; + ib[idx+1] = (offset & 0xfffffffc) | swap; + ib[idx+2] = upper_32_bits(offset) & 0xff; + } else { + DRM_ERROR("bad SET_APPEND_CNT (unsupported operation)\n"); + return -EINVAL; + } + break; + } case PACKET3_NOP: break; default: diff --git a/drivers/gpu/drm/radeon/evergreend.h b/drivers/gpu/drm/radeon/evergreend.h index 13b6029..2e2f740 100644 --- a/drivers/gpu/drm/radeon/evergreend.h +++ b/drivers/gpu/drm/radeon/evergreend.h @@ -1689,6 +1689,26 @@ #define PACKET3_SET_CONTEXT_REG_INDIRECT 0x73 #define PACKET3_SET_RESOURCE_INDIRECT 0x74 #define PACKET3_SET_APPEND_CNT 0x75 +/* SET_APPEND_CNT - documentation + * 1. header + * 2. COMMAND + * 1:0 - SOURCE SEL + * 15:2 - Reserved + * 31:16 - WR_REG_OFFSET - context register to write source data to. + * (one of R_02872C_GDS_APPEND_COUNT_0-8) + * 3. CONTROL + * (for source == mem) + * 31:2 SRC_ADDRESS_LO + * 0:1 SWAP + * (for source == GDS) + * 31:0 GDS offset + * (for source == DATA) + * 31:0 DATA + * (for source == REG) + * 31:0 REG + * 4. SRC_ADDRESS_HI[7:0] + * kernel driver 2.44 only supports SRC == MEM. + */ #define SQ_RESOURCE_CONSTANT_WORD7_0 0x3001c #define S__SQ_CONSTANT_TYPE(x) (((x) & 3) << 30) diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index a4b5dbd..1f96b04 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -93,9 +93,10 @@ * 2.41.0 - evergreen/cayman: Add SET_BASE/DRAW_INDIRECT command parsing support * 2.42.0 - Add VCE/VUI (Video Usability Information) support * 2.43.0 - RADEON_INFO_GPU_RESET_COUNTER + * 2.44.0 - SET_APPEND_CNT packet3 support */ #define KMS_DRIVER_MAJOR 2 -#define KMS_DRIVER_MINOR 43 +#define KMS_DRIVER_MINOR 44 #define KMS_DRIVER_PATCHLEVEL 0 int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); int radeon_driver_unload_kms(struct drm_device *dev); -- 2.5.5

2 1

[PATCH 2/3] drm/dp/mst: Enhance DP MST debugfs output
by Jim Bride 05 Apr '16

05 Apr '16

Add some additional information (input vs. output port, sink associated with VC, peer device type, max number of VCs supported) and ensure that any embedded '\0' characters in a branch device's devid string are not written to debugfs. cc: dri-devel(a)lists.freedesktop.org Signed-off-by: Jim Bride <jim.bride(a)linux.intel.com> --- drivers/gpu/drm/drm_dp_mst_topology.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c index 27fbd79..1afa36d 100644 --- a/drivers/gpu/drm/drm_dp_mst_topology.c +++ b/drivers/gpu/drm/drm_dp_mst_topology.c @@ -2729,7 +2729,7 @@ static void drm_dp_mst_dump_mstb(struct seq_file *m, seq_printf(m, "%smst: %p, %d\n", prefix, mstb, mstb->num_ports); list_for_each_entry(port, &mstb->ports, next) { - seq_printf(m, "%sport: %d: ddps: %d ldps: %d, sdp: %d/%d, %p, conn: %p\n", prefix, port->port_num, port->ddps, port->ldps, port->num_sdp_streams, port->num_sdp_stream_sinks, port, port->connector); + seq_printf(m, "%sport: %d: input: %d: pdt: %d, ddps: %d ldps: %d, sdp: %d/%d, %p, conn: %p\n", prefix, port->port_num, port->input, port->pdt, port->ddps, port->ldps, port->num_sdp_streams, port->num_sdp_stream_sinks, port, port->connector); if (port->mstb) drm_dp_mst_dump_mstb(m, port->mstb); } @@ -2750,6 +2750,17 @@ static bool dump_dp_payload_table(struct drm_dp_mst_topology_mgr *mgr, return false; } +static bool fetch_monitor_name(struct drm_dp_mst_topology_mgr *mgr, + struct drm_dp_mst_port *port, char *name) +{ + struct edid *mst_edid = NULL; + + mst_edid = drm_dp_mst_get_edid(port->connector, mgr, port); + if (mst_edid == NULL) + return false; + return drm_edid_get_monitor_name(mst_edid, name); +} + /** * drm_dp_mst_dump_topology(): dump topology to seq file. * @m: seq_file to dump output to @@ -2762,6 +2773,8 @@ void drm_dp_mst_dump_topology(struct seq_file *m, { int i; struct drm_dp_mst_port *port; + bool mname_valid = false; + mutex_lock(&mgr->lock); if (mgr->mst_primary) drm_dp_mst_dump_mstb(m, mgr->mst_primary); @@ -2770,14 +2783,22 @@ void drm_dp_mst_dump_topology(struct seq_file *m, mutex_unlock(&mgr->lock); mutex_lock(&mgr->payload_lock); - seq_printf(m, "vcpi: %lx %lx\n", mgr->payload_mask, mgr->vcpi_mask); + seq_printf(m, "vcpi: %lx %lx %d\n", mgr->payload_mask, mgr->vcpi_mask, + mgr->max_payloads); for (i = 0; i < mgr->max_payloads; i++) { if (mgr->proposed_vcpis[i]) { + char name[13]; + + memset(name, 0, 13 * sizeof(char)); port = container_of(mgr->proposed_vcpis[i], struct drm_dp_mst_port, vcpi); - seq_printf(m, "vcpi %d: %d %d %d\n", i, port->port_num, port->vcpi.vcpi, port->vcpi.num_slots); + mname_valid = fetch_monitor_name(mgr, port, name); + seq_printf(m, "vcpi %d: %d %d %d sink name: %s\n", i, + port->port_num, port->vcpi.vcpi, + port->vcpi.num_slots, mname_valid ? name : + "Unknown"); } else - seq_printf(m, "vcpi %d:unsed\n", i); + seq_printf(m, "vcpi %d:unused\n", i); } for (i = 0; i < mgr->max_payloads; i++) { seq_printf(m, "payload %d: %d, %d, %d\n", @@ -2818,7 +2839,11 @@ void drm_dp_mst_dump_topology(struct seq_file *m, seq_printf(m, "%02x", buf[i]); seq_printf(m, " devid: "); for (i = 0x3; i < 0x8; i++) - seq_printf(m, "%c", buf[i]); + if (buf[i] != '\0') + seq_printf(m, "%c", buf[i]); + else + break; + seq_printf(m, " revision: hw: %x.%x sw: %x.%x", buf[0x9] >> 4, buf[0x9] & 0xf, buf[0xa], buf[0xb]); seq_printf(m, "\n"); bret = dump_dp_payload_table(mgr, buf); -- 2.5.0

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel April 2016