dri-devel April 2016

dri-devel@lists.freedesktop.org

197 participants
1285 discussions

[PATCH] drm/rockchip: Return -EBUSY if there's already a pending flip event v2
by Tomeu Vizoso 01 Apr '16

01 Apr '16

As per the docs, atomic_commit should return -EBUSY "if an asycnhronous updated is requested and there is an earlier updated pending". v2: Use the status of the workqueue instead of vop->event, and don't add a superfluous wait on the workqueue. Signed-off-by: Tomeu Vizoso <tomeu.vizoso(a)collabora.com> --- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c index 3b8f652698f8..285f8cd5afe1 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -282,6 +282,9 @@ int rockchip_drm_atomic_commit(struct drm_device *dev, struct rockchip_atomic_commit *commit = &private->commit; int ret; + if (async && work_busy(&commit->work)) + return -EBUSY; + ret = drm_atomic_helper_prepare_planes(dev, state); if (ret) return ret; -- 2.5.5

2 3

[patch] drm/nouveau/gem: silence uninitialized variable warning
by Dan Carpenter 01 Apr '16

01 Apr '16

The static checker checker is warning that we could hit the first continue; on every iteration through the loop and never initialize "ret". It seems unlikely but we may as well silence the warning. Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/drivers/gpu/drm/nouveau/nouveau_gem.c b/drivers/gpu/drm/nouveau/nouveau_gem.c index a0865c4..fd36b24 100644 --- a/drivers/gpu/drm/nouveau/nouveau_gem.c +++ b/drivers/gpu/drm/nouveau/nouveau_gem.c @@ -370,7 +370,8 @@ validate_init(struct nouveau_channel *chan, struct drm_file *file_priv, struct nouveau_cli *cli = nouveau_cli(file_priv); struct drm_device *dev = chan->drm->dev; int trycnt = 0; - int ret, i; + int ret = -ENOENT; + int i; struct nouveau_bo *res_bo = NULL; LIST_HEAD(gart_list); LIST_HEAD(vram_list);

1 0

[Powerpc] Sam460ex Canyonlands issue -Kernel 4.4.6-rc1
by Julian Margetson 01 Apr '16

01 Apr '16

Hi Seeing the following when booting kernel 4.6-rc1 on Acube Sam460ex Canyonlands board. This loops for a few times then the kernel boots. No problem with the 4.6-rc1 with an A-eon Tabor Freescale e500v2 board. Regards Julian [ 2.197839] ------------[ cut here ]------------ [ 2.197850] WARNING: CPU: 0 PID: 1 at drivers/gpu/drm/drm_irq.c:1368 drm_vblank_off+0x2c/0x1e0 [ 2.197853] Modules linked in: [ 2.197859] CPU: 0 PID: 1 Comm: swapper Tainted: G W 4.6.0-rc1-sam460ex-jm #23 [ 2.197863] task: ea850000 ti: ea846000 task.ti: ea846000 [ 2.197866] NIP: c03c057c LR: c03ec780 CTR: c03eec50 [ 2.197870] REGS: ea847860 TRAP: 0700 Tainted: G W (4.6.0-rc1-sam460ex-jm) [ 2.197880] MSR: 00029000 <CE,EE,ME> CR: 42ec8282 XER: 20000000 [ 2.197932] [ 2.197932] GPR00: c03ec780 ea847910 ea850000 ea935000 00000003 000000ff eab704ec ea8be000 [ 2.197932] GPR08: 00000006 00000000 00000001 ea8479d0 22ec8282 00000000 ea935278 eeaaee00 [ 2.197932] GPR16: ea8bf000 c08aeaa4 eaad5800 eab48900 c0cf0000 ea935290 eaad5800 eab48900 [ 2.197932] GPR24: ea8bf000 c08a2c3c 00000000 c0bbc22a 00000000 ea935000 eab70000 eab2f18c [ 2.197937] NIP [c03c057c] drm_vblank_off+0x2c/0x1e0 [ 2.197945] LR [c03ec780] atombios_crtc_dpms+0x90/0xf0 [ 2.197946] Call Trace: [ 2.197956] [ea847910] [c08aeaa4] atombios_helper_funcs+0x0/0x218 (unreliable) [ 2.197963] [ea847960] [c03ec780] atombios_crtc_dpms+0x90/0xf0 [ 2.197970] [ea847980] [c03eec74] atombios_crtc_disable+0x24/0x2a4 [ 2.197977] [ea8479d0] [c03abb8c] __drm_helper_disable_unused_functions+0x9c/0xd0 [ 2.197984] [ea8479f0] [c03ac954] drm_crtc_helper_set_config+0x680/0x934 [ 2.197993] [ea847a60] [c04062f4] radeon_crtc_set_config+0x30/0xb8 [ 2.197999] [ea847a70] [c03c8b28] drm_mode_set_config_internal+0x5c/0xe0 [ 2.198008] [ea847a90] [c03b7218] restore_fbdev_mode+0x20c/0x25c [ 2.198016] [ea847ac0] [c03b8e24] drm_fb_helper_restore_fbdev_mode_unlocked+0x40/0x8c [ 2.198024] [ea847ae0] [c03b8ebc] drm_fb_helper_set_par+0x4c/0x60 [ 2.198031] [ea847af0] [c036ba34] fbcon_init+0x318/0x410 [ 2.198039] [ea847b40] [c0395eb0] visual_init+0xc8/0x114 [ 2.198046] [ea847b60] [c0397628] do_bind_con_driver+0x1e0/0x2e0 [ 2.198053] [ea847bb0] [c0397aa8] do_take_over_console+0x1a0/0x1b0 [ 2.198059] [ea847be0] [c036bbac] do_fbcon_takeover+0x80/0xd8 [ 2.198068] [ea847bf0] [c003f474] notifier_call_chain+0x60/0x94 [ 2.198076] [ea847c10] [c003f758] __blocking_notifier_call_chain+0x50/0x68 [ 2.198085] [ea847c30] [c0372fb0] register_framebuffer+0x250/0x280 [ 2.198092] [ea847ca0] [c03b91f0] drm_fb_helper_initial_config+0x320/0x394 [ 2.198100] [ea847ce0] [c040e3d0] radeon_fbdev_init+0xdc/0x114 [ 2.198107] [ea847d00] [c04085fc] radeon_modeset_init+0x5a8/0x938 [ 2.198113] [ea847d60] [c03e5ebc] radeon_driver_load_kms+0xcc/0x134 [ 2.198120] [ea847d80] [c03c1a5c] drm_dev_register+0x84/0xc8 [ 2.198127] [ea847da0] [c03c3b54] drm_get_pci_dev+0xf4/0x18c [ 2.198136] [ea847dc0] [c0357f44] pci_device_probe+0x78/0xcc [ 2.198143] [ea847de0] [c04ce61c] driver_probe_device+0x124/0x264 [ 2.198149] [ea847e00] [c04ce7e4] __driver_attach+0x88/0xb0 [ 2.198159] [ea847e20] [c04ccbc4] bus_for_each_dev+0x90/0xa0 [ 2.198165] [ea847e50] [c04cdc64] bus_add_driver+0xe0/0x1f0 [ 2.198172] [ea847e70] [c04ceee0] driver_register+0xb4/0xf8 [ 2.198179] [ea847e90] [c00015f8] do_one_initcall+0x11c/0x1a0 [ 2.198187] [ea847f00] [c0c5fa9c] kernel_init_freeable+0x130/0x1cc [ 2.198193] [ea847f30] [c0001bf4] kernel_init+0x14/0x108 [ 2.198201] [ea847f40] [c000b1d4] ret_from_kernel_thread+0x5c/0x64 [ 2.198204] --- interrupt: 0 at (null) [ 2.198204] LR = (null) [ 2.198207] Instruction dump: [ 2.198221] 4bfffdf0 9421ffb0 1d240084 7c0802a6 be61001c 90010054 83e3010c 7fff4a14 [ 2.198235] 81230160 7d492010 7d4a5110 394a0001 <0f0a0000> 7f844840 409c01a4 3ae3013c [ 2.198237] ---[ end trace ee501c2ec7a725ac ]---

2 8

[GIT PULL] imx-drm: plane parameter checking, dw_hdmi-imx and dmfc fixes
by Philipp Zabel 01 Apr '16

01 Apr '16

Hi Dave, here are some updates and fixes for the imx-drm plane setup and dw_hdmi-imx binding. The unimplemented gamma support is no longer advertised and plane parameters are checked for hardware constraints. YUV 4:2:0 support and the display FIFO setup are fixed. best regards Philipp The following changes since commit f55532a0c0b8bb6148f4e07853b876ef73bc69ca: Linux 4.6-rc1 (2016-03-26 16:03:24 -0700) are available in the git repository at: git://git.pengutronix.de/git/pza/linux.git tags/imx-drm-next-2016-04-01 for you to fetch changes up to e51f17a049d102a3bc9af3e43f2f45b0538da871: drm/imx: Don't set a gamma table size (2016-03-31 11:24:37 +0200) ---------------------------------------------------------------- imx-drm: stricter plane parameter checking, dw_hdmi-imx and dmfc fixes - Check whether plane parameters comply with IPU IDMAC limitations and fix planar YUV 4:2:0 U/V offsets and stride - Cleanup encoder in dw_hdmi-imx bind error path and remove a superfluous platform_set_drvdata in dw_hdmi-imx - DMFC setup fixes: lock the ipu_dmfc_init_channel function against concurrent use, rename it to ipu_dmfc_config_wait4eot, and call it after the FIFO size has been determined. ---------------------------------------------------------------- Daniel Vetter (1): drm/imx: Don't set a gamma table size Douglas Anderson (2): drm/imx: dw_hdmi: Call drm_encoder_cleanup() in error path drm/imx: dw_hdmi: Don't call platform_set_drvdata() Liu Ying (4): gpu: ipu-v3: ipu-dmfc: Protect function ipu_dmfc_init_channel() with mutex gpu: ipu-v3: ipu-dmfc: Make function ipu_dmfc_init_channel() return void gpu: ipu-v3: ipu-dmfc: Rename ipu_dmfc_init_channel to ipu_dmfc_config_wait4eot drm/imx: ipuv3-plane: Configure DMFC wait4eot bit after slots are determined Philipp Zabel (3): gpu: ipu-cpmem: modify ipu_cpmem_set_yuv_planar_full for better control drm/imx: ipuv3-plane: Add more thorough checks for plane parameter limitations drm/imx: ipuv3-plane: fix planar YUV 4:2:0 support drivers/gpu/drm/imx/dw_hdmi-imx.c | 13 +++- drivers/gpu/drm/imx/imx-drm-core.c | 10 --- drivers/gpu/drm/imx/ipuv3-plane.c | 123 +++++++++++++++++++++++++++++++------ drivers/gpu/drm/imx/ipuv3-plane.h | 4 ++ drivers/gpu/ipu-v3/ipu-cpmem.c | 79 +++++++++++------------- drivers/gpu/ipu-v3/ipu-dmfc.c | 8 ++- include/video/imx-ipu-v3.h | 7 ++- 7 files changed, 164 insertions(+), 80 deletions(-)

1 0

[git pull] drm fixes
by Dave Airlie 01 Apr '16

01 Apr '16

Hi Linus, Nothing too crazy in here, a bunch of AMD fixes/quirks, two msm, some rockchip fixes, and a udl warning fix, along with one locking fix for displayport that seems to fix some dodgy monitors. Thanks, Dave. The following changes since commit c05c2ec96bb8b7310da1055c7b9d786a3ec6dc0c: Merge branch 'parisc-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux (2016-03-31 07:55:14 -0500) are available in the git repository at: git://people.freedesktop.org/~airlied/linux drm-fixes for you to fetch changes up to 72b9ff0612ad8fc969b910cd00ac16b57a1a9ba4: drm/udl: Use unlocked gem unreferencing (2016-04-01 13:22:33 +1000) ---------------------------------------------------------------- Alex Deucher (3): drm/radeon: add a dpm quirk for sapphire Dual-X R7 370 2G D5 drm/radeon: add another R7 370 quirk drm/radeon: add a dpm quirk for all R7 370 parts Borislav Petkov (1): drm/amd: Beef up ACP Kconfig menu text Daniel Vetter (1): drm/udl: Use unlocked gem unreferencing Dave Airlie (3): Merge branch 'drm-next-4.6' of git://people.freedesktop.org/~agd5f/linux into drm-fixes Merge branch 'msm-fixes-4.6-rc1' of git://people.freedesktop.org/~robclark/linux into drm-fixes Merge branch 'drm-rockchip-next-fixes-2016-03-28' of https://github.com/markyzq/kernel-drm-rockchip into drm-fixes Douglas Anderson (3): drm/rockchip: dw_hdmi: Call drm_encoder_cleanup() in error path drm/rockchip: vop: Fix vop crtc cleanup drm/rockchip: dw_hdmi: Don't call platform_set_drvdata() John Keeping (2): drm/rockchip: vop: fix crtc size in plane check drm/rockchip: cancel pending vblanks on close Michel Dänzer (2): drm/radeon: Don't move pinned BOs drm/amdgpu: Don't move pinned BOs Rob Clark (3): drm/msm: fix bug after preclose removal drm/msm: fix typo in the !COMMON_CLK case drm/dp: move hw_mutex up the call stack Tomeu Vizoso (2): drm/rockchip: vop: Don't reject empty modesets drm/rockchip: vop: Disable planes when disabling CRTC drivers/gpu/drm/amd/acp/Kconfig | 8 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 ++ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 +++ drivers/gpu/drm/drm_dp_helper.c | 27 ++++++---- drivers/gpu/drm/msm/hdmi/hdmi.h | 2 +- drivers/gpu/drm/msm/msm_drv.c | 3 -- drivers/gpu/drm/msm/msm_kms.h | 1 - drivers/gpu/drm/radeon/radeon_object.c | 4 ++ drivers/gpu/drm/radeon/radeon_ttm.c | 6 +++ drivers/gpu/drm/radeon/si_dpm.c | 6 +++ drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 13 +++-- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 22 ++++++++ drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 79 ++++++++++++++++++++++++----- drivers/gpu/drm/udl/udl_fb.c | 2 +- drivers/gpu/drm/udl/udl_gem.c | 2 +- 16 files changed, 152 insertions(+), 34 deletions(-)

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