dri-devel November 2015

dri-devel@lists.freedesktop.org

171 participants
1176 discussions

NULL pointer deref at 0xb0, IP drm_calc_timestamping_constants+0x86/0x130 [drm]
by Jeff Moyer 11 Nov '15

11 Nov '15

Hi, I get the following BUG when booting the latest mainline kernel (as of commit 8d3de01cfa37b). objdump --disassemble -l points at this line in the code: drm_irq.c:644 vblank->linedur_ns = linedur_ns; To further corroborate this, offset 0xb0 into struct drm_vblank_crtc is linedur_ns. However, I can't say that makes a whole lot of sense to me, given that vblank is initialized like so: struct drm_vblank_crtc *vblank = &crtc->dev->vblank[drm_crtc_index(crtc)]; Full dmesg and .config are attached. Let me know if there's any other information I can provide. Thanks! Jeff [ 7.390265] BUG: unable to handle kernel NULL pointer dereference at 00000000000000b0 [ 7.390290] IP: [<ffffffffa014b266>] drm_calc_timestamping_constants+0x86/0x130 [drm] [ 7.390291] PGD 0 [ 7.390294] Oops: 0002 [#1] SMP [ 7.390311] Modules linked in: sr_mod cdrom mgag200(+) i2c_algo_bit drm_kms_helper ahci syscopyarea sysfillrect sysimgblt libahci fb_sys_fops bnx2x ttm tg3(+) mdio drm ptp sd_mod libata i2c_core pps_core libcrc32c hpsa dm_mirror dm_region_hash dm_log dm_mod [ 7.390315] CPU: 0 PID: 418 Comm: kworker/0:2 Not tainted 4.3.0+ #1 [ 7.390316] Hardware name: HP ProLiant DL380 Gen9, BIOS P89 06/09/2015 [ 7.390325] Workqueue: events work_for_cpu_fn [ 7.390326] task: ffff88046ca95500 ti: ffff88007830c000 task.ti: ffff88007830c000 [ 7.390339] RIP: 0010:[<ffffffffa014b266>] [<ffffffffa014b266>] drm_calc_timestamping_constants+0x86/0x130 [drm] [ 7.390341] RSP: 0018:ffff88007830f4e8 EFLAGS: 00010246 [ 7.390342] RAX: 0000000000fe4c00 RBX: ffff88006a849160 RCX: 0000000000000540 [ 7.390343] RDX: 0000000000000000 RSI: 000000000000fde8 RDI: ffff88006a849000 [ 7.390344] RBP: ffff88007830f518 R08: ffff88007830c000 R09: 00000001b87e3712 [ 7.390345] R10: 00000000000050c4 R11: 0000000000000000 R12: 0000000000fe4c00 [ 7.390346] R13: ffff88006a849000 R14: 0000000000000000 R15: 000000000000fde8 [ 7.390348] FS: 0000000000000000(0000) GS:ffff88046f800000(0000) knlGS:0000000000000000 [ 7.390350] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 7.390351] CR2: 00000000000000b0 CR3: 00000000019d6000 CR4: 00000000001406f0 [ 7.390352] Stack: [ 7.390355] ffff88007830f518 ffff88006a849000 ffff880c69b90340 ffff880c69b90000 [ 7.390357] ffff880c69b90348 ffff880c69b90340 ffff88007830f748 ffffffffa042f7e7 [ 7.390359] ffff88006a849090 0000000000000000 ffff88006a849160 0000000000000000 [ 7.390360] Call Trace: [ 7.390371] [<ffffffffa042f7e7>] drm_crtc_helper_set_mode+0x3d7/0x4b0 [drm_kms_helper] [ 7.390379] [<ffffffffa04307d4>] drm_crtc_helper_set_config+0x8d4/0xb10 [drm_kms_helper] [ 7.390397] [<ffffffffa01548d4>] drm_mode_set_config_internal+0x64/0x100 [drm] [ 7.390406] [<ffffffffa043c342>] drm_fb_helper_pan_display+0xa2/0x280 [drm_kms_helper] [ 7.390414] [<ffffffff81392c7b>] fb_pan_display+0xbb/0x170 [ 7.390418] [<ffffffff8138cf70>] bit_update_start+0x20/0x50 [ 7.390421] [<ffffffff8138b81b>] fbcon_switch+0x39b/0x590 [ 7.390428] [<ffffffff8140a3d0>] redraw_screen+0x1a0/0x240 [ 7.390432] [<ffffffff8140b30e>] do_bind_con_driver+0x2ee/0x310 [ 7.390435] [<ffffffff8140b651>] do_take_over_console+0x141/0x1b0 [ 7.390439] [<ffffffff81387377>] do_fbcon_takeover+0x57/0xb0 [ 7.390441] [<ffffffff8138c98b>] fbcon_event_notify+0x60b/0x750 [ 7.390459] [<ffffffff810a5599>] notifier_call_chain+0x49/0x70 [ 7.390461] [<ffffffff810a58dd>] __blocking_notifier_call_chain+0x4d/0x70 [ 7.390463] [<ffffffff810a5916>] blocking_notifier_call_chain+0x16/0x20 [ 7.390465] [<ffffffff8139282b>] fb_notifier_call_chain+0x1b/0x20 [ 7.390466] [<ffffffff81394881>] register_framebuffer+0x1f1/0x330 [ 7.390471] [<ffffffffa043d9aa>] drm_fb_helper_initial_config+0x27a/0x3d0 [drm_kms_helper] [ 7.390476] [<ffffffffa0469b4d>] mgag200_fbdev_init+0xdd/0xf0 [mgag200] [ 7.390479] [<ffffffffa0468586>] mgag200_modeset_init+0x176/0x1e0 [mgag200] [ 7.390481] [<ffffffffa0464659>] mgag200_driver_load+0x3f9/0x580 [mgag200] [ 7.390489] [<ffffffffa014e067>] drm_dev_register+0xa7/0xb0 [drm] [ 7.390496] [<ffffffffa015054f>] drm_get_pci_dev+0x8f/0x1e0 [drm] [ 7.390499] [<ffffffffa046937b>] mga_pci_probe+0x9b/0xc0 [mgag200] [ 7.390502] [<ffffffff813662d5>] local_pci_probe+0x45/0xa0 [ 7.390504] [<ffffffff8109afe4>] work_for_cpu_fn+0x14/0x20 [ 7.390505] [<ffffffff8109e13c>] process_one_work+0x14c/0x3c0 [ 7.390507] [<ffffffff8109eaa4>] worker_thread+0x244/0x470 [ 7.390509] [<ffffffff8168bfba>] ? __schedule+0x2aa/0x760 [ 7.390511] [<ffffffff8109e860>] ? rescuer_thread+0x310/0x310 [ 7.390512] [<ffffffff810a4438>] kthread+0xd8/0xf0 [ 7.390514] [<ffffffff810a4360>] ? kthread_park+0x60/0x60 [ 7.390516] [<ffffffff8169030f>] ret_from_fork+0x3f/0x70 [ 7.390518] [<ffffffff810a4360>] ? kthread_park+0x60/0x60 [ 7.390530] Code: f6 31 d2 41 89 c2 8b 83 b4 00 00 00 0f af c1 48 98 48 69 c0 40 42 0f 00 48 f7 f6 f6 43 74 10 41 89 c4 75 26 f6 05 9a 6f 03 00 01 <45> 89 96 b0 00 00 00 45 89 a6 ac 00 00 00 75 35 48 83 c4 08 5b [ 7.390536] RIP [<ffffffffa014b266>] drm_calc_timestamping_constants+0x86/0x130 [drm] [ 7.390536] RSP <ffff88007830f4e8> [ 7.390537] CR2: 00000000000000b0 [ 7.390539] ---[ end trace 16791f9e7277a2e0 ]--- [ 7.392302] Kernel panic - not syncing: Fatal exception [ 7.392347] Kernel Offset: disabled

1 0

[RFC v3 1/2] Documentation: bridge: Add documentation for ps8640 DT properties
by Jitao Shi 11 Nov '15

11 Nov '15

Add documentation for DT properties supported by ps8640 DSI-eDP converter. Signed-off-by: Jitao Shi <jitao.shi(a)mediatek.com> Acked-by: Rob Herring <robh(a)kernel.org> --- changes since v2: tune properties in example match Required properties --- .../devicetree/bindings/display/bridge/ps8640.txt | 43 ++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/bridge/ps8640.txt diff --git a/Documentation/devicetree/bindings/display/bridge/ps8640.txt b/Documentation/devicetree/bindings/display/bridge/ps8640.txt new file mode 100644 index 0000000..a3e0971 --- /dev/null +++ b/Documentation/devicetree/bindings/display/bridge/ps8640.txt @@ -0,0 +1,43 @@ +ps8640-bridge bindings + +Required properties: + - compatible: "parade,ps8640" + - reg: first page address of the bridge. + - sleep-gpios: OF device-tree gpio specification for PD_ pin. + - reset-gpios: OF device-tree gpio specification for reset pin. + - mode-sel-gpios: OF device-tree gpio specification for mode-sel pin. + - vdd12-supply: OF device-tree regulator specification for 1.2V power. + - vdd33-supply: OF device-tree regulator specification for 3.3V power. + - ports: The device node can contain video interface port nodes per + the video-interfaces bind[1]. For port@0,set the reg = <0> as + ps8640 dsi in and port@1,set the reg = <1> as ps8640 eDP out. + +[1]: Documentation/devicetree/bindings/media/video-interfaces.txt + +Example: + edp-bridge@18 { + compatible = "parade,ps8640"; + reg = <0x18>; + sleep-gpios = <&pio 116 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 115 GPIO_ACTIVE_HIGH>; + mode-sel-gpios = <&pio 92 GPIO_ACTIVE_HIGH>; + vdd12-supply = <&ps8640_fixed_1v2>; + vdd33-supply = <&mt6397_vgp2_reg>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + port@0 { + reg = <0>; + ps8640_in: endpoint { + remote-endpoint = <&dsi0_out>; + }; + }; + port@1 { + reg = <1>; + ps8640_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + }; + }; -- 1.7.9.5

2 2

[PULL] topic/drm-fixes
by Jani Nikula 11 Nov '15

11 Nov '15

Hi Dave, I seem to be off-sync with your pulls to Linus... anyway, here's one uapi build fix I've picked up. BR, Jani. The following changes since commit f36203be608a38a5b5523a7aa52cc72f757b9679: drm/dp: Add dp_aux_i2c_speed_khz module param to set the assume i2c bus speed (2015-09-02 16:13:43 +0300) are available in the git repository at: git://anongit.freedesktop.org/drm-intel tags/topic/drm-fixes-2015-11-11 for you to fetch changes up to 6172180c6b37ea164bf8a9bad70bb348d0a16563: drm: Use userspace compatible type in fourcc_mod_code macro (2015-11-05 14:39:55 +0200) ---------------------------------------------------------------- Tvrtko Ursulin (1): drm: Use userspace compatible type in fourcc_mod_code macro include/uapi/drm/drm_fourcc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Jani Nikula, Intel Open Source Technology Center

1 0

[Bug 106851] WARNING: CPU: 0 PID: 686 at fs/sysfs/dir.c:31 sysfs_warn_dup+0x68/0x80() + drm:radeon_pm_late_init [radeon]] *ERROR*
by bugzilla-daemon＠bugzilla.kernel.org 11 Nov '15

11 Nov '15

https://bugzilla.kernel.org/show_bug.cgi?id=106851 --- Comment #9 from Holger Hoffstätte <holger.hoffstaette(a)googlemail.com> --- (In reply to Holger Hoffstätte from comment #4) > Created attachment 191741 [details] > Unconditionally set sysfs_initialized > > This patch removes the conditional around setting sysfs_initialized and > works for me - no more spew on resume. Also fixes a previously duplicate > message text. So it turns out that *in my case* - even with the original patch - these messages apparently (?) were caused because my monitor was dying (it's completely dead now) and reacting too slowly, i.e. not waking up properly. I got a new one and now the original patch - which is in 4.1.13 - does indeed work fine: no more errors on resume. -- You are receiving this mail because: You are watching the assignee of the bug.

1 0

[PATCH] Revert "drm/rockchip: Convert the probe function to the generic drm_of_component_probe()"
by Mark Yao 11 Nov '15

11 Nov '15

This reverts commit 52f5eb60940de889ce98a876f6933b574ead3225. Rockchip drm can't work with generic drm_of_component_probe now Signed-off-by: Mark Yao <mark.yao(a)rock-chips.com> --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 81 +++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index d26e0cc..f22e1e1 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -19,7 +19,6 @@ #include <drm/drmP.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_fb_helper.h> -#include <drm/drm_of.h> #include <linux/dma-mapping.h> #include <linux/pm_runtime.h> #include <linux/module.h> @@ -419,6 +418,29 @@ static int compare_of(struct device *dev, void *data) return dev->of_node == np; } +static void rockchip_add_endpoints(struct device *dev, + struct component_match **match, + struct device_node *port) +{ + struct device_node *ep, *remote; + + for_each_child_of_node(port, ep) { + remote = of_graph_get_remote_port_parent(ep); + if (!remote || !of_device_is_available(remote)) { + of_node_put(remote); + continue; + } else if (!of_device_is_available(remote->parent)) { + dev_warn(dev, "parent device of %s is not available\n", + remote->full_name); + of_node_put(remote); + continue; + } + + component_match_add(dev, match, compare_of, remote); + of_node_put(remote); + } +} + static int rockchip_drm_bind(struct device *dev) { struct drm_device *drm; @@ -461,14 +483,61 @@ static const struct component_master_ops rockchip_drm_ops = { static int rockchip_drm_platform_probe(struct platform_device *pdev) { - int ret = drm_of_component_probe(&pdev->dev, compare_of, - &rockchip_drm_ops); + struct device *dev = &pdev->dev; + struct component_match *match = NULL; + struct device_node *np = dev->of_node; + struct device_node *port; + int i; - /* keep compatibility with old code that was returning -ENODEV */ - if (ret == -EINVAL) + if (!np) return -ENODEV; + /* + * Bind the crtc ports first, so that + * drm_of_find_possible_crtcs called from encoder .bind callbacks + * works as expected. + */ + for (i = 0;; i++) { + port = of_parse_phandle(np, "ports", i); + if (!port) + break; + + if (!of_device_is_available(port->parent)) { + of_node_put(port); + continue; + } - return ret; + component_match_add(dev, &match, compare_of, port->parent); + of_node_put(port); + } + + if (i == 0) { + dev_err(dev, "missing 'ports' property\n"); + return -ENODEV; + } + + if (!match) { + dev_err(dev, "No available vop found for display-subsystem.\n"); + return -ENODEV; + } + /* + * For each bound crtc, bind the encoders attached to its + * remote endpoint. + */ + for (i = 0;; i++) { + port = of_parse_phandle(np, "ports", i); + if (!port) + break; + + if (!of_device_is_available(port->parent)) { + of_node_put(port); + continue; + } + + rockchip_add_endpoints(dev, &match, port); + of_node_put(port); + } + + return component_master_add_with_match(dev, &rockchip_drm_ops, match); } static int rockchip_drm_platform_remove(struct platform_device *pdev) -- 1.7.9.5

3 2

[git pull] drm fixes
by Dave Airlie 11 Nov '15

11 Nov '15

Hi Linus, Two build fixes, one for VC4, one for nouveau where the ARM only code is doing something a bit strange. While people are discussing that, just workaround it and fix the build for now. The code in question will never get used on anything non-ARM anyways. Also one fix for AST that SuSE had been hiding in their kernel, that allows all fbdev apps to work on that driver. Dave. The following changes since commit 816d2206f0f9953ca854e4ff1a2749a5cbd62715: Merge tag 'drm-intel-next-fixes-2015-11-06' of git://anongit.freedesktop.org/drm-intel into drm-next (2015-11-07 17:16:59 +1000) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes for you to fetch changes up to 10855aeb1e78533c041065b33e34315e1f381c2e: drm/nouveau: fix build failures on all non ARM. (2015-11-11 12:37:57 +1000) ---------------------------------------------------------------- Dave Airlie (1): drm/nouveau: fix build failures on all non ARM. Egbert Eich (1): drm/ast: Initialized data needed to map fbdev memory Guenter Roeck (1): drm/vc4: Add dependency on HAVE_DMA_ATTRS, and select DRM_GEM_CMA_HELPER drivers/gpu/drm/ast/ast_drv.h | 1 + drivers/gpu/drm/ast/ast_fb.c | 7 +++++++ drivers/gpu/drm/ast/ast_main.c | 1 + drivers/gpu/drm/ast/ast_mode.c | 2 ++ drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c | 6 ++++++ drivers/gpu/drm/vc4/Kconfig | 3 ++- 6 files changed, 19 insertions(+), 1 deletion(-)

1 0

[PATCH 00/13] drm/exynos: async G2D and g2d_move()
by Tobias Jakobi 11 Nov '15

11 Nov '15

Hello, this series mostly touches G2D code. It introduces the following: (1) drmHandleEvent2() is added to enable processing of vendor-specific events. This will be used to expose asynchronous operation of the G2D. The necessary kernel infrastructure is already there since a lot of kernel versions. [This touches libdrm core code!] (2) The necessary infrastructure to handle G2D events. This includes adding g2d_config_event() and g2d_exec2() to the public API. A test application is provided to ensure that everything works as expected. (3) A small performance test application which can be used to measure the speed of solid color clear operations. Interesting for benchmarking and plotting colorful graphs (e.g. through Mathematica). (4) g2d_move() which works similar to g2d_copy() but like the C memmove() properly handles overlapping buffer copies. Again a test application is present to check that this indeed does what it should. (5) Various small changes. A framebuffer colorformat fix for the general G2D test application. Moving the currently unused g2d_reset() to the public API. Adding a counterpart to exynos_bo_map() to unmap buffers again. (6) Last but not least a small bump of the Exynos version number. Please review and let me know what I should change/improve. With best wishes, Tobias P.S.: Most patches were submitted already some time ago but never made it upstream. So if something looks familiar, don't worry! ;) Tobias Jakobi (13): drm: Implement drmHandleEvent2() exynos: Introduce exynos_handle_event() tests/exynos: add fimg2d performance analysis exynos/fimg2d: add g2d_config_event exynos: fimg2d: add g2d_exec2 tests/exynos: add fimg2d event test tests/exynos: use XRGB8888 for framebuffer exynos: fimg2d: add g2d_set_direction exynos/fimg2d: add g2d_move tests/exynos: add test for g2d_move exynos/fimg2d: add exynos_bo_unmap() exynos/fimg2d: add g2d_reset() to public API exynos: bump version number exynos/exynos-symbol-check | 5 + exynos/exynos_drm.c | 48 ++++++ exynos/exynos_drm.h | 12 ++ exynos/exynos_drmif.h | 27 +++ exynos/exynos_fimg2d.c | 164 +++++++++++++++++-- exynos/exynos_fimg2d.h | 49 ++++++ exynos/libdrm_exynos.pc.in | 2 +- tests/exynos/Makefile.am | 26 ++- tests/exynos/exynos_fimg2d_event.c | 326 +++++++++++++++++++++++++++++++++++++ tests/exynos/exynos_fimg2d_perf.c | 320 ++++++++++++++++++++++++++++++++++++ tests/exynos/exynos_fimg2d_test.c | 134 ++++++++++++++- xf86drm.h | 21 +++ xf86drmMode.c | 10 +- 13 files changed, 1128 insertions(+), 16 deletions(-) create mode 100644 tests/exynos/exynos_fimg2d_event.c create mode 100644 tests/exynos/exynos_fimg2d_perf.c -- 2.0.5

3 43

[PATCH v4] tests/exynos: add fimg2d performance analysis
by Tobias Jakobi 11 Nov '15

11 Nov '15

Currently only fast solid color clear performance is measured. A large buffer is allocated and solid color clear operations are executed on it with randomly chosen properties (position and size of the region, clear color). Execution time is measured and output together with the amount of pixels processed. The 'simple' variant only executes one G2D command buffer at a time, while the 'multi' variant executes multiple ones. This can be used to measure setup/exec overhead. The test also serves a stability check. If clocks/voltages are too high or low respectively, the test quickly reveals this. v2: Add GPLv2 header, argument handling and documentation. Tool is only installed when requested. v3: Free images array in fimg2d_perf_multi() as pointed out by Hyungwon Hwang. v4: Include header for error numbers (fixes build). Signed-off-by: Tobias Jakobi <tjakobi(a)math.uni-bielefeld.de> --- tests/exynos/Makefile.am | 19 ++- tests/exynos/exynos_fimg2d_perf.c | 327 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 344 insertions(+), 2 deletions(-) create mode 100644 tests/exynos/exynos_fimg2d_perf.c diff --git a/tests/exynos/Makefile.am b/tests/exynos/Makefile.am index b21d016..e82d199 100644 --- a/tests/exynos/Makefile.am +++ b/tests/exynos/Makefile.am @@ -5,16 +5,31 @@ AM_CFLAGS = \ -I $(top_srcdir)/exynos \ -I $(top_srcdir) +bin_PROGRAMS = +noinst_PROGRAMS = + if HAVE_LIBKMS if HAVE_INSTALL_TESTS -bin_PROGRAMS = \ +bin_PROGRAMS += \ exynos_fimg2d_test else -noinst_PROGRAMS = \ +noinst_PROGRAMS += \ exynos_fimg2d_test endif endif +if HAVE_INSTALL_TESTS +bin_PROGRAMS += \ + exynos_fimg2d_perf +else +noinst_PROGRAMS += \ + exynos_fimg2d_perf +endif + +exynos_fimg2d_perf_LDADD = \ + $(top_builddir)/libdrm.la \ + $(top_builddir)/exynos/libdrm_exynos.la + exynos_fimg2d_test_LDADD = \ $(top_builddir)/libdrm.la \ $(top_builddir)/libkms/libkms.la \ diff --git a/tests/exynos/exynos_fimg2d_perf.c b/tests/exynos/exynos_fimg2d_perf.c new file mode 100644 index 0000000..1699bba --- /dev/null +++ b/tests/exynos/exynos_fimg2d_perf.c @@ -0,0 +1,327 @@ +/* + * Copyright (C) 2015 - Tobias Jakobi + * + * This is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 2 of the License, + * or (at your option) any later version. + * + * It is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with it. If not, see <http://www.gnu.org/licenses/>. + */ + +#include <stdlib.h> +#include <stdio.h> +#include <time.h> +#include <getopt.h> +#include <errno.h> + +#include <xf86drm.h> + +#include "exynos_drm.h" +#include "exynos_drmif.h" +#include "exynos_fimg2d.h" + +static int output_mathematica = 0; + +static int fimg2d_perf_simple(struct exynos_bo *bo, struct g2d_context *ctx, + unsigned buf_width, unsigned buf_height, unsigned iterations) +{ + struct timespec tspec = { 0 }; + struct g2d_image img = { 0 }; + + unsigned long long g2d_time; + unsigned i; + int ret = 0; + + img.width = buf_width; + img.height = buf_height; + img.stride = buf_width * 4; + img.color_mode = G2D_COLOR_FMT_ARGB8888 | G2D_ORDER_AXRGB; + img.buf_type = G2D_IMGBUF_GEM; + img.bo[0] = bo->handle; + + srand(time(NULL)); + + printf("starting simple G2D performance test\n"); + printf("buffer width = %u, buffer height = %u, iterations = %u\n", + buf_width, buf_height, iterations); + + if (output_mathematica) + putchar('{'); + + for (i = 0; i < iterations; ++i) { + unsigned x, y, w, h; + + x = rand() % buf_width; + y = rand() % buf_height; + + if (x == (buf_width - 1)) + x -= 1; + if (y == (buf_height - 1)) + y -= 1; + + w = rand() % (buf_width - x); + h = rand() % (buf_height - y); + + if (w == 0) w = 1; + if (h == 0) h = 1; + + img.color = rand(); + + ret = g2d_solid_fill(ctx, &img, x, y, w, h); + + clock_gettime(CLOCK_MONOTONIC, &tspec); + + if (ret == 0) + ret = g2d_exec(ctx); + + if (ret != 0) { + fprintf(stderr, "error: iteration %u failed (x = %u, y = %u, w = %u, h = %u)\n", + i, x, y, w, h); + break; + } else { + struct timespec end = { 0 }; + clock_gettime(CLOCK_MONOTONIC, &end); + + g2d_time = (end.tv_sec - tspec.tv_sec) * 1000000000ULL; + g2d_time += (end.tv_nsec - tspec.tv_nsec); + + if (output_mathematica) { + if (i != 0) putchar(','); + printf("{%u,%llu}", w * h, g2d_time); + } else { + printf("num_pixels = %u, usecs = %llu\n", w * h, g2d_time); + } + } + } + + if (output_mathematica) + printf("}\n"); + + return ret; +} + +static int fimg2d_perf_multi(struct exynos_bo *bo, struct g2d_context *ctx, + unsigned buf_width, unsigned buf_height, unsigned iterations, unsigned batch) +{ + struct timespec tspec = { 0 }; + struct g2d_image *images; + + unsigned long long g2d_time; + unsigned i, j; + int ret = 0; + + images = calloc(batch, sizeof(struct g2d_image)); + if (images == NULL) { + fprintf(stderr, "error: failed to allocate G2D images.\n"); + return -ENOMEM; + } + + for (i = 0; i < batch; ++i) { + images[i].width = buf_width; + images[i].height = buf_height; + images[i].stride = buf_width * 4; + images[i].color_mode = G2D_COLOR_FMT_ARGB8888 | G2D_ORDER_AXRGB; + images[i].buf_type = G2D_IMGBUF_GEM; + images[i].bo[0] = bo->handle; + } + + srand(time(NULL)); + + printf("starting multi G2D performance test (batch size = %u)\n", batch); + printf("buffer width = %u, buffer height = %u, iterations = %u\n", + buf_width, buf_height, iterations); + + if (output_mathematica) + putchar('{'); + + for (i = 0; i < iterations; ++i) { + unsigned num_pixels = 0; + + for (j = 0; j < batch; ++j) { + unsigned x, y, w, h; + + x = rand() % buf_width; + y = rand() % buf_height; + + if (x == (buf_width - 1)) + x -= 1; + if (y == (buf_height - 1)) + y -= 1; + + w = rand() % (buf_width - x); + h = rand() % (buf_height - y); + + if (w == 0) w = 1; + if (h == 0) h = 1; + + images[j].color = rand(); + + num_pixels += w * h; + + ret = g2d_solid_fill(ctx, &images[j], x, y, w, h); + if (ret != 0) + break; + } + + clock_gettime(CLOCK_MONOTONIC, &tspec); + + if (ret == 0) + ret = g2d_exec(ctx); + + if (ret != 0) { + fprintf(stderr, "error: iteration %u failed (num_pixels = %u)\n", i, num_pixels); + break; + } else { + struct timespec end = { 0 }; + clock_gettime(CLOCK_MONOTONIC, &end); + + g2d_time = (end.tv_sec - tspec.tv_sec) * 1000000000ULL; + g2d_time += (end.tv_nsec - tspec.tv_nsec); + + if (output_mathematica) { + if (i != 0) putchar(','); + printf("{%u,%llu}", num_pixels, g2d_time); + } else { + printf("num_pixels = %u, usecs = %llu\n", num_pixels, g2d_time); + } + } + } + + if (output_mathematica) + printf("}\n"); + + free(images); + + return ret; +} + +static void usage(const char *name) +{ + fprintf(stderr, "usage: %s [-ibwh]\n\n", name); + + fprintf(stderr, "\t-i <number of iterations>\n"); + fprintf(stderr, "\t-b <size of a batch> (default = 3)\n\n"); + + fprintf(stderr, "\t-w <buffer width> (default = 4096)\n"); + fprintf(stderr, "\t-h <buffer height> (default = 4096)\n\n"); + + fprintf(stderr, "\t-M <enable Mathematica styled output>\n"); + + exit(0); +} + +int main(int argc, char **argv) +{ + int fd, ret, c, parsefail; + + struct exynos_device *dev; + struct g2d_context *ctx; + struct exynos_bo *bo; + + unsigned int iters = 0, batch = 3; + unsigned int bufw = 4096, bufh = 4096; + + ret = 0; + parsefail = 0; + + while ((c = getopt(argc, argv, "i:b:w:h:M")) != -1) { + switch (c) { + case 'i': + if (sscanf(optarg, "%u", &iters) != 1) + parsefail = 1; + break; + case 'b': + if (sscanf(optarg, "%u", &batch) != 1) + parsefail = 1; + break; + case 'w': + if (sscanf(optarg, "%u", &bufw) != 1) + parsefail = 1; + break; + case 'h': + if (sscanf(optarg, "%u", &bufh) != 1) + parsefail = 1; + break; + case 'M': + output_mathematica = 1; + break; + default: + parsefail = 1; + break; + } + } + + if (parsefail || (argc == 1) || (iters == 0)) + usage(argv[0]); + + if (bufw < 2 || bufw > 4096 || bufh < 2 || bufh > 4096) { + fprintf(stderr, "error: buffer width/height should be in the range 2 to 4096.\n"); + ret = -1; + + goto out; + } + + if (bufw == 0 || bufh == 0) { + fprintf(stderr, "error: buffer width/height should be non-zero.\n"); + ret = -1; + + goto out; + } + + fd = drmOpen("exynos", NULL); + if (fd < 0) { + fprintf(stderr, "error: failed to open drm\n"); + ret = -1; + + goto out; + } + + dev = exynos_device_create(fd); + if (dev == NULL) { + fprintf(stderr, "error: failed to create device\n"); + ret = -2; + + goto fail; + } + + ctx = g2d_init(fd); + if (ctx == NULL) { + fprintf(stderr, "error: failed to init G2D\n"); + ret = -3; + + goto g2d_fail; + } + + bo = exynos_bo_create(dev, bufw * bufh * 4, 0); + if (bo == NULL) { + fprintf(stderr, "error: failed to create bo\n"); + ret = -4; + + goto bo_fail; + } + + ret = fimg2d_perf_simple(bo, ctx, bufw, bufh, iters); + + if (ret == 0) + ret = fimg2d_perf_multi(bo, ctx, bufw, bufh, iters, batch); + + exynos_bo_destroy(bo); + +bo_fail: + g2d_fini(ctx); + +g2d_fail: + exynos_device_destroy(dev); + +fail: + drmClose(fd); + +out: + return ret; +} -- 2.4.9

2 5

[PATCH] drm/rockchip: vop: fix window origin calculation
by Mark Yao 11 Nov '15

11 Nov '15

From: Dominik Behr <dbehr(a)chromium.org> VOP_WINx_DSP_ST does not require subtracting 1 from the values written to it. It actually causes the screen to be shifted by one pixel. Signed-off-by: Mark Yao <mark.yao(a)rock-chips.com> --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 48719df..4730ae4 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -959,8 +959,8 @@ static int vop_update_plane_event(struct drm_plane *plane, val = (dest.y2 - dest.y1 - 1) << 16; val |= (dest.x2 - dest.x1 - 1) & 0xffff; VOP_WIN_SET(vop, win, dsp_info, val); - val = (dsp_sty - 1) << 16; - val |= (dsp_stx - 1) & 0xffff; + val = dsp_sty << 16; + val |= dsp_stx & 0xffff; VOP_WIN_SET(vop, win, dsp_st, val); VOP_WIN_SET(vop, win, rb_swap, rb_swap); -- 1.7.9.5

4 4

[PATCH] drm/amdgpu: fix seq_printf format string
by Arnd Bergmann 10 Nov '15

10 Nov '15

The amdgpu driver has a debugfs interface that shows the amount of VRAM in use, but the newly added code causes a build error on all 32-bit architectures: drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:1076:17: warning: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'long long int' [-Wformat=] This fixes the format string to use "%llu" for printing 64-bit numbers, which works everywhere, as long as we also cast to 'u64'. Unlike atomic64_t, u64 is defined as 'unsigned long long' on all architectures. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Fixes: a2ef8a974931 ("drm/amdgpu: add vram usage into debugfs") --- This appeared a few weeks ago with ARM allmodconfig. I was waiting for someone to complain about the warning on x86 first, but that apparently has not happened. diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 81bb8e9fc26d..d4bac5f49939 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -1073,10 +1073,10 @@ static int amdgpu_mm_dump_table(struct seq_file *m, void *data) ret = drm_mm_dump_table(m, mm); spin_unlock(&glob->lru_lock); if (ttm_pl == TTM_PL_VRAM) - seq_printf(m, "man size:%llu pages, ram usage:%luMB, vis usage:%luMB\n", + seq_printf(m, "man size:%llu pages, ram usage:%lluMB, vis usage:%lluMB\n", adev->mman.bdev.man[ttm_pl].size, - atomic64_read(&adev->vram_usage) >> 20, - atomic64_read(&adev->vram_vis_usage) >> 20); + (u64)atomic64_read(&adev->vram_usage) >> 20, + (u64)atomic64_read(&adev->vram_vis_usage) >> 20); return ret; }

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel November 2015