dri-devel December 2017

dri-devel@lists.freedesktop.org

236 participants
1514 discussions

nouveau: refcount_t splat on 4.15-rc1 on nv50
by Adam Borowski 02 Dec '17

02 Dec '17

Hi guys! I'm getting the following warn on 4.15-rc1, on GTX 560 Ti: [ 9.430433] nouveau 0000:01:00.0: NVIDIA GF114 (0ce000a1) ... [ 9.585172] nouveau 0000:01:00.0: bios: version 70.24.2e.00.02 ... [ 9.772204] nouveau 0000:01:00.0: fb: 1024 MiB GDDR5 [ 9.777342] ------------[ cut here ]------------ [ 9.782106] refcount_t: increment on 0; use-after-free. [ 9.787522] WARNING: CPU: 0 PID: 3 at lib/refcount.c:153 refcount_inc+0x30/0x50 [ 9.795060] Modules linked in: sha256_generic cfg80211(+) rfkill snd_usb_audio snd_usbmidi_lib nouveau(+) video ttm [ 9.805756] CPU: 0 PID: 3 Comm: kworker/0:0 Not tainted 4.15.0-rc1-debug-ubsan-00020-gf4707a916107 #1 [ 9.815215] Hardware name: System manufacturer System Product Name/M4A77T, BIOS 2401 05/18/2011 [ 9.824420] Workqueue: events work_for_cpu_fn [ 9.828915] task: ffff880226110c80 task.stack: ffffc90000c80000 [ 9.830647] cfg80211: Loaded X.509 cert 'sforshee: 00b28ddf47aef9cea7' [ 9.841681] RIP: 0010:refcount_inc+0x30/0x50 [ 9.846093] RSP: 0018:ffffc90000c83808 EFLAGS: 00010296 [ 9.851458] RAX: 000000000000002b RBX: 0000000000000000 RCX: 0000000000000000 [ 9.858763] RDX: 0000000000000001 RSI: 0000000000000082 RDI: ffffffff8378eb8c [ 9.866051] RBP: ffff88021f103fd0 R08: 0000000000000199 R09: ffff8800000bd500 [ 9.873330] R10: 0000000000000000 R11: ffffffff82289a80 R12: 0000000000000000 [ 9.880621] R13: ffff8802103a69e0 R14: ffff88021f103fe0 R15: ffff88021f103fe0 [ 9.887909] FS: 0000000000000000(0000) GS:ffff88022fc00000(0000) knlGS:0000000000000000 [ 9.896230] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 9.902117] CR2: 0000560476ba0000 CR3: 0000000225232000 CR4: 00000000000006f0 [ 9.909417] Call Trace: [ 9.912106] nv50_instobj_acquire+0x123/0x1c0 [nouveau] [ 9.917565] ? nvbios_rd08+0x1b/0x70 [nouveau] [ 9.922239] nvkm_instobj_new+0x1e3/0x520 [nouveau] [ 9.927353] ? nvbios_rd08+0x1b/0x70 [nouveau] [ 9.932017] ? nvbios_pll_parse+0x8d7/0xcf0 [nouveau] [ 9.937218] ? kmem_cache_alloc+0x1f0/0x2d0 [ 9.941624] nvkm_memory_new+0x4b/0xc0 [nouveau] [ 9.946461] ? nvkm_longopt+0x17/0x60 [nouveau] [ 9.951208] gf100_fb_oneinit+0x7b/0x1c0 [nouveau] [ 9.956218] nvkm_fb_oneinit+0x89/0x2e0 [nouveau] [ 9.961144] nvkm_subdev_init+0x92/0x600 [nouveau] [ 9.966085] ? ktime_get+0x64/0x110 [ 9.969815] nvkm_device_init+0x169/0x2a0 [nouveau] [ 9.974922] nvkm_udevice_init+0x7e/0xf0 [nouveau] [ 9.979924] nvkm_object_init+0x6a/0x2e0 [nouveau] [ 9.984932] nvkm_ioctl_new+0x198/0x430 [nouveau] [ 9.989846] ? nvif_vmm_init+0x340/0x340 [nouveau] [ 9.994864] ? nvkm_udevice_rd08+0x90/0x90 [nouveau] [ 10.000056] nvkm_ioctl+0x21e/0x5a0 [nouveau] [ 10.004548] ? yield_to+0x2b2/0x370 [ 10.008257] nvif_object_init+0xef/0x1b0 [nouveau] [ 10.013281] nvif_device_init+0x9/0x40 [nouveau] [ 10.018136] nouveau_cli_init+0x234/0x12f0 [nouveau] [ 10.023253] ? idr_alloc_cyclic+0x6c/0x110 [ 10.027487] ? _cond_resched+0x1d/0x80 [ 10.031366] ? kmem_cache_alloc+0x1f0/0x2d0 [ 10.035790] nouveau_drm_load+0x71/0xec0 [nouveau] [ 10.040735] drm_dev_register+0x1b4/0x330 [ 10.044872] ? pci_enable_device_flags+0x155/0x200 [ 10.049806] drm_get_pci_dev+0xde/0x2c0 [ 10.053874] nouveau_drm_probe+0x1b9/0x240 [nouveau] [ 10.058986] ? __pm_runtime_resume+0x68/0xb0 [ 10.063409] local_pci_probe+0x5e/0xf0 [ 10.067300] work_for_cpu_fn+0x10/0x30 [ 10.071183] process_one_work+0x21a/0x670 [ 10.075325] worker_thread+0x256/0x500 [ 10.079208] ? manage_workers+0x1e0/0x1e0 [ 10.083362] kthread+0x169/0x220 [ 10.086730] ? kthread_create_worker_on_cpu+0x40/0x40 [ 10.091933] ret_from_fork+0x1f/0x30 [ 10.095655] Code: ff 84 c0 74 02 5b c3 0f b6 1d 59 b2 a6 01 80 fb 01 77 1c 83 e3 01 75 ed 48 c7 c7 c8 f1 3f 82 c6 05 41 b2 a6 01 01 e8 50 02 8d ff <0f> ff 5b c3 0f b6 f3 48 c7 c7 00 16 c7 82 e8 dd 81 0d 00 eb d3 [ 10.114909] ---[ end trace 08f29138ff4259e6 ]--- [ 10.119703] hpet1: lost 21 rtc interrupts [ 10.125534] ------------[ cut here ]------------ [ 10.130326] refcount_t: underflow; use-after-free. [ 10.135292] WARNING: CPU: 0 PID: 3 at lib/refcount.c:281 refcount_dec_not_one+0x68/0x90 [ 10.143540] Modules linked in: sha256_generic cfg80211 rfkill snd_usb_audio snd_usbmidi_lib nouveau(+) video ttm [ 10.153956] CPU: 0 PID: 3 Comm: kworker/0:0 Tainted: G W 4.15.0-rc1-debug-ubsan-00020-gf4707a916107 #1 [ 10.164719] Hardware name: System manufacturer System Product Name/M4A77T, BIOS 2401 05/18/2011 [ 10.173929] Workqueue: events work_for_cpu_fn [ 10.178423] task: ffff880226110c80 task.stack: ffffc90000c80000 [ 10.184488] RIP: 0010:refcount_dec_not_one+0x68/0x90 [ 10.189580] RSP: 0018:ffffc90000c837f0 EFLAGS: 00010286 [ 10.194946] RAX: 0000000000000026 RBX: 0000000000000000 RCX: 0000000000000000 [ 10.202232] RDX: 0000000000000001 RSI: 0000000000000092 RDI: ffffffff8378eb8c [ 10.209512] RBP: ffff8802103a69e0 R08: 0000000000000199 R09: ffff8800000b9040 [ 10.216801] R10: 0000000000000000 R11: ffffffff82289a80 R12: ffff8802103a69e0 [ 10.224090] R13: ffffffffa025dc20 R14: ffff88021f103f80 R15: ffffffffa0368e60 [ 10.231362] FS: 0000000000000000(0000) GS:ffff88022fc00000(0000) knlGS:0000000000000000 [ 10.239679] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 10.245569] CR2: 0000560476ba0000 CR3: 0000000225232000 CR4: 00000000000006f0 [ 10.252862] Call Trace: [ 10.255433] refcount_dec_and_mutex_lock+0x18/0x70 [ 10.260450] nv50_instobj_release+0x69/0x1a0 [nouveau] [ 10.265834] nvkm_instobj_new+0x219/0x520 [nouveau] [ 10.270935] ? nvbios_rd08+0x1b/0x70 [nouveau] [ 10.275598] ? nvbios_pll_parse+0x8d7/0xcf0 [nouveau] [ 10.280807] ? kmem_cache_alloc+0x1f0/0x2d0 [ 10.285205] nvkm_memory_new+0x4b/0xc0 [nouveau] [ 10.290042] ? nvkm_longopt+0x17/0x60 [nouveau] [ 10.294808] gf100_fb_oneinit+0x7b/0x1c0 [nouveau] [ 10.299818] nvkm_fb_oneinit+0x89/0x2e0 [nouveau] [ 10.304733] nvkm_subdev_init+0x92/0x600 [nouveau] [ 10.309667] ? ktime_get+0x64/0x110 [ 10.313394] nvkm_device_init+0x169/0x2a0 [nouveau] [ 10.318512] nvkm_udevice_init+0x7e/0xf0 [nouveau] [ 10.323524] nvkm_object_init+0x6a/0x2e0 [nouveau] [ 10.328539] nvkm_ioctl_new+0x198/0x430 [nouveau] [ 10.333464] ? nvif_vmm_init+0x340/0x340 [nouveau] [ 10.338506] ? nvkm_udevice_rd08+0x90/0x90 [nouveau] [ 10.343691] nvkm_ioctl+0x21e/0x5a0 [nouveau] [ 10.348190] ? yield_to+0x2b2/0x370 [ 10.351891] nvif_object_init+0xef/0x1b0 [nouveau] [ 10.356914] nvif_device_init+0x9/0x40 [nouveau] [ 10.361761] nouveau_cli_init+0x234/0x12f0 [nouveau] [ 10.366876] ? idr_alloc_cyclic+0x6c/0x110 [ 10.371120] ? _cond_resched+0x1d/0x80 [ 10.375000] ? kmem_cache_alloc+0x1f0/0x2d0 [ 10.379405] nouveau_drm_load+0x71/0xec0 [nouveau] [ 10.384340] drm_dev_register+0x1b4/0x330 [ 10.388488] ? pci_enable_device_flags+0x155/0x200 [ 10.393411] drm_get_pci_dev+0xde/0x2c0 [ 10.397482] nouveau_drm_probe+0x1b9/0x240 [nouveau] [ 10.402583] ? __pm_runtime_resume+0x68/0xb0 [ 10.407001] local_pci_probe+0x5e/0xf0 [ 10.410890] work_for_cpu_fn+0x10/0x30 [ 10.414780] process_one_work+0x21a/0x670 [ 10.418925] worker_thread+0x256/0x500 [ 10.422816] ? manage_workers+0x1e0/0x1e0 [ 10.426967] kthread+0x169/0x220 [ 10.430328] ? kthread_create_worker_on_cpu+0x40/0x40 [ 10.435524] ret_from_fork+0x1f/0x30 [ 10.439246] Code: da eb ea 31 c0 eb eb 0f b6 1d ce b0 a6 01 80 fb 01 77 2c 83 e3 01 75 d5 48 c7 c7 f8 f1 3f 82 c6 05 b6 b0 a6 01 01 e8 c8 00 8d ff <0f> ff eb be 31 f6 48 c7 c7 a0 14 c7 82 e8 a6 7d 0d 00 eb 91 0f [ 10.458480] ---[ end trace 08f29138ff4259e7 ]--- Appears to be benign: no obvious breakage afterwards. I did not yet bisect -- would you want me to? Meow! -- < darkling> When all you have is a hammock, every problem looks like a nap.

1 0

[Bug 104037] [drm] GPU HANG: ecode 9:0:0x87f9bffb, in Xorg [1688], reason: Hang on rcs0, action: reset
by bugzilla-daemon＠freedesktop.org 02 Dec '17

02 Dec '17

1 0

[Bug 103808] [radeonsi, bisected] World of Warcraft scribbling all over screen
by bugzilla-daemon＠freedesktop.org 02 Dec '17

02 Dec '17

https://bugs.freedesktop.org/show_bug.cgi?id=103808 Bug ID: 103808 Summary: [radeonsi, bisected] World of Warcraft scribbling all over screen Product: Mesa Version: git Hardware: x86-64 (AMD64) OS: Linux (All) Status: NEW Severity: normal Priority: medium Component: Drivers/Gallium/radeonsi Assignee: dri-devel(a)lists.freedesktop.org Reporter: rankincj(a)googlemail.com QA Contact: dri-devel(a)lists.freedesktop.org OpenGL renderer string: AMD BONAIRE (DRM 2.50.0 / 4.13.13, LLVM 6.0.0) OpenGL core profile version string: 3.3 Mesa 17.4.0-devel (git-4b0dc098b2) Now that Fedora has upgraded to libdrm-2.4.88, I have discovered that World of Warcraft now has huge screen corruption with Mesa-git. A git bisect has identified this commit as the culprit: 4b0dc098b2561c07c59f7dab2813640a25789bf1 is the first bad commit commit 4b0dc098b2561c07c59f7dab2813640a25789bf1 Author: Marek Olšák <marek.olsak(a)amd.com> Date: Thu Nov 2 00:00:53 2017 +0100 gallium/u_threaded: don't map big VRAM buffers for the first upload directly This improves Paraview "many spheres" performance 4x along with the radeonsi commit. Reviewed-by: Nicolai Hähnle <nicolai.haehnle(a)amd.com> :040000 040000 7b3cd35a0bc5923f724cfb9d936f7a88ea808c8a 300c7a5176280a410796121ac66c04a3b39b9bc9 M src WoW continues to run, but UI elements in particular disappear and are replaced with scribbles across the screen, which itself flickers and flashes. -- You are receiving this mail because: You are the assignee for the bug.

1 13

[PATCH v3 0/5] Update ROCKCHIP DSI driver that uses dw-mipi-dsi bridge
by Nickey Yang 01 Dec '17

01 Dec '17

We now have a generic dw-mipi-dsi bridge driver.So we send this patchs to moving rockchip dw-mipi-dsi driver to that in order to add new features(dual mipi support). Update ROCKCHIP DSI controller driver that uses the Synopsys DesignWare MIPI DSI host controller bridge. ChangeLog: v2: add err_pllref、remove unnecessary encoder.enable & disable correct spelling mistakes v3: add Brian's patch "drm/bridge/synopsys: stop clobbering drvdata" (Link:https://patchwork.kernel.org/patch/10078493/) adjust drm/stm/dsi code for above drm/rockchip: Add ROCKCHIP DW MIPI DSI controller driver: call dw_mipi_dsi_unbind() in dw_mipi_dsi_rockchip_unbind() fix typo, use of_device_get_match_data(), change some ‘bind()’ logic into 'probe()' add 'dev_set_drvdata()' Nickey Yang (5): drm/bridge/synopsys: stop clobbering drvdata drm/stm: dsi: Adjust dw_mipi_dsi_probe and remove dt-bindings: display: rockchip: update DSI controller drm/rockchip: Add ROCKCHIP DW MIPI DSI controller driver arm64: dts: rockchip: update mipi node for RK3399 .../display/rockchip/dw_mipi_dsi_rockchip.txt | 23 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 8 +- drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 36 +- drivers/gpu/drm/rockchip/Kconfig | 2 +- drivers/gpu/drm/rockchip/Makefile | 2 +- drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 1349 -------------------- drivers/gpu/drm/rockchip/dw-mipi-dsi_rockchip.c | 764 +++++++++++ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 +- drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 8 +- include/drm/bridge/dw_mipi_dsi.h | 17 +- 11 files changed, 821 insertions(+), 1392 deletions(-) delete mode 100644 drivers/gpu/drm/rockchip/dw-mipi-dsi.c create mode 100644 drivers/gpu/drm/rockchip/dw-mipi-dsi_rockchip.c -- 1.9.1

5 16

[Bug 103829] [CI] igt@gem_busy@close-race - fail - Failed assertion: gem_bo_busy(fd, object[0].handle)
by bugzilla-daemon＠freedesktop.org 01 Dec '17

01 Dec '17

1 0

[PATCH v2 0/8] drm/i915: Implement HDCP
by Sean Paul 01 Dec '17

01 Dec '17

Ok, here's v2 of the HDCP patchset, no longer RFC since I've tackled the TODO list I set out in the first version (Annotated below for convenience). The big changes to take note of in v2 is locking. To account for atomic async + the property's mutability, I'm using a dedicated mutex and moved property setting on the kernel side to the worker. I think this is actually a lot easier to read, and it opens the door to future improvements such as not doing the enable/disable via modeset. TODO: - DONE: Add kerneldoc for property - DONE: Fix '//' comments - DONE: Change to MIT license - DONE: Improve documentation on drm_intel_hdcp_shim - DONE: Fix async commit locking (ie: don't use connection_mutex) - DONE: Don't change connector->state in enable, defer to worker - Rebase on Ville's gmbus fixes (thanks Ville) - Looks like these haven't landed, but I've rebased on drm-intel-next - Add igt coverage for the feature. - Working on this now Thanks! Sean Sean Paul (8): drm: Fix link-status kerneldoc line lengths drm/i915: Add more control to wait_for routines drm: Add Content Protection property drm: Add some HDCP related #defines drm/i915: Add HDCP framework + base implementation drm/i915: Add function to output Aksv over GMBUS drm/i915: Implement HDCP for HDMI drm/i915: Implement HDCP for DisplayPort drivers/gpu/drm/drm_atomic.c | 8 + drivers/gpu/drm/drm_connector.c | 80 ++++- drivers/gpu/drm/drm_sysfs.c | 1 + drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_reg.h | 85 +++++ drivers/gpu/drm/i915/intel_atomic.c | 26 +- drivers/gpu/drm/i915/intel_ddi.c | 64 ++++ drivers/gpu/drm/i915/intel_dp.c | 245 ++++++++++++- drivers/gpu/drm/i915/intel_drv.h | 98 +++++- drivers/gpu/drm/i915/intel_hdcp.c | 684 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_hdmi.c | 254 +++++++++++++ drivers/gpu/drm/i915/intel_i2c.c | 54 ++- drivers/gpu/drm/i915/intel_uncore.c | 23 +- drivers/gpu/drm/i915/intel_uncore.h | 14 +- include/drm/drm_connector.h | 16 + include/drm/drm_dp_helper.h | 17 + include/drm/drm_hdcp.h | 56 +++ include/uapi/drm/drm_mode.h | 4 + 19 files changed, 1697 insertions(+), 34 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_hdcp.c create mode 100644 include/drm/drm_hdcp.h -- 2.15.0.531.g2ccb3012c9-goog

4 18

[PATCH 1/1] drm/amdkfd: Do not ignore requested queue size during allocation
by Jan Vesely 01 Dec '17

01 Dec '17

Signed-off-by: Jan Vesely <jan.vesely(a)rutgers.edu> --- drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c index f1d48281e322..b3bee39661ab 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c @@ -37,15 +37,16 @@ static bool initialize_vi(struct kernel_queue *kq, struct kfd_dev *dev, enum kfd_queue_type type, unsigned int queue_size) { int retval; + unsigned int size = ALIGN(queue_size, PAGE_SIZE); - retval = kfd_gtt_sa_allocate(dev, PAGE_SIZE, &kq->eop_mem); + retval = kfd_gtt_sa_allocate(dev, size, &kq->eop_mem); if (retval != 0) return false; kq->eop_gpu_addr = kq->eop_mem->gpu_addr; kq->eop_kernel_addr = kq->eop_mem->cpu_ptr; - memset(kq->eop_kernel_addr, 0, PAGE_SIZE); + memset(kq->eop_kernel_addr, 0, size); return true; } -- 2.13.6

3 10

[Bug 104003] [IGT] pm_sseu@full-enable fails with assertion: gem.spinfunc
by bugzilla-daemon＠freedesktop.org 01 Dec '17

01 Dec '17

1 0

drm/sun4i: no picture when connected to a 4k display
by Hans Verkuil 01 Dec '17

01 Dec '17

Hi Maxime, Chen-Yu, When I connect my cubieboard running 4.15-rc1 to my 4k display I get no picture. Some digging found that there is no check against the upper pixelclock limit of the HDMI output, so X selects a 4kp60 format at 594 MHz, which obviously won't work. I whipped up the quick patch below, but this information about the max support HDMI frequency should probably come from the device tree. Although for the A10 and A20 I guess it could also be hardcoded in the source since this code is only used for sun4i. Anyway, when I use this patch I get a proper 1080p60 picture. Regards, Hans Signed-off-by: Hans Verkuil <hans.verkuil(a)cisco.com> --- diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c index dda904ec0534..dc2f550f54ff 100644 --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c @@ -208,8 +208,17 @@ static int sun4i_hdmi_get_modes(struct drm_connector *connector) return ret; } +static int sun4i_hdmi_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) +{ + if (mode->clock > 170000) + return MODE_CLOCK_HIGH; + return MODE_OK; +} + static const struct drm_connector_helper_funcs sun4i_hdmi_connector_helper_funcs = { .get_modes = sun4i_hdmi_get_modes, + .mode_valid = sun4i_hdmi_mode_valid, }; static enum drm_connector_status

2 1

[PATCH] drm/etnaviv: make THERMAL selectable
by Philipp Zabel 01 Dec '17

01 Dec '17

Depending on THERMAL || !THERMAL caused a Kconfig dependency loop on x86_64: drivers/gpu/drm/tve200/Kconfig:1:error: recursive dependency detected! For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/gpu/drm/tve200/Kconfig:1: symbol DRM_TVE200 depends on CMA For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" mm/Kconfig:489: symbol CMA is selected by DRM_ETNAVIV For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/gpu/drm/etnaviv/Kconfig:2: symbol DRM_ETNAVIV depends on THERMAL For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/thermal/Kconfig:5: symbol THERMAL is selected by ACPI_VIDEO For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/acpi/Kconfig:189: symbol ACPI_VIDEO is selected by BACKLIGHT_CLASS_DEVICE For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/video/backlight/Kconfig:158: symbol BACKLIGHT_CLASS_DEVICE is selected by DRM_PARADE_PS8622 For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/gpu/drm/bridge/Kconfig:62: symbol DRM_PARADE_PS8622 depends on DRM_BRIDGE For a resolution refer to Documentation/kbuild/kconfig-language.txt subsection "Kconfig recursive dependency limitations" drivers/gpu/drm/bridge/Kconfig:1: symbol DRM_BRIDGE is selected by DRM_TVE200 To work around this, add a new option to make DRM_ETNAVIV select THERMAL instead. Reported-by: Stephen Rothwell <sfr(a)canb.auug.org.au> Fixes: dba536cd9538 ("drm/etnaviv: add THERMAL dependency") Signed-off-by: Philipp Zabel <p.zabel(a)pengutronix.de> --- drivers/gpu/drm/etnaviv/Kconfig | 11 ++++++++++- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 12 +++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/Kconfig b/drivers/gpu/drm/etnaviv/Kconfig index bbf2828ca5768..c446e867b3a24 100644 --- a/drivers/gpu/drm/etnaviv/Kconfig +++ b/drivers/gpu/drm/etnaviv/Kconfig @@ -4,9 +4,9 @@ config DRM_ETNAVIV depends on DRM depends on ARCH_MXC || ARCH_DOVE || (ARM && COMPILE_TEST) depends on MMU - depends on THERMAL || !THERMAL # if THERMAL=m, this can't be 'y' select SHMEM select SYNC_FILE + select THERMAL if DRM_ETNAVIV_THERMAL select TMPFS select WANT_DEV_COREDUMP select CMA if HAVE_DMA_CONTIGUOUS @@ -14,6 +14,15 @@ config DRM_ETNAVIV help DRM driver for Vivante GPUs. +config DRM_ETNAVIV_THERMAL + bool "enable ETNAVIV thermal throttling" + depends on DRM_ETNAVIV + default y + select THERMAL + help + Compile in support for thermal throttling. + Say Y unless you want to risk burning your SoC. + config DRM_ETNAVIV_REGISTER_LOGGING bool "enable ETNAVIV register logging" depends on DRM_ETNAVIV diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index e19cbe05da2a3..4196f03cf1eb6 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -31,6 +31,10 @@ #include "state_hi.xml.h" #include "cmdstream.xml.h" +#if IS_ENABLED(CONFIG_THERMAL) && !IS_ENABLED(CONFIG_DRM_ETNAVIV_THERMAL) +#warning "You may want to enable CONFIG_DRM_ETNAVIV_THERMAL." +#endif + static const struct platform_device_id gpu_ids[] = { { .name = "etnaviv-gpu,2d" }, { }, @@ -1738,7 +1742,7 @@ static int etnaviv_gpu_bind(struct device *dev, struct device *master, struct etnaviv_gpu *gpu = dev_get_drvdata(dev); int ret; - if (IS_ENABLED(CONFIG_THERMAL)) { + if (IS_ENABLED(CONFIG_DRM_ETNAVIV_THERMAL)) { gpu->cooling = thermal_of_cooling_device_register(dev->of_node, (char *)dev_name(dev), gpu, &cooling_ops); if (IS_ERR(gpu->cooling)) @@ -1751,7 +1755,8 @@ static int etnaviv_gpu_bind(struct device *dev, struct device *master, ret = etnaviv_gpu_clk_enable(gpu); #endif if (ret < 0) { - thermal_cooling_device_unregister(gpu->cooling); + if (IS_ENABLED(CONFIG_DRM_ETNAVIV_THERMAL)) + thermal_cooling_device_unregister(gpu->cooling); return ret; } @@ -1808,7 +1813,8 @@ static void etnaviv_gpu_unbind(struct device *dev, struct device *master, gpu->drm = NULL; - thermal_cooling_device_unregister(gpu->cooling); + if (IS_ENABLED(CONFIG_DRM_ETNAVIV_THERMAL)) + thermal_cooling_device_unregister(gpu->cooling); gpu->cooling = NULL; } -- 2.11.0

3 3

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel December 2017