dri-devel March 2018

dri-devel@lists.freedesktop.org

263 participants
1856 discussions

[PATCH 0/3] drm/rockchip: VOP interrupt fixes
by Marc Zyngier 14 Mar '18

14 Mar '18

This small series fixes a number of issues that I found while trying to get kexec working on the Chromebook Plus (aka rk3399-gru-kevin) in order to use it as some sort of interactive bootloader. The main issue is that the vop driver expects the interrupts to be cleared and disabled when booting. Nothing could be more wrong. The device should be expected to be alive and screaming, and it is the driver's job to put it back into a sane state. This is what the first patch does, making sure the interrupt is requested only when the device has been put back into a known state. Given that this is an observable bug that has been around for a while, I've tagged it with a Cc: stable. The two following patches are less important: Using memcpy on MMIO ranges is plain wrong, and using spin_lock_irqsave in irq context is slightly pointless. With these patches in, I'm able to get kexec to work. There is still some funny issues at the iommu level, but that's for another day. Patches on top of 4.16-rc2. Marc Zyngier (3): drm/rockchip: Clear all interrupts before requesting the IRQ drm/rockchip: Do not use memcpy for MMIO addresses drm/rockchip: Don't use spin_lock_irqsave in interrupt context drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 44 +++++++++++++++-------------- 1 file changed, 23 insertions(+), 21 deletions(-) -- 2.14.2

2 4

[PATCH] drm/i915: drop various VLAs in i915_debugfs.c
by Salvatore Mesoraca 14 Mar '18

14 Mar '18

Avoid 3 VLAs[1] by using real constant expressions instead of variables. The compiler should be able to optimize the original code and avoid using any actual VLAs. Anyway this change is useful because it will avoid a false positives with -Wvla, it might also help the compiler generating better code. [1] https://lkml.org/lkml/2018/3/7/621 Signed-off-by: Salvatore Mesoraca <s.mesoraca16(a)gmail.com> --- drivers/gpu/drm/i915/i915_debugfs.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index e968aea..bf0a8e3 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -4259,19 +4259,20 @@ static ssize_t cur_wm_latency_write(struct file *file, const char __user *ubuf, i915_cache_sharing_get, i915_cache_sharing_set, "%llu\n"); +#define CHERRYVIEW_SS_MAX 2 + static void cherryview_sseu_device_status(struct drm_i915_private *dev_priv, struct sseu_dev_info *sseu) { - int ss_max = 2; int ss; - u32 sig1[ss_max], sig2[ss_max]; + u32 sig1[CHERRYVIEW_SS_MAX], sig2[CHERRYVIEW_SS_MAX]; sig1[0] = I915_READ(CHV_POWER_SS0_SIG1); sig1[1] = I915_READ(CHV_POWER_SS1_SIG1); sig2[0] = I915_READ(CHV_POWER_SS0_SIG2); sig2[1] = I915_READ(CHV_POWER_SS1_SIG2); - for (ss = 0; ss < ss_max; ss++) { + for (ss = 0; ss < CHERRYVIEW_SS_MAX; ss++) { unsigned int eu_cnt; if (sig1[ss] & CHV_SS_PG_ENABLE) @@ -4290,15 +4291,17 @@ static void cherryview_sseu_device_status(struct drm_i915_private *dev_priv, } } +#define GEN10_S_MAX 6 +#define GEN10_SS_MAX 4 + static void gen10_sseu_device_status(struct drm_i915_private *dev_priv, struct sseu_dev_info *sseu) { const struct intel_device_info *info = INTEL_INFO(dev_priv); - int s_max = 6, ss_max = 4; int s, ss; - u32 s_reg[s_max], eu_reg[2 * s_max], eu_mask[2]; + u32 s_reg[GEN10_S_MAX], eu_reg[2 * GEN10_S_MAX], eu_mask[2]; - for (s = 0; s < s_max; s++) { + for (s = 0; s < GEN10_S_MAX; s++) { /* * FIXME: Valid SS Mask respects the spec and read * only valid bits for those registers, excluding reserverd @@ -4320,7 +4323,7 @@ static void gen10_sseu_device_status(struct drm_i915_private *dev_priv, GEN9_PGCTL_SSB_EU210_ACK | GEN9_PGCTL_SSB_EU311_ACK; - for (s = 0; s < s_max; s++) { + for (s = 0; s < GEN10_S_MAX; s++) { if ((s_reg[s] & GEN9_PGCTL_SLICE_ACK) == 0) /* skip disabled slice */ continue; @@ -4328,7 +4331,7 @@ static void gen10_sseu_device_status(struct drm_i915_private *dev_priv, sseu->slice_mask |= BIT(s); sseu->subslice_mask = info->sseu.subslice_mask; - for (ss = 0; ss < ss_max; ss++) { + for (ss = 0; ss < GEN10_SS_MAX; ss++) { unsigned int eu_cnt; if (!(s_reg[s] & (GEN9_PGCTL_SS_ACK(ss)))) @@ -4345,12 +4348,15 @@ static void gen10_sseu_device_status(struct drm_i915_private *dev_priv, } } +#define GEN9_S_MAX 3 +#define GEN9_SS_MAX 4 + static void gen9_sseu_device_status(struct drm_i915_private *dev_priv, struct sseu_dev_info *sseu) { - int s_max = 3, ss_max = 4; + int s_max = GEN9_S_MAX, ss_max = GEN9_SS_MAX; int s, ss; - u32 s_reg[s_max], eu_reg[2*s_max], eu_mask[2]; + u32 s_reg[GEN9_S_MAX], eu_reg[2*GEN9_S_MAX], eu_mask[2]; /* BXT has a single slice and at most 3 subslices. */ if (IS_GEN9_LP(dev_priv)) { -- 1.9.1

3 4

[Bug 105369] HP HP ENVY x360, amdgpu, Call Trace tgn10_lock at startup, VMC page fault during runtime
by bugzilla-daemon＠freedesktop.org 14 Mar '18

14 Mar '18

https://bugs.freedesktop.org/show_bug.cgi?id=105369 Bug ID: 105369 Summary: HP HP ENVY x360, amdgpu, Call Trace tgn10_lock at startup, VMC page fault during runtime Product: DRI Version: unspecified Hardware: x86-64 (AMD64) OS: Linux (All) Status: NEW Severity: normal Priority: medium Component: DRM/AMDgpu Assignee: dri-devel(a)lists.freedesktop.org Reporter: chris(a)degree.at Created attachment 137826 --> https://bugs.freedesktop.org/attachment.cgi?id=137826&action=edit dmesg I'm using Linux version 4.15.7-1-ARCH on a HP ENVY x360. When booting the error below shows up. Still, gnome boots up and I can work with it. After some time graphics freezes, see below. [ 2.280593] Hardware name: HP HP ENVY x360 Convertible 15-bq1xx/83C6, BIOS F.13 11/10/2017 [ 2.280633] RIP: 0010:generic_reg_wait+0xee/0x120 [amdgpu] [ 2.280634] RSP: 0018:ffffb9edc135f3c0 EFLAGS: 00010297 [ 2.280635] RAX: 0000000000000001 RBX: 0000000000000065 RCX: 0000000000000001 [ 2.280636] RDX: 0000000000000000 RSI: 0000000000000002 RDI: 0000000000000292 [ 2.280636] RBP: 0000000000000001 R08: 0000000432672164 R09: 000000000000005e [ 2.280637] R10: 0000000000000002 R11: 0000000000000000 R12: ffff9bc4c4991e00 [ 2.280637] R13: 000000000000504d R14: 0000000000000100 R15: 0000000000000001 [ 2.280638] FS: 00007f932f8a28c0(0000) GS:ffff9bc4d6a40000(0000) knlGS:0000000000000000 [ 2.280639] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 2.280640] CR2: 000055b45015fee8 CR3: 00000002139da000 CR4: 00000000003406e0 [ 2.280641] Call Trace: [ 2.280688] tgn10_lock+0x9e/0xb0 [amdgpu] [ 2.280731] program_all_pipe_in_tree+0x1387/0x1440 [amdgpu] [ 2.280775] dcn10_apply_ctx_for_surface+0x4a0/0x510 [amdgpu] [ 2.280815] dc_commit_state+0x281/0x4b0 [amdgpu] [ 2.280860] amdgpu_dm_atomic_commit_tail+0x2ab/0x9a0 [amdgpu] [ 2.280896] ? amdgpu_bo_pin_restricted+0x1ac/0x290 [amdgpu] [ 2.280899] ? kmem_cache_alloc_trace+0x1a9/0x1c0 [ 2.280943] ? dm_plane_helper_prepare_fb+0x1d1/0x240 [amdgpu] [ 2.280951] commit_tail+0x3d/0x70 [drm_kms_helper] [ 2.280959] drm_atomic_helper_commit+0xfc/0x110 [drm_kms_helper] [ 2.280967] restore_fbdev_mode_atomic+0x181/0x1f0 [drm_kms_helper] [ 2.280976] drm_fb_helper_restore_fbdev_mode_unlocked.part.25+0x23/0x70 [drm_kms_helper] [ 2.280990] drm_fb_helper_set_par+0x3e/0x70 [drm_kms_helper] [ 2.280993] fbcon_init+0x482/0x660 [ 2.280997] visual_init+0xd5/0x130 [ 2.280998] do_bind_con_driver+0x1f4/0x400 [ 2.281001] do_take_over_console+0x7b/0x190 [ 2.281002] do_fbcon_takeover+0x58/0xb0 [ 2.281004] notifier_call_chain+0x47/0x70 [ 2.281006] blocking_notifier_call_chain+0x3e/0x60 [ 2.281009] ? down+0x12/0x50 [ 2.281011] register_framebuffer+0x248/0x350 [ 2.281016] __drm_fb_helper_initial_config_and_unlock+0x20e/0x420 [drm_kms_helper] [ 2.281052] amdgpu_fbdev_init+0xc4/0xf0 [amdgpu] [ 2.281087] amdgpu_device_init+0x1110/0x15e0 [amdgpu] [ 2.281121] amdgpu_driver_load_kms+0x86/0x2d0 [amdgpu] [ 2.281131] drm_dev_register+0x132/0x1c0 [drm] [ 2.281164] amdgpu_pci_probe+0x10a/0x140 [amdgpu] [ 2.281167] local_pci_probe+0x42/0xa0 [ 2.281169] ? pci_match_device+0xd9/0x100 [ 2.281170] pci_device_probe+0x146/0x1b0 [ 2.281173] driver_probe_device+0x315/0x480 [ 2.281175] __driver_attach+0xa0/0xe0 [ 2.281176] ? driver_probe_device+0x480/0x480 [ 2.281177] bus_for_each_dev+0x6b/0xb0 [ 2.281179] bus_add_driver+0x1c2/0x260 [ 2.281180] ? 0xffffffffc0e78000 [ 2.281182] driver_register+0x57/0xc0 [ 2.281183] ? 0xffffffffc0e78000 [ 2.281185] do_one_initcall+0x4e/0x190 [ 2.281187] ? kmem_cache_alloc_trace+0xa1/0x1c0 [ 2.281190] do_init_module+0x5b/0x205 [ 2.281192] load_module+0x26ad/0x2b30 [ 2.281195] ? vmap_page_range_noflush+0x27b/0x380 [ 2.281197] ? SyS_init_module+0x163/0x1a0 [ 2.281199] SyS_init_module+0x163/0x1a0 [ 2.281201] do_syscall_64+0x74/0x190 [ 2.281204] entry_SYSCALL_64_after_hwframe+0x3d/0xa2 [ 2.281206] RIP: 0033:0x7f932f1f46ca [ 2.281206] RSP: 002b:00007ffc090cc3e8 EFLAGS: 00000246 ORIG_RAX: 00000000000000af [ 2.281207] RAX: ffffffffffffffda RBX: 0000563d60680570 RCX: 00007f932f1f46ca [ 2.281208] RDX: 00007f932eaabcb5 RSI: 000000000057dfb0 RDI: 0000563d61064370 [ 2.281209] RBP: 00007f932eaabcb5 R08: 0000000000000006 R09: 0000000800000001 [ 2.281209] R10: 0000000000000005 R11: 0000000000000246 R12: 0000563d61064370 [ 2.281210] R13: 0000563d6069b200 R14: 0000000000020000 R15: 00007ffc090ccee0 [ 2.281211] Code: 48 c7 c7 42 7d 11 c1 52 4c 8b 4c 24 58 48 c7 c2 e8 02 11 c1 44 8b 44 24 50 e8 ef c1 9c ff 41 83 7c 24 20 01 58 8b 44 24 08 74 02 <0f> 0b 48 83 c4 10 5b 5d 41 5c 41 5d 41 5e 41 5f c3 c7 44 24 0c [ 2.281229] ---[ end trace eb239795106c8f7c ]--- ---cut, see full dmesg During runtime, the graphics freezes. I can still login using ssh: [ 1112.083668] amdgpu 0000:04:00.0: [gfxhub] VMC page fault (src_id:0 ring:24 vm_id:4 pas_id:0) [ 1112.083677] amdgpu 0000:04:00.0: at page 0x0000000103c18000 from 27 [ 1112.083679] amdgpu 0000:04:00.0: VM_L2_PROTECTION_FAULT_STATUS:0x00401031 [ 1112.083686] amdgpu 0000:04:00.0: [gfxhub] VMC page fault (src_id:0 ring:24 vm_id:4 pas_id:0) [ 1112.083689] amdgpu 0000:04:00.0: at page 0x0000000103c16000 from 27 [ 1112.083691] amdgpu 0000:04:00.0: VM_L2_PROTECTION_FAULT_STATUS:0x00000000 [ 1112.083697] amdgpu 0000:04:00.0: [gfxhub] VMC page fault (src_id:0 ring:24 vm_id:4 pas_id:0) [ 1112.083699] amdgpu 0000:04:00.0: at page 0x0000000103c01000 from 27 [ 1112.083701] amdgpu 0000:04:00.0: VM_L2_PROTECTION_FAULT_STATUS:0x00000000 ---cut, see full dmesg [ 1475.551038] Call Trace: [ 1475.551049] ? __schedule+0x24b/0x8c0 [ 1475.551054] schedule+0x32/0x90 [ 1475.551057] schedule_timeout+0x213/0x480 [ 1475.551129] ? generic_reg_get+0x21/0x30 [amdgpu] [ 1475.551204] ? tgn10_get_crtc_scanoutpos+0x68/0xa0 [amdgpu] [ 1475.551209] dma_fence_default_wait+0x1ea/0x280 [ 1475.551213] ? dma_fence_default_wait+0x280/0x280 [ 1475.551216] dma_fence_wait_timeout+0x38/0x110 [ 1475.551220] reservation_object_wait_timeout_rcu+0x187/0x360 [ 1475.551294] amdgpu_dm_do_flip+0x109/0x360 [amdgpu] [ 1475.551372] amdgpu_dm_atomic_commit_tail+0x8a1/0x9a0 [amdgpu] [ 1475.551385] commit_tail+0x3d/0x70 [drm_kms_helper] [ 1475.551392] process_one_work+0x1ce/0x410 [ 1475.551395] worker_thread+0x2b/0x3d0 [ 1475.551398] ? process_one_work+0x410/0x410 [ 1475.551400] kthread+0x113/0x130 [ 1475.551403] ? kthread_create_on_node+0x70/0x70 [ 1475.551406] ret_from_fork+0x22/0x40 [ 1475.551471] INFO: task amdgpu_cs:0:734 blocked for more than 120 seconds. [ 1475.551474] Tainted: G WC 4.15.7-1-ARCH #1 [ 1475.551476] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [ 1475.551478] amdgpu_cs:0 D 0 734 731 0x00000000 [ 1475.551481] Call Trace: [ 1475.551485] ? __schedule+0x24b/0x8c0 [ 1475.551492] ? ttm_bo_mem_compat+0x23/0x60 [ttm] [ 1475.551495] schedule+0x32/0x90 [ 1475.551498] schedule_timeout+0x213/0x480 [ 1475.551500] ? _raw_spin_lock+0x13/0x40 [ 1475.551502] ? _raw_spin_unlock+0x16/0x30 [ 1475.551551] ? amdgpu_vm_update_directories+0x475/0x600 [amdgpu] [ 1475.551555] dma_fence_default_wait+0x1ea/0x280 [ 1475.551557] ? dma_fence_default_wait+0x280/0x280 [ 1475.551560] dma_fence_wait_timeout+0x38/0x110 [ 1475.551610] amdgpu_ctx_wait_prev_fence+0x49/0x80 [amdgpu] [ 1475.551661] amdgpu_cs_ioctl+0x2a4/0x1b20 [amdgpu] [ 1475.551667] ? dequeue_entity+0x389/0x990 [ 1475.551718] ? amdgpu_cs_find_mapping+0xc0/0xc0 [amdgpu] [ 1475.551735] drm_ioctl_kernel+0x5b/0xb0 [drm] [ 1475.551751] drm_ioctl+0x2d5/0x370 [drm] [ 1475.551799] ? amdgpu_cs_find_mapping+0xc0/0xc0 [amdgpu] [ 1475.551843] amdgpu_drm_ioctl+0x49/0x80 [amdgpu] [ 1475.551850] do_vfs_ioctl+0xa4/0x630 [ 1475.551856] ? SyS_futex+0x12d/0x180 [ 1475.551859] SyS_ioctl+0x74/0x80 [ 1475.551865] do_syscall_64+0x74/0x190 [ 1475.551868] entry_SYSCALL_64_after_hwframe+0x3d/0xa2 ---cut, see full dmesg -- You are receiving this mail because: You are the assignee for the bug.

1 11

[PATCH][next] drm/amd/pp: remove redundant pointer internal_buf
by Colin King 14 Mar '18

14 Mar '18

From: Colin Ian King <colin.king(a)canonical.com> The pointer internal_buf is assigned a value but the pointer is never read, hence it is redundant and can be removed. Cleans up clang warning: drivers/gpu/drm/amd/amdgpu/../powerplay/smumgr/smu7_smumgr.c:630:2: warning: Value stored to 'internal_buf' is never read Signed-off-by: Colin Ian King <colin.king(a)canonical.com> --- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c index 7394bb46b8b2..dcb151cabc00 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c @@ -585,7 +585,6 @@ int smu7_setup_pwr_virus(struct pp_hwmgr *hwmgr) int smu7_init(struct pp_hwmgr *hwmgr) { struct smu7_smumgr *smu_data; - uint8_t *internal_buf; uint64_t mc_addr = 0; int r; /* Allocate memory for backend private data */ @@ -627,7 +626,6 @@ int smu7_init(struct pp_hwmgr *hwmgr) &smu_data->header_buffer.kaddr); return -EINVAL; } - internal_buf = smu_data->smu_buffer.kaddr; smu_data->smu_buffer.mc_addr = mc_addr; if (smum_is_hw_avfs_present(hwmgr)) -- 2.15.1

2 1

[PATCH] drm/i915/pmu: Work around compiler warnings on some kernel configs
by Tvrtko Ursulin 14 Mar '18

14 Mar '18

From: Tvrtko Ursulin <tvrtko.ursulin(a)intel.com> Arnd Bergman reports: """ The conditional spinlock confuses gcc into thinking the 'flags' value might contain uninitialized data: drivers/gpu/drm/i915/i915_pmu.c: In function '__i915_pmu_event_read': arch/x86/include/asm/paravirt_types.h:573:3: error: 'flags' may be used uninitialized in this function [-Werror=maybe-uninitialized] The code is correct, but it's easy to see how the compiler gets confused here. This avoids the problem by pulling the lock outside of the function into its only caller. """ On deeper look it seems this is caused by paravirt spinlocks implementation when CONFIG_PARAVIRT_DEBUG is set, which by being complicated, manages to convince gcc locked parameter can be changed externally (impossible). Work around it by removing the conditional locking parameters altogether. (It was never the most elegant code anyway.) Slight penalty we now pay is an additional irqsave spin lock/unlock cycle on the event enable path. But since enable is not a fast path, that is preferrable to the alternative solution which was doing MMIO under irqsave spinlock. Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin(a)intel.com> Reported-by: Arnd Bergmann <arnd(a)arndb.de> Fixes: 1fe699e30113 ("drm/i915/pmu: Fix sleep under atomic in RC6 readout") Cc: Tvrtko Ursulin <tvrtko.ursulin(a)intel.com> Cc: Chris Wilson <chris(a)chris-wilson.co.uk> Cc: Imre Deak <imre.deak(a)intel.com> Cc: Jani Nikula <jani.nikula(a)linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen(a)linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi(a)intel.com> Cc: David Airlie <airlied(a)linux.ie> Cc: intel-gfx(a)lists.freedesktop.org Cc: dri-devel(a)lists.freedesktop.org --- drivers/gpu/drm/i915/i915_pmu.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_pmu.c b/drivers/gpu/drm/i915/i915_pmu.c index 4bc7aefa9541..11fb76bd3860 100644 --- a/drivers/gpu/drm/i915/i915_pmu.c +++ b/drivers/gpu/drm/i915/i915_pmu.c @@ -412,7 +412,7 @@ static u64 __get_rc6(struct drm_i915_private *i915) return val; } -static u64 get_rc6(struct drm_i915_private *i915, bool locked) +static u64 get_rc6(struct drm_i915_private *i915) { #if IS_ENABLED(CONFIG_PM) unsigned long flags; @@ -428,8 +428,7 @@ static u64 get_rc6(struct drm_i915_private *i915, bool locked) * previously. */ - if (!locked) - spin_lock_irqsave(&i915->pmu.lock, flags); + spin_lock_irqsave(&i915->pmu.lock, flags); if (val >= i915->pmu.sample[__I915_SAMPLE_RC6_ESTIMATED].cur) { i915->pmu.sample[__I915_SAMPLE_RC6_ESTIMATED].cur = 0; @@ -438,12 +437,10 @@ static u64 get_rc6(struct drm_i915_private *i915, bool locked) val = i915->pmu.sample[__I915_SAMPLE_RC6_ESTIMATED].cur; } - if (!locked) - spin_unlock_irqrestore(&i915->pmu.lock, flags); + spin_unlock_irqrestore(&i915->pmu.lock, flags); } else { struct pci_dev *pdev = i915->drm.pdev; struct device *kdev = &pdev->dev; - unsigned long flags2; /* * We are runtime suspended. @@ -452,10 +449,8 @@ static u64 get_rc6(struct drm_i915_private *i915, bool locked) * on top of the last known real value, as the approximated RC6 * counter value. */ - if (!locked) - spin_lock_irqsave(&i915->pmu.lock, flags); - - spin_lock_irqsave(&kdev->power.lock, flags2); + spin_lock_irqsave(&i915->pmu.lock, flags); + spin_lock(&kdev->power.lock); if (!i915->pmu.sample[__I915_SAMPLE_RC6_ESTIMATED].cur) i915->pmu.suspended_jiffies_last = @@ -465,14 +460,13 @@ static u64 get_rc6(struct drm_i915_private *i915, bool locked) i915->pmu.suspended_jiffies_last; val += jiffies - kdev->power.accounting_timestamp; - spin_unlock_irqrestore(&kdev->power.lock, flags2); + spin_unlock(&kdev->power.lock); val = jiffies_to_nsecs(val); val += i915->pmu.sample[__I915_SAMPLE_RC6].cur; i915->pmu.sample[__I915_SAMPLE_RC6_ESTIMATED].cur = val; - if (!locked) - spin_unlock_irqrestore(&i915->pmu.lock, flags); + spin_unlock_irqrestore(&i915->pmu.lock, flags); } return val; @@ -481,7 +475,7 @@ static u64 get_rc6(struct drm_i915_private *i915, bool locked) #endif } -static u64 __i915_pmu_event_read(struct perf_event *event, bool locked) +static u64 __i915_pmu_event_read(struct perf_event *event) { struct drm_i915_private *i915 = container_of(event->pmu, typeof(*i915), pmu.base); @@ -519,7 +513,7 @@ static u64 __i915_pmu_event_read(struct perf_event *event, bool locked) val = count_interrupts(i915); break; case I915_PMU_RC6_RESIDENCY: - val = get_rc6(i915, locked); + val = get_rc6(i915); break; } } @@ -534,7 +528,7 @@ static void i915_pmu_event_read(struct perf_event *event) again: prev = local64_read(&hwc->prev_count); - new = __i915_pmu_event_read(event, false); + new = __i915_pmu_event_read(event); if (local64_cmpxchg(&hwc->prev_count, prev, new) != prev) goto again; @@ -584,14 +578,14 @@ static void i915_pmu_enable(struct perf_event *event) engine->pmu.enable_count[sample]++; } + spin_unlock_irqrestore(&i915->pmu.lock, flags); + /* * Store the current counter value so we can report the correct delta * for all listeners. Even when the event was already enabled and has * an existing non-zero value. */ - local64_set(&event->hw.prev_count, __i915_pmu_event_read(event, true)); - - spin_unlock_irqrestore(&i915->pmu.lock, flags); + local64_set(&event->hw.prev_count, __i915_pmu_event_read(event)); } static void i915_pmu_disable(struct perf_event *event) -- 2.14.1

2 1

[PATCH] drm/panel: rm68200: add backlight dependency
by Arnd Bergmann 14 Mar '18

14 Mar '18

Like many other panel drivers, this one fails to build when backlight support is disabled: drivers/gpu/drm/panel/panel-raydium-rm68200.o: In function `rm68200_probe': panel-raydium-rm68200.c:(.text+0x14a): undefined reference to `devm_of_find_backlight' This adds the appropriate dependency. Fixes: 2b7ed18bed1a ("drm/panel: Add support for Raydium RM68200 panel driver") Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- drivers/gpu/drm/panel/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig index 077bc58c1913..25682ff3449a 100644 --- a/drivers/gpu/drm/panel/Kconfig +++ b/drivers/gpu/drm/panel/Kconfig @@ -112,6 +112,7 @@ config DRM_PANEL_RAYDIUM_RM68200 tristate "Raydium RM68200 720x1280 DSI video mode panel" depends on OF depends on DRM_MIPI_DSI + depends on BACKLIGHT_CLASS_DEVICE help Say Y here if you want to enable support for Raydium RM68200 720x1280 DSI video mode panel. -- 2.9.0

2 3

[PATCH v2] drm/sun4i: Handle DRM_BUS_FLAG_PIXDATA_*EDGE
by Giulio Benetti 14 Mar '18

14 Mar '18

Handle both positive and negative dclk polarity, according to bus_flags, taking care of this: On A20 and similar SoCs, the only way to achieve Positive Edge (Rising Edge), is setting dclk clock phase to 2/3(240°). By default TCON works in Negative Edge(Falling Edge), this is why phase is set to 0 in that case. Unfortunately there's no way to logically invert dclk through IO_POL register. The only acceptable way to work, triple checked with scope, is using clock phase set to 0° for Negative Edge and set to 240° for Positive Edge. On A33 and similar SoCs there would be a 90° phase option, but it divides also dclk by 2. This patch is a way to avoid quirks all around TCON and DOTCLOCK drivers for using A33 90° phase divided by 2 and consequently increase code complexity. Signed-off-by: Giulio Benetti <giulio.benetti(a)micronovasrl.com> --- drivers/gpu/drm/sun4i/sun4i_tcon.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c index 8ee87c2..3f1455d 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c @@ -17,6 +17,7 @@ #include <drm/drm_encoder.h> #include <drm/drm_modes.h> #include <drm/drm_of.h> +#include <drm/drm_panel.h> #include <uapi/drm/drm_mode.h> @@ -345,6 +346,9 @@ static void sun4i_tcon0_mode_set_lvds(struct sun4i_tcon *tcon, static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon, const struct drm_display_mode *mode) { + struct drm_panel *panel = tcon->panel; + struct drm_connector *connector = panel->connector; + struct drm_display_info display_info = connector->display_info; unsigned int bp, hsync, vsync; u8 clk_delay; u32 val = 0; @@ -400,6 +404,27 @@ static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon, if (mode->flags & DRM_MODE_FLAG_PVSYNC) val |= SUN4I_TCON0_IO_POL_VSYNC_POSITIVE; + /* + * On A20 and similar SoCs, the only way to achieve Positive Edge + * (Rising Edge), is setting dclk clock phase to 2/3(240°). + * By default TCON works in Negative Edge(Falling Edge), + * this is why phase is set to 0 in that case. + * Unfortunately there's no way to logically invert dclk through + * IO_POL register. + * The only acceptable way to work, triple checked with scope, + * is using clock phase set to 0° for Negative Edge and set to 240° + * for Positive Edge. + * On A33 and similar SoCs there would be a 90° phase option, + * but it divides also dclk by 2. + * Following code is a way to avoid quirks all around TCON + * and DOTCLOCK drivers. + */ + if (display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_POSEDGE) + clk_set_phase(tcon->dclk, 240); + + if (display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_NEGEDGE) + clk_set_phase(tcon->dclk, 0); + regmap_update_bits(tcon->regs, SUN4I_TCON0_IO_POL_REG, SUN4I_TCON0_IO_POL_HSYNC_POSITIVE | SUN4I_TCON0_IO_POL_VSYNC_POSITIVE, val); -- 2.7.4

2 1

[PATCH v2] drm/sun4i: move rgb mode_valid from connector to encoder
by Giulio Benetti 14 Mar '18

14 Mar '18

mode_valid function must be connected to encoder. Otherwise it could get not be called by drm in the case there's a bridge connected to encoder instead of a panel. Move mode_valid function pointer to encoder helper functions, changing its prototype according to encoder helper function pointer. Signed-off-by: Giulio Benetti <giulio.benetti(a)micronovasrl.com> --- drivers/gpu/drm/sun4i/sun4i_rgb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/sun4i/sun4i_rgb.c b/drivers/gpu/drm/sun4i/sun4i_rgb.c index b8da5a5..f2fa1f2 100644 --- a/drivers/gpu/drm/sun4i/sun4i_rgb.c +++ b/drivers/gpu/drm/sun4i/sun4i_rgb.c @@ -52,10 +52,10 @@ static int sun4i_rgb_get_modes(struct drm_connector *connector) return drm_panel_get_modes(tcon->panel); } -static int sun4i_rgb_mode_valid(struct drm_connector *connector, - struct drm_display_mode *mode) +static enum drm_mode_status sun4i_rgb_mode_valid(struct drm_encoder *crtc, + const struct drm_display_mode *mode) { - struct sun4i_rgb *rgb = drm_connector_to_sun4i_rgb(connector); + struct sun4i_rgb *rgb = drm_encoder_to_sun4i_rgb(crtc); struct sun4i_tcon *tcon = rgb->tcon; u32 hsync = mode->hsync_end - mode->hsync_start; u32 vsync = mode->vsync_end - mode->vsync_start; @@ -108,7 +108,6 @@ static int sun4i_rgb_mode_valid(struct drm_connector *connector, static struct drm_connector_helper_funcs sun4i_rgb_con_helper_funcs = { .get_modes = sun4i_rgb_get_modes, - .mode_valid = sun4i_rgb_mode_valid, }; static void @@ -158,6 +157,7 @@ static void sun4i_rgb_encoder_disable(struct drm_encoder *encoder) static struct drm_encoder_helper_funcs sun4i_rgb_enc_helper_funcs = { .disable = sun4i_rgb_encoder_disable, .enable = sun4i_rgb_encoder_enable, + .mode_valid = sun4i_rgb_mode_valid, }; static void sun4i_rgb_enc_destroy(struct drm_encoder *encoder) -- 2.7.4

2 1

[GIT PULL] omapdrm changes for v4.17, try 2
by Tomi Valkeinen 14 Mar '18

14 Mar '18

Hi Dave, Here's the omapdrm pull request with the compile errors fixed. I found another one while going through different kconfig combinations. Sorry about those. I think it's time to build a script to compile with all the possible combinations... Tomi The following changes since commit f073d78eeb8efd85718e611c15f9a78647751dea: Merge tag 'drm-intel-next-2018-02-21' of git://anongit.freedesktop.org/drm/drm-intel into drm-next (2018-03-01 14:07:22 +1000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git tags/omapdrm-4.17 for you to fetch changes up to 037f03155b7d87e85168b4296516bfda5c9f6380: drm/omap: fix compile error when DPI is disabled (2018-03-14 10:39:50 +0200) ---------------------------------------------------------------- omapdrm patches for v4.17 * Fix sparse warnings from omapdrm * HPD support for DVI connector * Big cleanup to remove static variables ---------------------------------------------------------------- Benoit Parrot (2): drm/omap: dispc: disp_wb_setup to check return code drm/omap: Add pclk setting case when channel is DSS_WB Jyri Sarha (1): drm/omap: Allow HDMI audio setup even if we do not have video configured Laurent Pinchart (46): drm: omapdrm: Use kernel integer types drm: omapdrm: Use unsigned int type drm: omapdrm: connector-analog-tv: Remove tvc_of_match forward declaration drm: omapdrm: displays: Remove OF node check in connector drivers drm: omapdrm: displays: Remove OF node check in encoder drivers drm: omapdrm: displays: Remove OF node check in panel drivers drm: omapdrm: displays: Get connector source at connect time drm: omapdrm: displays: Get panel source at connect time drm: omapdrm: displays: Get encoder source at connect time drm: omapdrm: dss: Make omapdss_default_get_timings static drm: omapdrm: dss: Don't export functions internal to omapdss-base drm: omapdrm: dss: Move initialization code from component bind to probe drm: omapdrm: dss: Remove dss_get_hdmi_venc_clk_source() function drm: omapdrm: dss: Remove unused functions prototypes drm: omapdrm: dsi: Make wait_for_bit_change() return a status drm: omapdrm: Split init and cleanup from probe and remove functions drm: omapdrm: dss: Expose DSS data in a dss_device structure drm: omapdrm: dss: Pass DSS private structure to runtime PM functions drm: omapdrm: dss: Pass PLL pointer to dss_ctrl_pll_enable() drm: omapdrm: dss: Pass DSS pointer to dss_sdi_*() functions drm: omapdrm: dss: Pass DSS pointer to dss_ops operations drm: omapdrm: dss: Pass DSS pointer to dss_get_*_clk_source() drm: omapdrm: dss: Pass DSS pointer to dss clock functions drm: omapdrm: dss: Pass DSS pointer to remaining dss functions drm: omapdrm: dss: Allocate the DSS private data structure dynamically drm: omapdrm: dss: Support passing private data to debugfs show handlers drm: omapdrm: dss: Store the registered plls array in struct dss_device drm: omapdrm: dss: Store the debugfs root directory in struct dss_device drm: omapdrm: dss: Don't unnecessarily cast to dev to pdev and back drm: omapdrm: dsi: Pass the dsi_data pointer to internal functions drm: omapdrm: dsi: Combine two commonly used inline functions drm: omapdrm: dsi: Use dev pointer directly in dsi_bind() function drm: omapdrm: dsi: Store the struct device pointer in struct dsi_data drm: omapdrm: dsi: Don't pass channel to dispc init/uninit functions drm: omapdrm: dss: Pass omap_dss_device pointer to dss_mgr_*() functions drm: omapdrm: dss: Pass omap_drm_private pointer to dss_mgr_ops drm: omapdrm: dss: Store DSS device pointer in the omapdrm private data drm: omapdrm: dss: Store dispc ops in dss_device structure drm: omapdrm: dispc: Pass DISPC pointer to dispc_ops operations drm: omapdrm: dispc: Pass DISPC pointer to remaining dispc API functions drm: omapdrm: dispc: Allocate the dispc private data structure dynamically drm: omapdrm: hdmi4: Allocate the omap_hdmi data structure dynamically drm: omapdrm: hdmi5: Allocate the omap_hdmi data structure dynamically drm: omapdrm: sdi: Allocate the sdi private data structure dynamically drm: omapdrm: venc: Allocate the venc private data structure dynamically drm: omapdrm: displays: panel-dsi-cm: Fix field access before set Peter Ujfalusi (1): drm/omap: Init fbdev emulation only when we have displays Tomi Valkeinen (19): drm/omap: reorganize locking in mgr_fld_write drm/omap: acx565akm: use __be32 when reading status drm/omap: fbdev: use 'screen_buffer' field drm/omap: fbdev: avoid double initializer entry drm/omap: fix omap_fbdev_free() when omap_fbdev_create() wasn't called drm/omap: cleanup fbdev init/free drm/omap: add HPD support to connector-dvi dt-bindings: display: add HPD gpio to DVI connector drm/omap: remove leftover enums drm/omap: set WB channel-in in wb_setup() drm/omap: fix WBDELAYCOUNT for HDMI drm/omap: fix WBDELAYCOUNT with interlace drm/omap: fix WB height with interlace drm/omap: fix scaling limits for WB drm/omap: add writeback funcs to dispc_ops drm/omap: fix maximum sizes drm/omap: cleanup color space conversion drm/omap: fix compile error when debugfs is disabled drm/omap: fix compile error when DPI is disabled .../bindings/display/connector/dvi-connector.txt | 1 + .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 50 +- drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 146 +- drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 40 +- drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 40 +- drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 39 +- .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 69 +- drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 37 +- drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 44 +- .../omapdrm/displays/panel-lgphilips-lb035q02.c | 38 +- .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 42 +- .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 38 +- .../drm/omapdrm/displays/panel-sony-acx565akm.c | 41 +- .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 49 +- .../drm/omapdrm/displays/panel-tpo-td043mtea1.c | 32 +- drivers/gpu/drm/omapdrm/dss/base.c | 27 +- drivers/gpu/drm/omapdrm/dss/dispc.c | 2346 +++++++++++--------- drivers/gpu/drm/omapdrm/dss/display.c | 5 +- drivers/gpu/drm/omapdrm/dss/dpi.c | 91 +- drivers/gpu/drm/omapdrm/dss/dsi.c | 1553 ++++++------- drivers/gpu/drm/omapdrm/dss/dss-of.c | 2 - drivers/gpu/drm/omapdrm/dss/dss.c | 823 +++---- drivers/gpu/drm/omapdrm/dss/dss.h | 245 +- drivers/gpu/drm/omapdrm/dss/hdmi.h | 11 +- drivers/gpu/drm/omapdrm/dss/hdmi4.c | 406 ++-- drivers/gpu/drm/omapdrm/dss/hdmi4_cec.c | 4 +- drivers/gpu/drm/omapdrm/dss/hdmi4_core.h | 4 +- drivers/gpu/drm/omapdrm/dss/hdmi5.c | 418 ++-- drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 24 +- drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 2 +- drivers/gpu/drm/omapdrm/dss/hdmi_pll.c | 15 +- drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 2 +- drivers/gpu/drm/omapdrm/dss/omapdss.h | 213 +- drivers/gpu/drm/omapdrm/dss/output.c | 53 +- drivers/gpu/drm/omapdrm/dss/pll.c | 44 +- drivers/gpu/drm/omapdrm/dss/sdi.c | 162 +- drivers/gpu/drm/omapdrm/dss/venc.c | 453 ++-- drivers/gpu/drm/omapdrm/dss/video-pll.c | 19 +- drivers/gpu/drm/omapdrm/omap_crtc.c | 74 +- drivers/gpu/drm/omapdrm/omap_crtc.h | 4 +- drivers/gpu/drm/omapdrm/omap_dmm_priv.h | 10 +- drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 46 +- drivers/gpu/drm/omapdrm/omap_dmm_tiler.h | 22 +- drivers/gpu/drm/omapdrm/omap_drv.c | 122 +- drivers/gpu/drm/omapdrm/omap_drv.h | 8 +- drivers/gpu/drm/omapdrm/omap_fb.c | 18 +- drivers/gpu/drm/omapdrm/omap_fbdev.c | 38 +- drivers/gpu/drm/omapdrm/omap_fbdev.h | 9 +- drivers/gpu/drm/omapdrm/omap_gem.c | 41 +- drivers/gpu/drm/omapdrm/omap_gem.h | 16 +- drivers/gpu/drm/omapdrm/omap_irq.c | 38 +- drivers/gpu/drm/omapdrm/omap_irq.h | 2 +- drivers/gpu/drm/omapdrm/omap_plane.c | 16 +- drivers/gpu/drm/omapdrm/tcm-sita.c | 12 +- drivers/gpu/drm/omapdrm/tcm.h | 4 +- 55 files changed, 4277 insertions(+), 3831 deletions(-) -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

1 0

[PATCH v2 00/11] R-Car DU Interlaced support through VSP1
by Kieran Bingham 14 Mar '18

14 Mar '18

The Gen3 R-Car DU devices make use of the VSP to handle frame processing. In this series we implement support for handling interlaced pipelines by using the auto-fld feature of the VSP hardware. The implementation is preceded by some cleanup work and refactoring, through patches 1 to 6. These are trivial and could be collected earlier and independently if this series requires further revisions. Patch 7 makes a key distinctive change to remove all existing support for headerless display lists throughout the VSP1 driver, and ensures that all pipelines use the same code path. This simplifies the code and reduces opportunity for untested code paths to exist. Patches 8, 9 and 10 implement the relevant support in the VSP1 driver, before patch 11 finally enables the feature through the drm R-Car DU driver. This series is based upon my previous TLB optimise and body rework (v7), and is available from the following URL: git://git.kernel.org/pub/scm/linux/kernel/git/kbingham/rcar.git tags/vsp1/du/interlaced/v2 ChangeLog: v2: - media: vsp1: use kernel __packed for structures became: media: vsp1: Remove packed attributes from aligned structures - media: vsp1: Add support for extended display list headers - No longer declares structs __packed - media: vsp1: Provide support for extended command pools - Fix spelling typo in commit message - constify, and staticify the instantiation of vsp1_extended_commands - s/autfld_cmds/autofld_cmds/ - staticify cmd pool functions (Thanks kbuild-bot) - media: vsp1: Support Interlaced display pipelines - fix erroneous BIT value which enabled interlaced - fix field handling at frame_end interrupt Kieran Bingham (11): media: vsp1: drm: Fix minor grammar error media: vsp1: Remove packed attributes from aligned structures media: vsp1: Rename dl_child to dl_next media: vsp1: Remove unused display list structure field media: vsp1: Clean up DLM objects on error media: vsp1: Provide VSP1 feature helper macro media: vsp1: Use header display lists for all WPF outputs linked to the DU media: vsp1: Add support for extended display list headers media: vsp1: Provide support for extended command pools media: vsp1: Support Interlaced display pipelines drm: rcar-du: Support interlaced video output through vsp1 drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 1 +- drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 3 +- drivers/media/platform/vsp1/vsp1.h | 3 +- drivers/media/platform/vsp1/vsp1_dl.c | 406 +++++++++++++++++++------ drivers/media/platform/vsp1/vsp1_dl.h | 32 +- drivers/media/platform/vsp1/vsp1_drm.c | 13 +- drivers/media/platform/vsp1/vsp1_drv.c | 23 +- drivers/media/platform/vsp1/vsp1_regs.h | 6 +- drivers/media/platform/vsp1/vsp1_rpf.c | 72 +++- drivers/media/platform/vsp1/vsp1_rwpf.h | 1 +- drivers/media/platform/vsp1/vsp1_wpf.c | 6 +- include/media/vsp1.h | 1 +- 12 files changed, 455 insertions(+), 112 deletions(-) base-commit: 397eb3811ec096d0ceefa1dbea2d0ae68feb0587 -- git-series 0.9.1

2 12

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel March 2018