dri-devel May 2015

dri-devel@lists.freedesktop.org

191 participants
1132 discussions

[PATCH] drm: remove unused function 'drm_property_unreference_blob_locked'
by Arnd Bergmann 20 May '15

20 May '15

This function was added recently but never used, and causes a compile warning: drivers/gpu/drm/drm_crtc.c:4324:13: warning: 'drm_property_unreference_blob_locked' defined but not used [-Wunused-function] Removing that function avoids the warning. It can simply be put back in case it is needed in the future. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> Fixes: 6bcacf51d05 ("drm: Add reference counting to blob properties") --- The broken patch is currently in git://anongit.freedesktop.org/drm-intel#topic/drm-misc diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 4059f065c854..6e60f71bbf46 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -4313,25 +4313,6 @@ void drm_property_unreference_blob(struct drm_property_blob *blob) EXPORT_SYMBOL(drm_property_unreference_blob); /** - * drm_property_unreference_blob_locked - Unreference a blob property with blob_lock held - * - * Drop a reference on a blob property. May free the object. This must be - * called with blob_lock held. - * - * @param dev Device the blob was created on - * @param blob Pointer to blob property - */ -static void drm_property_unreference_blob_locked(struct drm_property_blob *blob) -{ - if (!blob) - return; - - DRM_DEBUG("%p: blob ID: %d (%d)\n", blob, blob->base.id, atomic_read(&blob->refcount.refcount)); - - kref_put(&blob->refcount, drm_property_free_blob); -} - -/** * drm_property_reference_blob - Take a reference on an existing property * * Take a new reference on an existing blob property.

2 1

Re: drm/exynos: Add atomic modesetting support
by Tobias Jakobi 19 May '15

19 May '15

Hello, I did another run with drm.debug=0xff and also tried to figure out where the div-by-zero comes from. The only division I see is in fimd_calc_clkdiv() (which is called by fimd_commit()). So it looks like 'ideal_clk' is zero when calling DIV_ROUND_UP(). 'htotal' and 'vtotal' can't be zero, since this is checked early in fimd_commit(). So 'vrefresh' has to be zero. Maybe this helps? With best wishes, Tobias kernel log: [ 178.351424] [drm:drm_stub_open] [ 178.351443] [drm:drm_open_helper] pid = 2645, minor = 0 [ 178.351457] [drm:ipp_subdrv_open] done priv[0xed9b6410] [ 178.351469] [drm:drm_setup] [ 178.351501] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_VERSION [ 178.351515] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_VERSION [ 178.351544] [drm:drm_release] open_count = 1 [ 178.351559] [drm:drm_release] pid = 2645, device = 0xe200, open_count = 1 [ 178.351575] [drm:drm_lastclose] [ 178.351667] [drm:drm_atomic_state_alloc] Allocate atomic state ec0567c0 [ 178.351685] [drm:drm_atomic_get_crtc_state] Added [CRTC:21] ed0e2e00 state to ec0567c0 [ 178.351697] [drm:drm_atomic_get_plane_state] Added [PLANE:17] ec056c80 state to ec0567c0 [ 178.351706] [drm:drm_atomic_set_crtc_for_plane] Link plane state ec056c80 to [NOCRTC] [ 178.351714] [drm:drm_atomic_set_fb_for_plane] Set [NOFB] for plane state ec056c80 [ 178.351724] [drm:drm_atomic_add_affected_connectors] Adding all current connectors for [CRTC:21] to ec0567c0 [ 178.351734] [drm:drm_atomic_check_only] checking ec0567c0 [ 178.351749] [drm:drm_atomic_commit] commiting ec0567c0 [ 178.351764] [drm:drm_atomic_state_clear] Clearing atomic state ec0567c0 [ 178.351778] [drm:drm_atomic_state_free] Freeing atomic state ec0567c0 [ 178.351794] [drm:drm_atomic_state_alloc] Allocate atomic state ec0567c0 [ 178.351806] [drm:drm_atomic_get_crtc_state] Added [CRTC:29] ed0e2a00 state to ec0567c0 [ 178.351817] [drm:drm_atomic_get_plane_state] Added [PLANE:24] ec056d00 state to ec0567c0 [ 178.351826] [drm:drm_atomic_set_crtc_for_plane] Link plane state ec056d00 to [CRTC:29] [ 178.351835] [drm:drm_framebuffer_reference] ee266c00: FB ID: 40 (1) [ 178.351842] [drm:drm_atomic_set_fb_for_plane] Set [FB:40] for plane state ec056d00 [ 178.351854] [drm:drm_atomic_get_connector_state] Added [CONNECTOR:31] ec0560c0 state to ec0567c0 [ 178.351871] [drm:drm_atomic_add_affected_connectors] Adding all current connectors for [CRTC:29] to ec0567c0 [ 178.351886] [drm:drm_atomic_set_crtc_for_connector] Link connector state ec0560c0 to [CRTC:29] [ 178.351899] [drm:drm_atomic_check_only] checking ec0567c0 [ 178.351915] [drm:drm_atomic_helper_check_modeset] [CRTC:29] mode changed [ 178.351928] [drm:drm_atomic_helper_check_modeset] [CRTC:29] enable changed [ 178.351942] [drm:update_connector_routing] Updating routing for [CONNECTOR:31:VGA-1] [ 178.351959] [drm:update_connector_routing] [CONNECTOR:31:VGA-1] using [ENCODER:30:TMDS-30] on [CRTC:29] [ 178.351973] [drm:drm_atomic_helper_check_modeset] [CRTC:29] active changed [ 178.351990] [drm:drm_atomic_helper_check_modeset] [CRTC:29] needs all connectors, enable: y, active: y [ 178.352006] [drm:drm_atomic_add_affected_connectors] Adding all current connectors for [CRTC:29] to ec0567c0 [ 178.352020] [drm:drm_atomic_connectors_for_crtc] State ec0567c0 has 1 connectors for [CRTC:29] [ 178.352032] [drm:exynos_drm_fb_buffer] dma_addr = 0x20100000 [ 178.352040] [drm:exynos_plane_atomic_check] buffer: 0, dma_addr = 0x20100000 [ 178.352048] [drm:drm_atomic_commit] commiting ec0567c0 [ 178.352058] [drm:crtc_set_mode] modeset on [CRTC:29] [ 178.352065] [drm:crtc_set_mode] modeset on [ENCODER:30:TMDS-30] [ 178.352093] [drm:exynos_plane_mode_set] plane : offset_x/y(0,0), width/height(1366,768) [ 178.352102] [drm:drm_atomic_helper_commit_modeset_enables] enabling [CRTC:29] [ 178.352111] [drm:fimd_dpms] drivers/gpu/drm/exynos/exynos_drm_fimd.c, 0 [ 178.352168] Division by zero in kernel. [ 178.352181] CPU: 1 PID: 2645 Comm: lt-modetest Not tainted 4.1.0-rc3-debug+ #2 [ 178.352187] Hardware name: SAMSUNG EXYNOS (Flattened Device Tree) [ 178.352194] Backtrace: [ 178.352219] [<c00132b0>] (dump_backtrace) from [<c00134c8>] (show_stack+0x18/0x1c) [ 178.352225] r6:c06f9a08 r5:ffffffff r4:00000000 r3:dc8ba300 [ 178.352253] [<c00134b0>] (show_stack) from [<c04f2138>] (dump_stack+0x88/0xc8) [ 178.352265] [<c04f20b0>] (dump_stack) from [<c0013434>] (__div0+0x1c/0x20) [ 178.352270] r6:00000003 r5:00000000 r4:ed9cd010 r3:00000000 [ 178.352293] [<c0013418>] (__div0) from [<c020dc14>] (Ldiv0+0x8/0x10) [ 178.352309] [<c02b5e08>] (fimd_commit) from [<c02b6200>] (fimd_poweron.part.9+0xd4/0x19c) [ 178.352314] r9:ee14cc00 r8:c06ffcbc r7:c0748f94 r6:ed9cda70 r5:ed9cd010 r4:00000005 [ 178.352338] [<c02b612c>] (fimd_poweron.part.9) from [<c02b6354>] (fimd_dpms+0x8c/0xb4) [ 178.352344] r6:ee14cc00 r5:00000000 r4:c0748f94 r3:00000001 [ 178.352363] [<c02b62c8>] (fimd_dpms) from [<c02b1bf4>] (exynos_drm_crtc_enable+0x34/0x7c) [ 178.352369] r6:ec0567c0 r5:ed9cd020 r4:ee14cc00 r3:c02b62c8 [ 178.352393] [<c02b1bc0>] (exynos_drm_crtc_enable) from [<c028c0e8>] (drm_atomic_helper_commit_modeset_enables+0x98/0x1c8) [ 178.352399] r5:ee14cc00 r4:00000001 [ 178.352416] [<c028c050>] (drm_atomic_helper_commit_modeset_enables) from [<c028e6ac>] (drm_atomic_helper_commit+0x124/0x170) [ 178.352421] r8:00000000 r7:ed978000 r6:00000000 r5:ec0567c0 r4:0000000b r3:00000000 [ 178.352445] [<c028e588>] (drm_atomic_helper_commit) from [<c02b2794>] (exynos_atomic_commit+0x14/0x18) [ 178.352450] r8:ee14cc00 r7:00000000 r6:ee2385a8 r5:ed978000 r4:ec0567c0 r3:c02b2780 [ 178.352473] [<c02b2780>] (exynos_atomic_commit) from [<c02af928>] (drm_atomic_commit+0x4c/0x6c) [ 178.352483] [<c02af8dc>] (drm_atomic_commit) from [<c028d250>] (drm_atomic_helper_set_config+0x31c/0x428) [ 178.352489] r5:ec0567c0 r4:00000003 [ 178.352508] [<c028cf34>] (drm_atomic_helper_set_config) from [<c029f14c>] (drm_mode_set_config_internal+0x60/0xdc) [ 178.352514] r10:00000000 r9:ed978000 r8:ee238300 r7:ee14cc00 r6:00000002 r5:00000050 [ 178.352533] r4:ee266c00 [ 178.352547] [<c029f0ec>] (drm_mode_set_config_internal) from [<c0290c2c>] (drm_fb_helper_restore_fbdev_mode_unlocked+0xec/0x140) [ 178.352553] r7:ee2385a8 r6:00000002 r5:00000050 r4:00000000 [ 178.352573] [<c0290b40>] (drm_fb_helper_restore_fbdev_mode_unlocked) from [<c02b2658>] (exynos_drm_fbdev_restore_mode+0x28/0x2c) [ 178.352579] r10:ed97814c r9:ed051c00 r8:ed978034 r7:ed978000 r6:ed978058 r5:c0748f94 [ 178.352598] r4:ed978000 [ 178.352609] [<c02b2630>] (exynos_drm_fbdev_restore_mode) from [<c02b1068>] (exynos_drm_lastclose+0x10/0x14) [ 178.352619] [<c02b1058>] (exynos_drm_lastclose) from [<c0294564>] (drm_lastclose+0x3c/0x10c) [ 178.352627] [<c0294528>] (drm_lastclose) from [<c0294974>] (drm_release+0x340/0x4e0) [ 178.352633] r6:ed978058 r5:ec2a16a8 r4:ec2a1600 r3:00000000 [ 178.352658] [<c0294634>] (drm_release) from [<c0103ca8>] (__fput+0xa0/0x1e4) [ 178.352663] r10:00000000 r9:00000008 r8:ed84f600 r7:edc0c428 r6:edb67b10 r5:ed84f600 [ 178.352681] r4:ec2a1700 [ 178.352693] [<c0103c08>] (__fput) from [<c0103e58>] (____fput+0x10/0x14) [ 178.352698] r10:00000000 r9:ec11e000 r8:c000fc04 r7:ed918a80 r6:c0718ef8 r5:00000000 [ 178.352717] r4:ed918e84 [ 178.352732] [<c0103e48>] (____fput) from [<c00473b0>] (task_work_run+0xb8/0xfc) [ 178.352746] [<c00472f8>] (task_work_run) from [<c0012ec8>] (do_work_pending+0x88/0xa8) [ 178.352752] r7:00000006 r6:ec11ffb0 r5:c000fc04 r4:ec11e000 [ 178.352772] [<c0012e40>] (do_work_pending) from [<c000faa4>] (work_pending+0xc/0x20) [ 178.352778] r6:00000000 r5:00000001 r4:00000003 r3:00000000 [ 178.352802] [drm:fimd_win_commit] start addr = 0x20100000, end addr = 0x20500800, size = 0x400800 [ 178.352810] [drm:fimd_win_commit] ovl_width = 1366, ovl_height = 768 [ 178.352819] [drm:fimd_win_commit] osd pos: tx = 0, ty = 0, bx = 1365, by = 767 [ 178.352827] [drm:fimd_win_commit] osd size = 0x100200 [ 178.352834] [drm:fimd_win_set_pixfmt] bpp = 32 [ 178.352846] Division by zero in kernel. [ 178.352857] CPU: 1 PID: 2645 Comm: lt-modetest Not tainted 4.1.0-rc3-debug+ #2 [ 178.352863] Hardware name: SAMSUNG EXYNOS (Flattened Device Tree) [ 178.352868] Backtrace: [ 178.352882] [<c00132b0>] (dump_backtrace) from [<c00134c8>] (show_stack+0x18/0x1c) [ 178.352888] r6:c06f9a08 r5:ffffffff r4:00000000 r3:dc8ba300 [ 178.352911] [<c00134b0>] (show_stack) from [<c04f2138>] (dump_stack+0x88/0xc8) [ 178.352922] [<c04f20b0>] (dump_stack) from [<c0013434>] (__div0+0x1c/0x20) [ 178.352928] r6:00000003 r5:00000000 r4:ed9cd010 r3:00000000 [ 178.352949] [<c0013418>] (__div0) from [<c020dc14>] (Ldiv0+0x8/0x10) [ 178.352961] [<c02b5e08>] (fimd_commit) from [<c02b1c38>] (exynos_drm_crtc_enable+0x78/0x7c) [ 178.352967] r9:ee14cc00 r8:c06ffcbc r7:c0748f94 r6:ec0567c0 r5:ed9cd020 r4:ee14cc00 [ 178.352992] [<c02b1bc0>] (exynos_drm_crtc_enable) from [<c028c0e8>] (drm_atomic_helper_commit_modeset_enables+0x98/0x1c8) [ 178.352998] r5:ee14cc00 r4:00000001 [ 178.353038] [<c028c050>] (drm_atomic_helper_commit_modeset_enables) from [<c028e6ac>] (drm_atomic_helper_commit+0x124/0x170) [ 178.353053] r8:00000000 r7:ed978000 r6:00000000 r5:ec0567c0 r4:0000000b r3:00000000 [ 178.353114] [<c028e588>] (drm_atomic_helper_commit) from [<c02b2794>] (exynos_atomic_commit+0x14/0x18) [ 178.353127] r8:ee14cc00 r7:00000000 r6:ee2385a8 r5:ed978000 r4:ec0567c0 r3:c02b2780 [ 178.353190] [<c02b2780>] (exynos_atomic_commit) from [<c02af928>] (drm_atomic_commit+0x4c/0x6c) [ 178.353212] [<c02af8dc>] (drm_atomic_commit) from [<c028d250>] (drm_atomic_helper_set_config+0x31c/0x428) [ 178.353224] r5:ec0567c0 r4:00000003 [ 178.353261] [<c028cf34>] (drm_atomic_helper_set_config) from [<c029f14c>] (drm_mode_set_config_internal+0x60/0xdc) [ 178.353273] r10:00000000 r9:ed978000 r8:ee238300 r7:ee14cc00 r6:00000002 r5:00000050 [ 178.353328] r4:ee266c00 [ 178.353351] [<c029f0ec>] (drm_mode_set_config_internal) from [<c0290c2c>] (drm_fb_helper_restore_fbdev_mode_unlocked+0xec/0x140) [ 178.353356] r7:ee2385a8 r6:00000002 r5:00000050 r4:00000000 [ 178.353377] [<c0290b40>] (drm_fb_helper_restore_fbdev_mode_unlocked) from [<c02b2658>] (exynos_drm_fbdev_restore_mode+0x28/0x2c) [ 178.353383] r10:ed97814c r9:ed051c00 r8:ed978034 r7:ed978000 r6:ed978058 r5:c0748f94 [ 178.353401] r4:ed978000 [ 178.353412] [<c02b2630>] (exynos_drm_fbdev_restore_mode) from [<c02b1068>] (exynos_drm_lastclose+0x10/0x14) [ 178.353422] [<c02b1058>] (exynos_drm_lastclose) from [<c0294564>] (drm_lastclose+0x3c/0x10c) [ 178.353431] [<c0294528>] (drm_lastclose) from [<c0294974>] (drm_release+0x340/0x4e0) [ 178.353436] r6:ed978058 r5:ec2a16a8 r4:ec2a1600 r3:00000000 [ 178.353456] [<c0294634>] (drm_release) from [<c0103ca8>] (__fput+0xa0/0x1e4) [ 178.353462] r10:00000000 r9:00000008 r8:ed84f600 r7:edc0c428 r6:edb67b10 r5:ed84f600 [ 178.353480] r4:ec2a1700 [ 178.353492] [<c0103c08>] (__fput) from [<c0103e58>] (____fput+0x10/0x14) [ 178.353498] r10:00000000 r9:ec11e000 r8:c000fc04 r7:ed918a80 r6:c0718ef8 r5:00000000 [ 178.353516] r4:ed918e84 [ 178.353530] [<c0103e48>] (____fput) from [<c00473b0>] (task_work_run+0xb8/0xfc) [ 178.353542] [<c00472f8>] (task_work_run) from [<c0012ec8>] (do_work_pending+0x88/0xa8) [ 178.353547] r7:00000006 r6:ec11ffb0 r5:c000fc04 r4:ec11e000 [ 178.353567] [<c0012e40>] (do_work_pending) from [<c000faa4>] (work_pending+0xc/0x20) [ 178.353573] r6:00000000 r5:00000001 r4:00000003 r3:00000000 [ 178.353591] [drm:drm_atomic_helper_commit_modeset_enables] enabling [ENCODER:30:TMDS-30] [ 178.353603] [drm:drm_vblank_enable] enabling vblank on crtc 1, ret: 0 [ 178.353613] [drm:drm_update_vblank_count] updating vblank count on crtc 1, missed 0 [ 178.401638] [drm:drm_atomic_state_clear] Clearing atomic state ec0567c0 [ 178.401654] [drm:drm_atomic_state_free] Freeing atomic state ec0567c0 [ 178.401668] [drm:drm_framebuffer_reference] ee266c00: FB ID: 40 (2) [ 178.401683] [drm:drm_atomic_state_alloc] Allocate atomic state ec0567c0 [ 178.401698] [drm:drm_atomic_get_crtc_state] Added [CRTC:35] ed0e2800 state to ec0567c0 [ 178.401710] [drm:drm_atomic_get_plane_state] Added [PLANE:32] ec056f80 state to ec0567c0 [ 178.401718] [drm:drm_atomic_set_crtc_for_plane] Link plane state ec056f80 to [NOCRTC] [ 178.401725] [drm:drm_atomic_set_fb_for_plane] Set [NOFB] for plane state ec056f80 [ 178.401735] [drm:drm_atomic_add_affected_connectors] Adding all current connectors for [CRTC:35] to ec0567c0 [ 178.401744] [drm:drm_atomic_check_only] checking ec0567c0 [ 178.401756] [drm:drm_atomic_commit] commiting ec0567c0 [ 178.401768] [drm:drm_atomic_state_clear] Clearing atomic state ec0567c0 [ 178.401779] [drm:drm_atomic_state_free] Freeing atomic state ec0567c0 [ 178.401790] [drm:drm_framebuffer_reference] ee266c00: FB ID: 40 (3) [ 178.401798] [drm:drm_framebuffer_unreference] ee266c00: FB ID: 40 (4) [ 178.401811] [drm:drm_lastclose] driver lastclose completed [ 178.401820] [drm:drm_lastclose] lastclose completed [ 178.401889] [drm:drm_stub_open] [ 178.401902] [drm:drm_open_helper] pid = 2645, minor = 0 [ 178.401916] [drm:ipp_subdrv_open] done priv[0xed9b6410] [ 178.401927] [drm:drm_setup] [ 178.401947] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_VERSION [ 178.401960] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_VERSION [ 178.401996] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_GET_UNIQUE [ 178.402007] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_GET_UNIQUE [ 178.402038] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_SET_CLIENT_CAP [ 178.402056] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETRESOURCES [ 178.402068] [drm:drm_mode_getresources] CRTC[3] CONNECTORS[3] ENCODERS[3] [ 178.402078] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETRESOURCES [ 178.402089] [drm:drm_mode_getresources] CRTC[3] CONNECTORS[3] ENCODERS[3] [ 178.402109] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETCRTC [ 178.402129] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETCRTC [ 178.402147] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETCRTC [ 178.402168] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETENCODER [ 178.402181] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETENCODER [ 178.402193] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETENCODER [ 178.402209] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETCONNECTOR [ 178.402218] [drm:drm_mode_getconnector] [CONNECTOR:23:?] [ 178.402229] [drm:drm_helper_probe_single_connector_modes_merge_bits] [CONNECTOR:23:Virtual-1] [ 178.402238] [drm:drm_helper_probe_single_connector_modes_merge_bits] [CONNECTOR:23:Virtual-1] disconnected [ 178.402252] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETCONNECTOR [ 178.402261] [drm:drm_mode_getconnector] [CONNECTOR:23:?] [ 178.402277] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETCONNECTOR [ 178.402285] [drm:drm_mode_getconnector] [CONNECTOR:31:?] [ 178.402295] [drm:drm_helper_probe_single_connector_modes_merge_bits] [CONNECTOR:31:VGA-1] [ 178.402316] [drm:drm_helper_probe_single_connector_modes_merge_bits] [CONNECTOR:31:VGA-1] probed modes : [ 178.402330] [drm:drm_mode_debug_printmodeline] Modeline 38:"1366x768" 0 500 1366 1414 1446 1526 768 771 776 790 0x48 0x5 [ 178.402344] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETCONNECTOR [ 178.402352] [drm:drm_mode_getconnector] [CONNECTOR:31:?] [ 178.402369] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETCONNECTOR [ 178.402377] [drm:drm_mode_getconnector] [CONNECTOR:37:?] [ 178.402387] [drm:drm_helper_probe_single_connector_modes_merge_bits] [CONNECTOR:37:HDMI-A-1] [ 178.402402] [drm:drm_helper_probe_single_connector_modes_merge_bits] [CONNECTOR:37:HDMI-A-1] disconnected [ 178.402415] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETCONNECTOR [ 178.402423] [drm:drm_mode_getconnector] [CONNECTOR:37:?] [ 178.402445] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.402471] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.402495] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.402518] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.402542] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.402565] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.402589] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.402612] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.402641] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.402667] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.402698] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.402723] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.402748] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.402772] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.402796] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.402820] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.402846] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.402870] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.402896] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.402920] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.402944] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.402967] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.402997] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANERESOURCES [ 178.403009] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANERESOURCES [ 178.403027] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403039] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403052] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403064] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403077] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403088] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403101] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403113] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403125] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403137] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403165] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403178] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403191] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403202] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403215] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403226] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403238] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403249] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403262] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403273] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403285] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403296] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPLANE [ 178.403309] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.403333] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.403359] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.403383] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.403410] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.403434] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.403460] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.403484] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.403511] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.403534] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.403559] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.403583] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.403608] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.403632] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.403658] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.403681] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.403705] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.403729] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.403754] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.403778] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.403804] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.403827] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.403852] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.403876] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.403902] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.403926] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.403951] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.403975] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.404001] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404025] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404051] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404074] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404099] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.404123] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.404149] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404173] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404199] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404223] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404247] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.404271] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.404297] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404321] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404348] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404371] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404396] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.404420] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.404445] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404469] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404495] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.404518] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.404543] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404567] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404601] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404625] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404650] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.404674] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_OBJ_GETPROPERTIES [ 178.404700] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404724] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404750] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.404773] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPERTY [ 178.406785] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPBLOB [ 178.406824] [drm:drm_ioctl] ret = -2 [ 178.407568] [drm:drm_ioctl] pid=2645, dev=0xe200, auth=1, DRM_IOCTL_MODE_GETPROPBLOB [ 178.407593] [drm:drm_ioctl] ret = -2 [ 178.431659] [drm:drm_release] open_count = 1 [ 178.431681] [drm:drm_release] pid = 2645, device = 0xe200, open_count = 1 [ 178.431699] [drm:drm_lastclose] [ 178.431731] [drm:drm_atomic_state_alloc] Allocate atomic state ec0561c0 [ 178.431746] [drm:drm_atomic_get_crtc_state] Added [CRTC:21] ed0e3800 state to ec0561c0 [ 178.431758] [drm:drm_atomic_get_plane_state] Added [PLANE:17] ec056d80 state to ec0561c0 [ 178.431766] [drm:drm_atomic_set_crtc_for_plane] Link plane state ec056d80 to [NOCRTC] [ 178.431774] [drm:drm_atomic_set_fb_for_plane] Set [NOFB] for plane state ec056d80 [ 178.431784] [drm:drm_atomic_add_affected_connectors] Adding all current connectors for [CRTC:21] to ec0561c0 [ 178.431794] [drm:drm_atomic_check_only] checking ec0561c0 [ 178.431806] [drm:drm_atomic_commit] commiting ec0561c0 [ 178.431819] [drm:drm_atomic_state_clear] Clearing atomic state ec0561c0 [ 178.431828] [drm:drm_atomic_state_free] Freeing atomic state ec0561c0 [ 178.431840] [drm:drm_framebuffer_reference] ee266c00: FB ID: 40 (3) [ 178.431849] [drm:drm_framebuffer_unreference] ee266c00: FB ID: 40 (4) [ 178.431861] [drm:drm_atomic_state_alloc] Allocate atomic state ec0561c0 [ 178.431872] [drm:drm_atomic_get_crtc_state] Added [CRTC:29] ed0e2e00 state to ec0561c0 [ 178.431882] [drm:drm_framebuffer_reference] ee266c00: FB ID: 40 (3) [ 178.431890] [drm:drm_atomic_get_plane_state] Added [PLANE:24] ec056c80 state to ec0561c0 [ 178.431899] [drm:drm_atomic_set_crtc_for_plane] Link plane state ec056c80 to [CRTC:29] [ 178.431907] [drm:drm_framebuffer_unreference] ee266c00: FB ID: 40 (4) [ 178.431915] [drm:drm_framebuffer_reference] ee266c00: FB ID: 40 (3) [ 178.431922] [drm:drm_atomic_set_fb_for_plane] Set [FB:40] for plane state ec056c80 [ 178.431934] [drm:drm_atomic_get_connector_state] Added [CONNECTOR:31] ec056040 state to ec0561c0 [ 178.431943] [drm:drm_atomic_add_affected_connectors] Adding all current connectors for [CRTC:29] to ec0561c0 [ 178.431952] [drm:drm_atomic_set_crtc_for_connector] Link connector state ec056040 to [NOCRTC] [ 178.431960] [drm:drm_atomic_set_crtc_for_connector] Link connector state ec056040 to [CRTC:29] [ 178.431967] [drm:drm_atomic_check_only] checking ec0561c0 [ 178.431977] [drm:update_connector_routing] Updating routing for [CONNECTOR:31:VGA-1] [ 178.431987] [drm:update_connector_routing] [CONNECTOR:31:VGA-1] keeps [ENCODER:30:TMDS-30], now on [CRTC:29] [ 178.431996] [drm:exynos_drm_fb_buffer] dma_addr = 0x20100000 [ 178.432004] [drm:exynos_plane_atomic_check] buffer: 0, dma_addr = 0x20100000 [ 178.432012] [drm:drm_atomic_commit] commiting ec0561c0 [ 178.432023] [drm:exynos_plane_mode_set] plane : offset_x/y(0,0), width/height(1366,768) [ 178.432034] [drm:fimd_win_commit] start addr = 0x20100000, end addr = 0x20500800, size = 0x400800 [ 178.432042] [drm:fimd_win_commit] ovl_width = 1366, ovl_height = 768 [ 178.432051] [drm:fimd_win_commit] osd pos: tx = 0, ty = 0, bx = 1365, by = 767 [ 178.432058] [drm:fimd_win_commit] osd size = 0x100200 [ 178.432066] [drm:fimd_win_set_pixfmt] bpp = 32 [ 178.432075] [drm:drm_atomic_state_clear] Clearing atomic state ec0561c0 [ 178.432085] [drm:drm_framebuffer_unreference] ee266c00: FB ID: 40 (4) [ 178.432093] [drm:drm_atomic_state_free] Freeing atomic state ec0561c0 [ 178.432104] [drm:drm_framebuffer_reference] ee266c00: FB ID: 40 (3) [ 178.432112] [drm:drm_framebuffer_unreference] ee266c00: FB ID: 40 (4) [ 178.432124] [drm:drm_atomic_state_alloc] Allocate atomic state ec0561c0 [ 178.432135] [drm:drm_atomic_get_crtc_state] Added [CRTC:35] ed0e2a00 state to ec0561c0 [ 178.432146] [drm:drm_atomic_get_plane_state] Added [PLANE:32] ec056d00 state to ec0561c0 [ 178.432154] [drm:drm_atomic_set_crtc_for_plane] Link plane state ec056d00 to [NOCRTC] [ 178.432161] [drm:drm_atomic_set_fb_for_plane] Set [NOFB] for plane state ec056d00 [ 178.432171] [drm:drm_atomic_add_affected_connectors] Adding all current connectors for [CRTC:35] to ec0561c0 [ 178.432178] [drm:drm_atomic_check_only] checking ec0561c0 [ 178.432187] [drm:drm_atomic_commit] commiting ec0561c0 [ 178.432198] [drm:drm_atomic_state_clear] Clearing atomic state ec0561c0 [ 178.432206] [drm:drm_atomic_state_free] Freeing atomic state ec0561c0 [ 178.432217] [drm:drm_framebuffer_reference] ee266c00: FB ID: 40 (3) [ 178.432225] [drm:drm_framebuffer_unreference] ee266c00: FB ID: 40 (4) [ 178.432235] [drm:drm_lastclose] driver lastclose completed [ 178.432244] [drm:drm_lastclose] lastclose completed

3 9

[PATCH 1/3] drm/atomic: add commit_planes_on_crtc helper
by Maarten Lankhorst 19 May '15

19 May '15

drm_atomic_helper_commit_planes calls all atomic_begin's first, then updates all planes, finally calling atomic_flush. Some drivers may want to things like disabling irq's from their atomic_begin, in which case a second call to atomic_begin will splat. By using commit_planes_on_crtc on each crtc in the atomic state they'll evade that issue. Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)linux.intel.com> --- drivers/gpu/drm/drm_atomic_helper.c | 53 +++++++++++++++++++++++++++++++++++++ include/drm/drm_atomic_helper.h | 1 + 2 files changed, 54 insertions(+) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index b82ef6262469..2da8a16bb39e 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -1181,6 +1181,59 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, EXPORT_SYMBOL(drm_atomic_helper_commit_planes); /** + * drm_atomic_helper_commit_planes_on_crtc - commit plane state for a crtc + * @old_crtc_state: atomic state object with the old crtc state + * + * This function commits the new plane state using the plane and atomic helper + * functions for planes on the specific crtc. It assumes that the atomic state + * has already been pushed into the relevant object state pointers, since this + * step can no longer fail. + * + * This function can only be used when planes are not allowed to move between + * different crtc's. + */ +void +drm_atomic_helper_commit_planes_on_crtc(struct drm_crtc_state *old_crtc_state) +{ + const struct drm_crtc_helper_funcs *crtc_funcs; + struct drm_crtc *crtc = old_crtc_state->crtc; + struct drm_atomic_state *old_state = old_crtc_state->state; + struct drm_plane *plane; + unsigned plane_mask; + + plane_mask = old_crtc_state->plane_mask; + plane_mask |= crtc->state->plane_mask; + + crtc_funcs = crtc->helper_private; + if (crtc_funcs && crtc_funcs->atomic_begin) + crtc_funcs->atomic_begin(crtc); + + drm_for_each_plane_mask(plane, crtc->dev, plane_mask) { + struct drm_plane_state *old_plane_state = + drm_atomic_get_existing_plane_state(old_state, plane); + const struct drm_plane_helper_funcs *plane_funcs; + + plane_funcs = plane->helper_private; + + if (!old_plane_state || !plane_funcs) + continue; + + WARN_ON(plane->state->crtc && plane->state->crtc != crtc); + + if (drm_atomic_plane_disabling(plane, old_plane_state) && + plane_funcs->atomic_disable) + plane_funcs->atomic_disable(plane, old_plane_state); + else if (plane->state->crtc || + drm_atomic_plane_disabling(plane, old_plane_state)) + plane_funcs->atomic_update(plane, old_plane_state); + } + + if (crtc_funcs->atomic_flush) + crtc_funcs->atomic_flush(crtc); +} +EXPORT_SYMBOL(drm_atomic_helper_commit_planes_on_crtc); + +/** * drm_atomic_helper_cleanup_planes - cleanup plane resources after commit * @dev: DRM device * @old_state: atomic state object with old state structures diff --git a/include/drm/drm_atomic_helper.h b/include/drm/drm_atomic_helper.h index 6ee0ee5b6143..cc1fee8a12d0 100644 --- a/include/drm/drm_atomic_helper.h +++ b/include/drm/drm_atomic_helper.h @@ -58,6 +58,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, struct drm_atomic_state *state); void drm_atomic_helper_cleanup_planes(struct drm_device *dev, struct drm_atomic_state *old_state); +void drm_atomic_helper_commit_planes_on_crtc(struct drm_crtc_state *old_crtc_state); void drm_atomic_helper_swap_state(struct drm_device *dev, struct drm_atomic_state *state); -- 2.1.0

2 3

[PATCH] drm/radeon: take the mode_config mutex when dealing with hpds (v2)
by Alex Deucher 19 May '15

19 May '15

Since we are messing with state in the worker. v2: drop the changes in the mst worker Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Cc: stable(a)vger.kernel.org --- drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c index 7162c93..f682e53 100644 --- a/drivers/gpu/drm/radeon/radeon_irq_kms.c +++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c @@ -79,10 +79,12 @@ static void radeon_hotplug_work_func(struct work_struct *work) struct drm_mode_config *mode_config = &dev->mode_config; struct drm_connector *connector; + mutex_lock(&mode_config->mutex); if (mode_config->num_connector) { list_for_each_entry(connector, &mode_config->connector_list, head) radeon_connector_hotplug(connector); } + mutex_unlock(&mode_config->mutex); /* Just fire off a uevent and let userspace tell us what to do */ drm_helper_hpd_irq_event(dev); } -- 1.8.3.1

1 1

[GIT PULL] exynos-drm-fixes
by inki.dae＠samsung.com 19 May '15

19 May '15

Hi Dave, This pull request contains mainly some regression fixups and code cleanups. Summary: - Use generic function to get buffer count instead of specific one. In case of Exynos DRM, There was a special case which decides pixel format of a given buffer according to planer types, which is NV12M and NV12. However, NV12M doesn't exist in drm fourcc so it removes exynos_drm_format_num_buffers() specific to Exynos DRM and use a generic function, drm_format_num_planes() instead. - Allow mixer driver to support NV21 format for Video processor. This format was already supported but we just missed DRM_FORMAT_NV21 case so this patch considers the case so that Mixer driver can handle it correctly. - Add regression fix and some code cleanups. Please kindly let me know if there is any problem. Thanks, Inki Dae The following changes since commit 64d237e66d562348f04a9c04a45455c1f3201ced: Merge branch 'msm-fixes-4.1' of git://people.freedesktop.org/~robclark/linux into drm-fixes (2015-05-19 10:17:34 +1000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git exynos-drm-fixes for you to fetch changes up to b0f155ada4c819f06aa32b4c906e7e76350c7ec1: drm/exynos: dp: Lower level of EDID read success message (2015-05-19 22:50:55 +0900) ---------------------------------------------------------------- Krzysztof Kozlowski (5): drm/exynos: mixer: Constify platform_device_id drm/exynos: Fix build breakage on !DRM_EXYNOS_FIMD drm/exynos: Constify exynos_drm_crtc_ops drm/exynos: Consolidate return statements in fimd_bind() drm/exynos: dp: Lower level of EDID read success message Tobias Jakobi (8): drm/exynos: fb: use drm_format_num_planes to get buffer count drm/exynos: plane: honor buffer offset for dma_addr drm/exynos: mixer: remove buffer count handling in vp_video_buffer() drm/exynos: mixer: also allow NV21 for the video processor drm/exynos: mixer: cleanup pixelformat handling drm/exynos: mixer: don't dump registers under spinlock drm/exynos: 'win' is always unsigned drm/exynos: cleanup exynos_drm_plane drivers/gpu/drm/exynos/exynos7_drm_decon.c | 4 +- drivers/gpu/drm/exynos/exynos_dp_core.c | 13 +++-- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 10 ++-- drivers/gpu/drm/exynos/exynos_drm_crtc.h | 10 ++-- drivers/gpu/drm/exynos/exynos_drm_drv.h | 20 +++----- drivers/gpu/drm/exynos/exynos_drm_fb.c | 39 +-------------- drivers/gpu/drm/exynos/exynos_drm_fimd.c | 53 ++++++++++---------- drivers/gpu/drm/exynos/exynos_drm_fimd.h | 15 ------ drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- drivers/gpu/drm/exynos/exynos_drm_vidi.c | 2 +- drivers/gpu/drm/exynos/exynos_mixer.c | 72 +++++++++++++++------------- 11 files changed, 92 insertions(+), 148 deletions(-) delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_fimd.h

1 0

[PULL] topic/drm-misc
by Daniel Vetter 19 May '15

19 May '15

Hi Dave, Scattering of random drm core patches. Bunch of atomic prep work too, but the final bits for blob properties, atomic modesets and lifting the experimental tag on the atomic ioctl are still blocked on Daniel Stone finalizing and testing the weston support for it. I hope that we can get it all ready for 4.2 though. Cheers, Daniel The following changes since commit c0fe07aa50befe2e6e6525181e2080377a1c1494: drm/qxl: rewrite framebuffer support (2015-05-07 13:09:25 +1000) are available in the git repository at: git://anongit.freedesktop.org/drm-intel tags/topic/drm-misc-2015-05-19 for you to fetch changes up to 036ef5733ba433760a3512bb5f7a155946e2df05: drm/atomic: Allow drivers to subclass drm_atomic_state, v3 (2015-05-18 16:39:41 +0200) ---------------------------------------------------------------- Daniel Stone (5): drm/atomic: Don't open-code CRTC state destroy drm: Don't leak path blob property when updating drm: Introduce helper for replacing blob properties drm: Introduce blob_lock drm: Add reference counting to blob properties Daniel Vetter (2): drm/atomic-helpers: Update vblank timestamping constants drm/atomic-helpers: Export drm_atomic_helper_update_legacy_modeset_state Gustavo Padovan (1): drm/atomic: remove duplicated assignment of old_plane_state Jani Nikula (4): drm/sysfs: add a helper for extracting connector type from kobject drm/sysfs: make optional attribute groups per connector type drm/sysfs: split DVI-I and TV-out attributes drm/sysfs: remove unnecessary connector type checks Jon Hunter (1): drm/dp: Fix comment in DP helper Maarten Lankhorst (4): drm/i915: get rid of -Iinclude/drm drm/core: get rid of -Iinclude/drm drm/atomic: add drm_atomic_get_existing_*_state helpers drm/atomic: Allow drivers to subclass drm_atomic_state, v3 Tomasz Figa (1): drm/prime: Allow internal imports without import_sg_table Ville Syrjälä (4): drm/edid: Fix up DMT modes drm/edid: Add the DMT ID in the comments drm/edid: Add DMT modes with ID > 0x50 drm/edid: Add CEA modes before inferred modes drivers/gpu/drm/Makefile | 2 - drivers/gpu/drm/drm_atomic.c | 134 +++++++++---- drivers/gpu/drm/drm_atomic_helper.c | 29 ++- drivers/gpu/drm/drm_crtc.c | 325 ++++++++++++++++++++++++++------ drivers/gpu/drm/drm_crtc_helper.c | 7 +- drivers/gpu/drm/drm_edid.c | 206 +++++++++++--------- drivers/gpu/drm/drm_flip_work.c | 4 +- drivers/gpu/drm/drm_prime.c | 6 +- drivers/gpu/drm/drm_sysfs.c | 160 ++++++++++------ drivers/gpu/drm/i915/Makefile | 2 - drivers/gpu/drm/i915/i915_gem_userptr.c | 4 +- include/drm/drm_atomic.h | 55 ++++++ include/drm/drm_atomic_helper.h | 4 + include/drm/drm_crtc.h | 26 ++- include/drm/drm_dp_helper.h | 6 +- 15 files changed, 696 insertions(+), 274 deletions(-) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch

1 0

[PATCH] drm/amdkfd: fix topology bug with capability attr.
by Oded Gabbay 19 May '15

19 May '15

From: Alexey Skidanov <Alexey.Skidanov(a)amd.com> This patch fixes a bug where the number of watch points was shown before it was actually calculated Signed-off-by: Alexey Skidanov <Alexey.Skidanov(a)amd.com> Cc: stable(a)vger.kernel.org Signed-off-by: Oded Gabbay <oded.gabbay(a)gmail.com> --- drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c index e469c4b..c25728b 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c @@ -684,8 +684,6 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr, dev->node_props.cpu_core_id_base); sysfs_show_32bit_prop(buffer, "simd_id_base", dev->node_props.simd_id_base); - sysfs_show_32bit_prop(buffer, "capability", - dev->node_props.capability); sysfs_show_32bit_prop(buffer, "max_waves_per_simd", dev->node_props.max_waves_per_simd); sysfs_show_32bit_prop(buffer, "lds_size_in_kb", @@ -736,6 +734,8 @@ static ssize_t node_show(struct kobject *kobj, struct attribute *attr, dev->gpu->kfd2kgd->get_fw_version( dev->gpu->kgd, KGD_ENGINE_MEC1)); + sysfs_show_32bit_prop(buffer, "capability", + dev->node_props.capability); } return sysfs_show_32bit_prop(buffer, "max_engine_clk_ccompute", -- 1.9.1

1 0

[PULL resend] drm-amdkfd-next
by Oded Gabbay 19 May '15

19 May '15

Hi Dave, Resending the pull request of amdkfd for 4.2 after fixing what you requested (bool -> uint32_t and using git:// instead of ssh://) drm-amdkfd-next-2015-05-19: - Add the interrupts & events modules, including new IOCTLs to create and wait on events. The HSA RT open source stack is mainly using events to know when a dispatched work has been completed. In addition, this module is a pre-requisite for the next module I'm going to upstream - debugger support This module also handles H/W exceptions, such as memory exception received through the IOMMUv2 H/W and Bad Opcode exception receieved from the GPU. - Adding a new kernel module parameter to let the user decide whether he wants to receive a SIGTERM when a memory exception occurs inside the GPU kernel and the HSA application doesn't wait on an appropriate event, or if he just want to receive notification about this event in dmesg. The default is the latter. - Additional improvements for SDMA code - Update my email address in Maintainers file. Thanks, Oded The following changes since commit d0093404f808e23a480dbb4e05c083f1cfeddfd9: Merge tag 'drm-intel-next-2015-05-08' of git://anongit.freedesktop.org/drm-intel into drm-next (2015-05-19 10:18:13 +1000) are available in the git repository at: git://people.freedesktop.org/~gabbayo/linux tags/drm-amdkfd-next-2015-05-19 for you to fetch changes up to 7591cd2cd59d77c52141d9c2c759c14f981c1a13: drm/amdkfd: change driver version to 0.7.2 (2015-05-19 13:02:30 +0300) ---------------------------------------------------------------- Alexey Skidanov (2): drm/amdkfd: Add memory exception handling drm/amdkfd: Add bad opcode exception handling Andrew Lewycky (4): drm/amdkfd: Add interrupt handling module drm/amdkfd: add events IOCTL set definitions drm/amdkfd: Add the events module drm/amdkfd: Implement events IOCTLs Firo Yang (1): drm/amdkfd: Remove unessary void pointer cast Oded Gabbay (7): drm/amdkfd: reformat some debug prints drm/amdkfd: Use new struct for asic specific ops drm/amdkfd: make the sdma vm init to be asic specific MAINTAINERS: update amdkfd Oded's email address drm/radeon: Add init interrupt kfd->kgd interface drm/amdkfd: Add module parameter of send_sigterm drm/amdkfd: change driver version to 0.7.2 MAINTAINERS | 2 +- drivers/gpu/drm/amd/amdkfd/Makefile | 1 + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 66 ++ drivers/gpu/drm/amd/amdkfd/cik_int.h | 41 + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 87 +- drivers/gpu/drm/amd/amdkfd/kfd_device.c | 52 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 30 +- .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 21 +- .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 18 +- .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 10 +- drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 15 +- drivers/gpu/drm/amd/amdkfd/kfd_events.c | 965 +++++++++++++++++++++ drivers/gpu/drm/amd/amdkfd/kfd_events.h | 84 ++ drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 188 ++++ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 5 +- drivers/gpu/drm/amd/amdkfd/kfd_module.c | 9 +- drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 75 ++ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 27 +- drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 2 + drivers/gpu/drm/radeon/cik_reg.h | 2 + drivers/gpu/drm/radeon/cikd.h | 1 + drivers/gpu/drm/radeon/radeon_kfd.c | 21 +- include/uapi/linux/kfd_ioctl.h | 96 +- 23 files changed, 1778 insertions(+), 40 deletions(-) create mode 100644 drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c create mode 100644 drivers/gpu/drm/amd/amdkfd/cik_int.h create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_events.c create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_events.h create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c

1 0

re: gma500: initial medfield merge
by Dan Carpenter 19 May '15

19 May '15

Hello Kirill A. Shutemov, The patch 026abc333205: "gma500: initial medfield merge" from Mar 8, 2012, leads to the following static checker warning: drivers/gpu/drm/gma500/mdfld_intel_display.c:102 mdfldWaitForPipeEnable() warn: masked condition '(temp & (1 << 30)) == 1' is always false. drivers/gpu/drm/gma500/mdfld_intel_display.c 79 void mdfldWaitForPipeEnable(struct drm_device *dev, int pipe) 80 { 81 struct drm_psb_private *dev_priv = dev->dev_private; 82 const struct psb_offset *map = &dev_priv->regmap[pipe]; 83 int count, temp; 84 85 switch (pipe) { 86 case 0: 87 case 1: 88 case 2: 89 break; 90 default: 91 DRM_ERROR("Illegal Pipe Number.\n"); 92 return; 93 } 94 95 /* FIXME JLIU7_PO */ 96 gma_wait_for_vblank(dev); 97 return; 98 99 /* Wait for for the pipe enable to take effect. */ 100 for (count = 0; count < COUNT_MAX; count++) { 101 temp = REG_READ(map->conf); 102 if ((temp & PIPEACONF_PIPE_STATE) == 1) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Never true. It meants we always loop until the timeout. I am tempted to change it to: if (temp & PIPEACONF_PIPE_STATE) But removing delays is slightly risky unless you can test it on hardware. 103 break; 104 } 105 } regards, dan carpenter

1 0

[EDT][PATCh 1/1]mdfld_dsi_pkg_sender.c : Fix Possible NULL Pointer dereference
by Maninder Singh 19 May '15

19 May '15

EP-AA9D1F29B02341529D96C06444D8471D Hi, There is NULL pointer check for sender after dereferencing sender in __read_panel_data as below:- struct drm_device *dev = sender->dev; ... if (!sender || !data || !len) And from codeflow mdfld_dsi_get_panel_status --> mdfld_dsi_read_mcs --> __read_panel_data In mdfld_dsi_get_panel_status & mdfld_dsi_read_mcs there is already a same check. -----------Cut------------ if (!sender || !data || !len) { DRM_ERROR("Invalid parameters\n"); return -EINVAL; } return __read_panel_data(sender, MIPI_DSI_DCS_READ, &cmd, 1, data, len, hs); --------------------Cut----------- So either we can remove this check from __read_panel_data , or if we want to have defensive code then below change should be included. Subject: [PATCH 1/1] mdfld_dsi_pkg_sender.c : Initialize dev struct after NULL check of sender Signed-off-by: Maninder Singh <maninder1.s(a)samsung.com> Reviewed-By: Vaneet Narang <v.narang(a)samsung.com> --- drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c b/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c index 6b43ae3..6f2b2c9 100644 --- a/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c +++ b/drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c @@ -520,7 +520,7 @@ static int __read_panel_data(struct mdfld_dsi_pkg_sender *sender, u8 data_type, u8 *data, u16 len, u32 *data_out, u16 len_out, bool hs) { unsigned long flags; - struct drm_device *dev = sender->dev; + struct drm_device *dev; int i; u32 gen_data_reg; int retry = MDFLD_DSI_READ_MAX_COUNT; @@ -530,6 +530,8 @@ static int __read_panel_data(struct mdfld_dsi_pkg_sender *sender, u8 data_type, return -EINVAL; } + dev = sender->dev; + /** * do reading. * 0) send out generic read request -- 1.7.1 Thanks Maninder

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel May 2015