dri-devel January 2021

dri-devel@lists.freedesktop.org

322 participants
737 discussions

[PATCH] drm/amd/display: Fix pageflipping for XOrg in Linux 5.11+
by Mario Kleiner 02 Jan '21

02 Jan '21

Commit 816853f9dc4057b6c7ee3c45ca9bd5905 ("drm/amd/display: Set new format info for converted metadata.") may fix the getfb2 ioctl, but in exchange it completely breaks all pageflipping for classic user space, e.g., XOrg, as tested with both amdgpu-ddx and modesetting-ddx. This leads to massive tearing, broken visual timing/timestamping etc. Reason is that the classic pageflip ioctl doesn't allow a fb format change during flip, and at least X uses classic pageflip ioctl and no atomic modesetting api at all. As one attempted workaround, only set the new format info for converted metadata if the calling client isn't X. Not sure if this is the best way, or if a better check would not be "not all atomic clients" or similar? In any case it works for XOrg X-Server. Checking the ddx code of intel-ddx/modesetting-ddx/amdgpu-ddx as well as grepping over Mesa doesn't show any users of the getfb2 ioctl(), so the need for this format info assignment seems to be more the exception than the rule? Fixes: 816853f9dc40 ("drm/amd/display: Set new format info for converted metadata.") Cc: Bas Nieuwenhuizen <bas(a)basnieuwenhuizen.nl> Cc: Alex Deucher <alexander.deucher(a)amd.com> Signed-off-by: Mario Kleiner <mario.kleiner.de(a)gmail.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c index f764803c53a4..cb414b3d327a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c @@ -828,7 +828,8 @@ static int convert_tiling_flags_to_modifier(struct amdgpu_framebuffer *afb) if (!format_info) return -EINVAL; - afb->base.format = format_info; + if (afb->base.comm[0] != 'X') + afb->base.format = format_info; } } -- 2.25.1

3 6

[Bug 211003] New: radeon "BUG: unable to handle page fault for address" when hot-unplugging another PCI-e device
by bugzilla-daemon＠bugzilla.kernel.org 02 Jan '21

02 Jan '21

https://bugzilla.kernel.org/show_bug.cgi?id=211003 Bug ID: 211003 Summary: radeon "BUG: unable to handle page fault for address" when hot-unplugging another PCI-e device Product: Drivers Version: 2.5 Kernel Version: 5.4.80-gentoo-r1-x86_64 Hardware: x86-64 OS: Linux Tree: Mainline Status: NEW Severity: normal Priority: P1 Component: Video(DRI - non Intel) Assignee: drivers_video-dri(a)kernel-bugs.osdl.org Reporter: jernej.jakob(a)gmail.com Regression: No radeon driver, bug happens when hot-unplugging another PCI-e card that is not the video card (it was removed via /sys/bus/pci/device/.../remove before hot-unplugging). It may be a hardware-induced error as this motherboard wasn't designed for hot-plugging (but it usually works) [62004.135491] radeon 0000:01:00.0: ring 0 stalled for more than 23820msec [62004.135496] radeon 0000:01:00.0: GPU lockup (current fence id 0x000000000004145c last fence id 0x00000000000414f3 on ring 0) [62004.465908] BUG: unable to handle page fault for address: ffffac09404bcffc [62004.465914] #PF: supervisor read access in kernel mode [62004.465917] #PF: error_code(0x0000) - not-present page [62004.465919] PGD 107d34067 P4D 107d34067 PUD 0 [62004.465925] Oops: 0000 [#1] SMP PTI [62004.465929] CPU: 3 PID: 1397 Comm: eadedCompositor Not tainted 5.4.80-gentoo-r1-x86_64 #1 [62004.465932] Hardware name: /DP965LT, BIOS MQ96510J.86A.1761.2009.0326.0001 03/26/2009 [62004.465973] RIP: 0010:radeon_ring_backup+0xc0/0x140 [radeon] [62004.465977] Code: c6 49 89 06 48 85 c0 74 7b 41 8d 7c 24 ff 31 d2 48 c1 e7 02 eb 07 49 8b 06 48 83 c2 04 48 8b 75 08 8d 4b 01 89 db 48 8d 34 9e <8b> 36 89 34 10 23 4d 54 89 cb 48 39 d7 75 dd 4c 89 ef e8 d9 2d 0b [62004.465980] RSP: 0018:ffffac0543e6fc30 EFLAGS: 00010202 [62004.465983] RAX: ffff9514cd800000 RBX: 00000000ffffffff RCX: 0000000000000000 [62004.465986] RDX: 0000000000000000 RSI: ffffac09404bcffc RDI: 00000000000a7b80 [62004.465988] RBP: ffff9515da7514c8 R08: 00000000000303c7 R09: 000000000022c000 [62004.465991] R10: 00000000000303c0 R11: 0000000000000000 R12: 0000000000029ee1 [62004.465994] R13: ffff9515da7514a8 R14: ffffac0543e6fc90 R15: ffff9515da750000 [62004.465997] FS: 00007f38769ff640(0000) GS:ffff9515e3b80000(0000) knlGS:0000000000000000 [62004.466000] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [62004.466002] CR2: ffffac09404bcffc CR3: 00000001f541e000 CR4: 00000000000006e0 [62004.466005] Call Trace: [62004.466033] radeon_gpu_reset+0xb3/0x2e0 [radeon] [62004.466054] ? radeon_gem_busy_ioctl+0x70/0x70 [radeon] [62004.466074] radeon_gem_handle_lockup.part.0+0xa/0x20 [radeon] [62004.466096] drm_ioctl_kernel+0xaa/0xf0 [drm] [62004.466109] drm_ioctl+0x208/0x390 [drm] [62004.466130] ? radeon_gem_busy_ioctl+0x70/0x70 [radeon] [62004.466134] ? do_futex+0x16c/0xd10 [62004.466138] ? ___sys_recvmsg+0x88/0xc0 [62004.466154] radeon_drm_ioctl+0x49/0x80 [radeon] [62004.466158] do_vfs_ioctl+0x40e/0x670 [62004.466161] ksys_ioctl+0x5e/0x90 [62004.466164] __x64_sys_ioctl+0x16/0x20 [62004.466167] do_syscall_64+0x5f/0x200 [62004.466170] entry_SYSCALL_64_after_hwframe+0x44/0xa9 [62004.466172] RIP: 0033:0x7f38ee60ca57 [62004.466174] Code: c0 75 b5 49 8d 3c 1c e8 17 ff ff ff 85 c0 78 b6 4c 89 e0 5b 5d 41 5c c3 66 2e 0f 1f 84 00 00 00 00 00 90 b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d d9 63 0c 00 f7 d8 64 89 01 48 [62004.466176] RSP: 002b:00007f38769fe5e8 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [62004.466178] RAX: ffffffffffffffda RBX: 00007f38769fe630 RCX: 00007f38ee60ca57 [62004.466180] RDX: 00007f38769fe630 RSI: 0000000040086464 RDI: 000000000000001d [62004.466182] RBP: 0000000040086464 R08: 00007f38700add90 R09: ffffffffffffffff [62004.466183] R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000001 [62004.466185] R13: 000000000000001d R14: 00007f38701ed5b0 R15: 0000000000000000 [62004.466187] Modules linked in: mptsas mptscsih scsi_transport_sas mptctl mptbase ipv6 crc_ccitt cfg80211 rfkill 8021q garp mrp stp llc radeon kvm_intel snd_hda_codec_idt iTCO_wdt snd_hda_codec_generic iTCO_vendor_support gpio_ich snd_hda_codec_hdmi ledtrig_audio i2c_algo_bit kvm snd_hda_intel ppdev snd_intel_nhlt firewire_ohci irqbypass snd_hda_codec pcspkr serio_raw i2c_i801 ttm ftdi_sio firewire_core lpc_ich snd_hda_core crc_itu_t drm_kms_helper snd_hwdep mfd_core joydev snd_pcm snd_timer ata_generic coretemp usbserial pata_acpi snd drm mei_me parport_pc soundcore backlight mei i2c_core mac_hid parport acpi_cpufreq ext4 mbcache jbd2 serpent_sse2_x86_64 serpent_generic dm_crypt dm_mod sd_mod xhci_pci xhci_hcd e1000e ahci libahci pata_marvell uhci_hcd [62004.466223] CR2: ffffac09404bcffc [62004.466226] ---[ end trace 03961b91fcf60642 ]--- [62004.466246] RIP: 0010:radeon_ring_backup+0xc0/0x140 [radeon] [62004.466248] Code: c6 49 89 06 48 85 c0 74 7b 41 8d 7c 24 ff 31 d2 48 c1 e7 02 eb 07 49 8b 06 48 83 c2 04 48 8b 75 08 8d 4b 01 89 db 48 8d 34 9e <8b> 36 89 34 10 23 4d 54 89 cb 48 39 d7 75 dd 4c 89 ef e8 d9 2d 0b [62004.466250] RSP: 0018:ffffac0543e6fc30 EFLAGS: 00010202 [62004.466252] RAX: ffff9514cd800000 RBX: 00000000ffffffff RCX: 0000000000000000 [62004.466254] RDX: 0000000000000000 RSI: ffffac09404bcffc RDI: 00000000000a7b80 [62004.466256] RBP: ffff9515da7514c8 R08: 00000000000303c7 R09: 000000000022c000 [62004.466257] R10: 00000000000303c0 R11: 0000000000000000 R12: 0000000000029ee1 [62004.466259] R13: ffff9515da7514a8 R14: ffffac0543e6fc90 R15: ffff9515da750000 [62004.466261] FS: 00007f38769ff640(0000) GS:ffff9515e3b80000(0000) knlGS:0000000000000000 [62004.466263] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [62004.466264] CR2: ffffac09404bcffc CR3: 00000001f541e000 CR4: 00000000000006e0 -- You may reply to this email to add a comment. You are receiving this mail because: You are watching the assignee of the bug.

1 0

[PATCH] drm: Allow format change during legacy page-flip if driver is atomic.
by Mario Kleiner 02 Jan '21

02 Jan '21

This is a slight improvement for legacy flipping, but also an attempted fix for a bug/regression introduced into Linux 4.11-rc. Commit 816853f9dc4057b6c7ee3c45ca9bd5905 ("drm/amd/display: Set new format info for converted metadata.") fixes the getfb2 ioctl, but in exchange it completely breaks all pageflipping for classic user space, e.g., XOrg, as tested with both amdgpu-ddx and modesetting-ddx. This leads to massive tearing, broken visual timing/timestamping, and a xorg log flooded with error messages, as tested on Ubuntu 20.04.1-LTS with X-Server 1.20.8, Mesa 20.0.8, amdgpu-ddx 19.1.0 and also with the modesetting-ddx with/without atomic on a AMD Raven Ridge gpu. Changes to future Mesa Vulkan drivers beyond 20.0.8 may break (or already have broken?) page flipping on those as well. The reason is that the classic pageflip ioctl doesn't allow a fb format change during flip, and at least X uses classic pageflip ioctl and no atomic modesetting api for flipping, as do all inspected Vulkan drivers, e.g., anv, radv, amdvlk. Above commit assigns new fb->format for use of (retiling) DCC on AMD gpu's for some tiling flags, which is detected (and rejected) by the pageflip ioctl as a format change. However, current atomic kms drivers hook up the ->page_flip() driver function to the atomic helper function drm_atomic_helper_page_flip(), which implements the legacy flip as an atomic commit. My understanding is that a format change during flip via such an atomic commit is safe. Therefore only reject the legacy pageflip ioctl if a fb format change is requested on a kms driver which isn't DRIVER_ATOMIC. This makes "legacy" flipping work again on Linux 4.11 with amdgpu-kms and DisplayCore enabled. Fixes: 816853f9dc40 ("drm/amd/display: Set new format info for converted metadata.") Cc: Bas Nieuwenhuizen <bas(a)basnieuwenhuizen.nl> Cc: Alex Deucher <alexander.deucher(a)amd.com> Cc: David Airlie <airlied(a)redhat.com> Cc: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Signed-off-by: Mario Kleiner <mario.kleiner.de(a)gmail.com> --- drivers/gpu/drm/drm_plane.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index e6231947f987..4688360a078d 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -1163,7 +1163,11 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, if (ret) goto out; - if (old_fb->format != fb->format) { + /* + * Format change during legacy pageflip only works if page flip is done + * via an atomic commit, e.g., via drm_atomic_helper_page_flip() helper. + */ + if ((old_fb->format != fb->format) && !drm_drv_uses_atomic_modeset(dev)) { DRM_DEBUG_KMS("Page flip is not allowed to change frame buffer format.\n"); ret = -EINVAL; goto out; -- 2.25.1

1 0

[PATCH] i915: fix shift warning
by Arnd Bergmann 02 Jan '21

02 Jan '21

From: Arnd Bergmann <arnd(a)arndb.de> Randconfig builds on 32-bit machines show lots of warnings for the i915 driver for incorrect bit masks like: drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c:2584:9: error: shift count >= width of type [-Werror,-Wshift-count-overflow] return hweight64(VDBOX_MASK(&i915->gt)); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ include/asm-generic/bitops/const_hweight.h:29:49: note: expanded from macro 'hweight64' #define hweight64(w) (__builtin_constant_p(w) ? __const_hweight64(w) : __arch_hweight64(w)) Since this is a 64-bit mask, use GENMASK_ULL instead of GENMASK. Signed-off-by: Arnd Bergmann <arnd(a)arndb.de> --- drivers/gpu/drm/i915/i915_drv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index 0a3ee4f9dc0a..ca32fa0d6a57 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1624,7 +1624,7 @@ tgl_revids_get(struct drm_i915_private *dev_priv) unsigned int first__ = (first); \ unsigned int count__ = (count); \ ((gt)->info.engine_mask & \ - GENMASK(first__ + count__ - 1, first__)) >> first__; \ + GENMASK_ULL(first__ + count__ - 1, first__)) >> first__; \ }) #define VDBOX_MASK(gt) \ ENGINE_INSTANCES_MASK(gt, VCS0, I915_MAX_VCS) -- 2.29.2

2 3

[Bug 210095] New: amdgpu : hibernate failed on A12-9700P (R7 bristol ridge) - ASUS X555 Q
by bugzilla-daemon＠bugzilla.kernel.org 02 Jan '21

02 Jan '21

https://bugzilla.kernel.org/show_bug.cgi?id=210095 Bug ID: 210095 Summary: amdgpu : hibernate failed on A12-9700P (R7 bristol ridge) - ASUS X555 Q Product: Drivers Version: 2.5 Kernel Version: 5.4.0-52-generic #57-Ubuntu SMP Thu Oct 15 10:57:00 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux Hardware: All OS: Linux Tree: Mainline Status: NEW Severity: normal Priority: P1 Component: Video(DRI - non Intel) Assignee: drivers_video-dri(a)kernel-bugs.osdl.org Reporter: alvin(a)ximple.ga Regression: No Created attachment 293529 --> https://bugzilla.kernel.org/attachment.cgi?id=293529&action=edit dmesg Hi! Dear maintainer, I have a problem getting hibernate from this machine. After issuing hibernate command via kernel 'echo disk > /sys/power/state' or systemd 'systemctl hibernate', the screen is black but still powered on. After like 20secs, fan speed ramp up to max. If I disconnect the power (mind that my laptop battery is detected bad) it's instantly turned off (like if I disconnect power on bios menu) -- my guesses is the blank state is likely stuck on the bios mode/side(?) I've tried to located the problem by blocking amdgpu modules from booting and I found out that amdgpu likely the problem. I tried upgrade kernel on ubuntu to 5.8 but no amdgpu loaded but using LLVMpipe mode, the hibernate can happen normally There is no/I don't know where the - serial port on this device as this is a laptop and I have limited knowledge/resources to find that out. I guess that's useless to attach dmesg, as system is not recording any logs occur after hibernate issued. Another thing I get is from the Magic number (PM_TRACE), they said some error on random 'memory48' or sometimes 'memoryXXX'. I think this may be just false positive [ 0.984201] kernel: PM: Magic number: 11:0:0 [ 0.984292] kernel: memory memory48: hash matches Here's some device details. Thank you. *-cpu description: CPU product: AMD A12-9700P RADEON R7, 10 COMPUTE CORES 4C+6G vendor: Advanced Micro Devices [AMD] physical id: 1b bus info: cpu@0 version: AMD A12-9700P RADEON R7, 10 COMPUTE CORES 4C+6G slot: P0 size: 1306MHz capacity: 2500MHz width: 64 bits clock: 100MHz *-display description: VGA compatible controller product: Wani [Radeon R5/R6/R7 Graphics] vendor: Advanced Micro Devices, Inc. [AMD/ATI] physical id: 1 bus info: pci@0000:00:01.0 version: c9 width: 64 bits clock: 33MHz capabilities: pm pciexpress msi vga_controller bus_master cap_list rom configuration: driver=amdgpu latency=0 resources: irq:44 memory:d0000000-dfffffff memory:f0000000-f07fffff ioport:f000(size=256) memory:feb00000-feb3ffff memory:c0000-dffff *-pci:2 description: PCI bridge product: Family 15h (Models 60h-6fh) Processor Root Port vendor: Advanced Micro Devices, Inc. [AMD] physical id: 3.1 bus info: pci@0000:00:03.1 version: 00 width: 32 bits clock: 33MHz capabilities: pci pm pciexpress msi ht normal_decode bus_master cap_list configuration: driver=pcieport resources: irq:29 ioport:d000(size=4096) memory:fe800000-fe8fffff ioport:e0000000(size=268435456) *-display description: Display controller product: Sun XT [Radeon HD 8670A/8670M/8690M / R5 M330 / M430 / Radeon 520 Mobile] vendor: Advanced Micro Devices, Inc. [AMD/ATI] physical id: 0 bus info: pci@0000:03:00.0 version: 83 width: 64 bits clock: 33MHz capabilities: pm pciexpress msi bus_master cap_list rom configuration: driver=radeon latency=0 resources: irq:43 memory:e0000000-efffffff memory:fe800000-fe83ffff ioport:d000(size=256) memory:fe840000-fe85ffff -- You are receiving this mail because: You are watching the assignee of the bug.

1 4

[PATCH] drm/vkms: Decouple config data for configfs
by Sumera Priyadarsini 01 Jan '21

01 Jan '21

Currently, data for the device instance is held by vkms_device. Add a separate type, vkms_config to contain configuration details for the device and various modes to be later used by configfs. This config data stays constant once the device is created. Accordingly, add vkms_create and vkms_destroy to initialize/destroy device through configfs. Currently, they are being called from vkms_init and vkms_exit, but will be evoked from configfs later on. When configfs is added, device configuration- enabling/disabling features will be tracked by configfs and only vkms device lifetime will be kept track of by vkms_init and vkms_exit functions. Modify usage of enable_cursor feature to reflect the changes in relevant files. Signed-off-by: Sumera Priyadarsini <sylphrenadin(a)gmail.com> --- drivers/gpu/drm/vkms/vkms_drv.c | 40 ++++++++++++++++++++++++------ drivers/gpu/drm/vkms/vkms_drv.h | 11 +++++--- drivers/gpu/drm/vkms/vkms_output.c | 4 +-- 3 files changed, 42 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/vkms/vkms_drv.c b/drivers/gpu/drm/vkms/vkms_drv.c index aef29393b811..6b33975a5cb2 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.c +++ b/drivers/gpu/drm/vkms/vkms_drv.c @@ -34,9 +34,9 @@ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 -static struct vkms_device *vkms_device; +static struct vkms_config *default_config; -bool enable_cursor = true; +static bool enable_cursor = true; module_param_named(enable_cursor, enable_cursor, bool, 0444); MODULE_PARM_DESC(enable_cursor, "Enable/Disable cursor support"); @@ -122,10 +122,11 @@ static int vkms_modeset_init(struct vkms_device *vkmsdev) return vkms_output_init(vkmsdev, 0); } -static int __init vkms_init(void) +static int vkms_create(struct vkms_config *config) { int ret; struct platform_device *pdev; + struct vkms_device *vkms_device; pdev = platform_device_register_simple(DRIVER_NAME, -1, NULL, 0); if (IS_ERR(pdev)) @@ -143,6 +144,8 @@ static int __init vkms_init(void) goto out_devres; } vkms_device->platform = pdev; + vkms_device->config = config; + config->dev = vkms_device; ret = dma_coerce_mask_and_coherent(vkms_device->drm.dev, DMA_BIT_MASK(64)); @@ -179,21 +182,42 @@ static int __init vkms_init(void) return ret; } -static void __exit vkms_exit(void) +static int __init vkms_init(void) +{ + struct vkms_config *config = kmalloc(sizeof(*config), GFP_KERNEL); + + default_config = config; + + config->cursor = enable_cursor; + + return vkms_create(config); +} + +static void vkms_destroy(struct vkms_config *config) { struct platform_device *pdev; - if (!vkms_device) { + if (!config->dev) { DRM_INFO("vkms_device is NULL.\n"); return; } - pdev = vkms_device->platform; + pdev = config->dev->platform; - drm_dev_unregister(&vkms_device->drm); - drm_atomic_helper_shutdown(&vkms_device->drm); + drm_dev_unregister(&config->dev->drm); + drm_atomic_helper_shutdown(&config->dev->drm); devres_release_group(&pdev->dev, NULL); platform_device_unregister(pdev); + + config->dev = NULL; +} + +static void __exit vkms_exit(void) +{ + if (default_config->dev) + vkms_destroy(default_config); + + kfree(default_config); } module_init(vkms_init); diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h index 5ed91ff08cb3..2fa0c52f1dd8 100644 --- a/drivers/gpu/drm/vkms/vkms_drv.h +++ b/drivers/gpu/drm/vkms/vkms_drv.h @@ -19,8 +19,6 @@ #define XRES_MAX 8192 #define YRES_MAX 8192 -extern bool enable_cursor; - struct vkms_composer { struct drm_framebuffer fb; struct drm_rect src, dst; @@ -82,10 +80,17 @@ struct vkms_output { spinlock_t composer_lock; }; +struct vkms_device; +struct vkms_config { + bool cursor; + /* only set when instantiated */ + struct vkms_device *dev; +}; struct vkms_device { struct drm_device drm; struct platform_device *platform; struct vkms_output output; + const struct vkms_config *config; }; #define drm_crtc_to_vkms_output(target) \ @@ -123,4 +128,4 @@ void vkms_set_composer(struct vkms_output *out, bool enabled); /* Writeback */ int vkms_enable_writeback_connector(struct vkms_device *vkmsdev); -#endif /* _VKMS_DRV_H_ */ +#endif /* _VKMS_DRV_H_ */ \ No newline at end of file diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c index 4a1848b0318f..8f3ffb28b9d1 100644 --- a/drivers/gpu/drm/vkms/vkms_output.c +++ b/drivers/gpu/drm/vkms/vkms_output.c @@ -46,7 +46,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index) if (IS_ERR(primary)) return PTR_ERR(primary); - if (enable_cursor) { + if (vkmsdev->config->cursor) { cursor = vkms_plane_init(vkmsdev, DRM_PLANE_TYPE_CURSOR, index); if (IS_ERR(cursor)) { ret = PTR_ERR(cursor); @@ -98,7 +98,7 @@ int vkms_output_init(struct vkms_device *vkmsdev, int index) drm_crtc_cleanup(crtc); err_crtc: - if (enable_cursor) + if (vkmsdev->config->cursor) drm_plane_cleanup(cursor); err_cursor: -- 2.25.1

1 0

[drm-intel:topic/dp-hdmi-2.1-pcon 9/15] drivers/gpu/drm/i915/display/intel_dp.c:4053:10: warning: Suspicious condition (assignment + comparison); Clarify expression with parentheses.
by kernel test robot 01 Jan '21

01 Jan '21

tree: git://anongit.freedesktop.org/drm-intel topic/dp-hdmi-2.1-pcon head: 522508b665df3bbfdf40381d4e61777844b1703f commit: ced42f2df5fd8621c896faeafe7ecc0ea8b2ea81 [9/15] drm/i915: Add support for starting FRL training for HDMI2.1 via PCON compiler: gcc-9 (Debian 9.3.0-15) 9.3.0 If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <rong.a.chen(a)intel.com> cppcheck possible warnings: (new ones prefixed by >>, may not real problems) >> drivers/gpu/drm/i915/display/intel_dp.c:4053:10: warning: Suspicious condition (assignment + comparison); Clarify expression with parentheses. [clarifyCondition] wait_for(is_active = drm_dp_pcon_is_frl_ready(&intel_dp->aux) == true, TIMEOUT_FRL_READY_MS); ^ drivers/gpu/drm/i915/display/intel_dp.c:4072:10: warning: Suspicious condition (assignment + comparison); Clarify expression with parentheses. [clarifyCondition] wait_for(is_active = drm_dp_pcon_hdmi_link_active(&intel_dp->aux) == true, TIMEOUT_HDMI_LINK_ACTIVE_MS); ^ vim +4053 drivers/gpu/drm/i915/display/intel_dp.c ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4028 ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4029 struct drm_i915_private *i915 = dp_to_i915(intel_dp); ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4030 int max_frl_bw, max_pcon_frl_bw, max_edid_frl_bw, ret; ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4031 u8 max_frl_bw_mask = 0, frl_trained_mask; ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4032 bool is_active; ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4033 ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4034 ret = drm_dp_pcon_reset_frl_config(&intel_dp->aux); ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4035 if (ret < 0) ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4036 return ret; ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4037 ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4038 max_pcon_frl_bw = intel_dp->dfp.pcon_max_frl_bw; ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4039 drm_dbg(&i915->drm, "PCON max rate = %d Gbps\n", max_pcon_frl_bw); ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4040 ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4041 max_edid_frl_bw = intel_dp_hdmi_sink_max_frl(intel_dp); ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4042 drm_dbg(&i915->drm, "Sink max rate from EDID = %d Gbps\n", max_edid_frl_bw); ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4043 ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4044 max_frl_bw = min(max_edid_frl_bw, max_pcon_frl_bw); ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4045 ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4046 if (max_frl_bw <= 0) ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4047 return -EINVAL; ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4048 ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4049 ret = drm_dp_pcon_frl_prepare(&intel_dp->aux, false); ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4050 if (ret < 0) ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4051 return ret; ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4052 /* Wait for PCON to be FRL Ready */ ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 @4053 wait_for(is_active = drm_dp_pcon_is_frl_ready(&intel_dp->aux) == true, TIMEOUT_FRL_READY_MS); ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4054 ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4055 if (!is_active) ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4056 return -ETIMEDOUT; ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4057 ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4058 max_frl_bw_mask = intel_dp_pcon_set_frl_mask(max_frl_bw); ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4059 ret = drm_dp_pcon_frl_configure_1(&intel_dp->aux, max_frl_bw, PCON_SEQUENTIAL_MODE); ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4060 if (ret < 0) ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4061 return ret; ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4062 ret = drm_dp_pcon_frl_configure_2(&intel_dp->aux, max_frl_bw_mask, PCON_NORMAL_TRAIN_MODE); ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4063 if (ret < 0) ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4064 return ret; ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4065 ret = drm_dp_pcon_frl_enable(&intel_dp->aux); ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4066 if (ret < 0) ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4067 return ret; ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4068 /* ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4069 * Wait for FRL to be completed ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4070 * Check if the HDMI Link is up and active. ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4071 */ ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4072 wait_for(is_active = drm_dp_pcon_hdmi_link_active(&intel_dp->aux) == true, TIMEOUT_HDMI_LINK_ACTIVE_MS); ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4073 ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4074 if (!is_active) ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4075 return -ETIMEDOUT; ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4076 ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4077 /* Verify HDMI Link configuration shows FRL Mode */ ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4078 if (drm_dp_pcon_hdmi_link_mode(&intel_dp->aux, &frl_trained_mask) != ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4079 DP_PCON_HDMI_MODE_FRL) { ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4080 drm_dbg(&i915->drm, "HDMI couldn't be trained in FRL Mode\n"); ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4081 return -EINVAL; ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4082 } ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4083 drm_dbg(&i915->drm, "MAX_FRL_MASK = %u, FRL_TRAINED_MASK = %u\n", max_frl_bw_mask, frl_trained_mask); ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4084 ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4085 intel_dp->frl.trained_rate_gbps = intel_dp_pcon_get_frl_mask(frl_trained_mask); ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4086 intel_dp->frl.is_trained = true; ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4087 drm_dbg(&i915->drm, "FRL trained with : %d Gbps\n", intel_dp->frl.trained_rate_gbps); ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4088 ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4089 return 0; ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4090 } ced42f2df5fd8621 Ankit Nautiyal 2020-12-18 4091 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel January 2021