diff --git a/drm-mgag200-fix-kernel-hang-in-cursor-code.patch b/drm-mgag200-fix-kernel-hang-in-cursor-code.patch new file mode 100644 index 0000000..075c062 --- /dev/null +++ b/drm-mgag200-fix-kernel-hang-in-cursor-code.patch @@ -0,0 +1,107 @@ +From f6619ef7508261be2ba3ded313ccc46ce670d0d3 Mon Sep 17 00:00:00 2001 +From: "Wang, Rui Y" +Date: Wed, 18 Nov 2015 23:00:53 +0800 +Subject: [PATCH] drm/mgag200: fix kernel hang in cursor code. + +The machine hang completely with the following message on the console: + +[ 487.777538] BUG: unable to handle kernel NULL pointer dereference at 0000000000000060 +[ 487.777554] IP: [] _raw_spin_lock+0xe/0x30 +[ 487.777557] PGD 42e9f7067 PUD 42f2fa067 PMD 0 +[ 487.777560] Oops: 0002 [#1] SMP +... +[ 487.777618] CPU: 21 PID: 3190 Comm: Xorg Tainted: G E 4.4.0-rc1-3-default+ #6 +[ 487.777620] Hardware name: Intel Corporation BRICKLAND/BRICKLAND, BIOS BRHSXSD1.86B.0059.R00.1501081238 01/08/2015 +[ 487.777621] task: ffff880853ae4680 ti: ffff8808696d4000 task.ti: ffff8808696d4000 +[ 487.777625] RIP: 0010:[] [] _raw_spin_lock+0xe/0x30 +[ 487.777627] RSP: 0018:ffff8808696d79c0 EFLAGS: 00010246 +[ 487.777628] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000 +[ 487.777629] RDX: 0000000000000001 RSI: 0000000000000000 RDI: 0000000000000060 +[ 487.777630] RBP: ffff8808696d79e0 R08: 0000000000000000 R09: ffff88086924a780 +[ 487.777631] R10: 000000000001bb40 R11: 0000000000003246 R12: 0000000000000000 +[ 487.777632] R13: ffff880463a27360 R14: ffff88046ca50218 R15: 0000000000000080 +[ 487.777634] FS: 00007f3f81c5a8c0(0000) GS:ffff88086f060000(0000) knlGS:0000000000000000 +[ 487.777635] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 +[ 487.777636] CR2: 0000000000000060 CR3: 000000042e678000 CR4: 00000000001406e0 +[ 487.777638] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 +[ 487.777639] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 +[ 487.777639] Stack: +[ 487.777642] ffffffffa00eb5fa ffff8808696d7b60 ffff88086b87d800 0000000000000000 +[ 487.777644] ffff8808696d7ac8 ffffffffa01694b6 ffff8808696d7ae8 ffffffff8109c8d5 +[ 487.777647] ffff880469158740 ffff880463a27000 ffff88086b87d800 ffff88086b87d800 +[ 487.777647] Call Trace: +[ 487.777674] [] ? drm_gem_object_lookup+0x1a/0xa0 [drm] +[ 487.777681] [] mga_crtc_cursor_set+0xc6/0xb60 [mgag200] +[ 487.777691] [] ? find_busiest_group+0x35/0x4a0 +[ 487.777696] [] ? __might_sleep+0x44/0x80 +[ 487.777699] [] ? __ww_mutex_lock+0x22/0x9c +[ 487.777722] [] ? drm_modeset_lock+0x34/0xf0 [drm] +[ 487.777733] [] restore_fbdev_mode+0xee/0x2a0 [drm_kms_helper] +[ 487.777742] [] drm_fb_helper_restore_fbdev_mode_unlocked+0x2e/0x70 [drm_kms_helper] +[ 487.777748] [] drm_fb_helper_set_par+0x27/0x50 [drm_kms_helper] +[ 487.777752] [] fb_set_var+0x18c/0x3f0 +[ 487.777777] [] ? __ext4_handle_dirty_metadata+0x8a/0x210 [ext4] +[ 487.777783] [] fbcon_blank+0x1b7/0x2b0 +[ 487.777790] [] do_unblank_screen+0xb3/0x1c0 +[ 487.777795] [] vt_ioctl+0x118a/0x1210 +[ 487.777801] [] tty_ioctl+0x3f0/0xc90 +[ 487.777808] [] ? kzfree+0x28/0x30 +[ 487.777813] [] ? mntput+0x1f/0x30 +[ 487.777817] [] do_vfs_ioctl+0x30d/0x570 +[ 487.777822] [] ? task_work_run+0x8a/0xa0 +[ 487.777825] [] SyS_ioctl+0x74/0x80 +[ 487.777829] [] entry_SYSCALL_64_fastpath+0x12/0x71 +[ 487.777851] Code: 65 ff 0d ce 02 a8 7e 5d c3 ba 01 00 00 00 f0 0f b1 17 85 c0 75 e8 b0 01 5d c3 0f 1f 00 65 ff 05 b1 02 a8 7e 31 c0 ba 01 00 00 00 0f b1 17 85 c0 75 01 c3 55 89 c6 48 89 e5 e8 4e f5 b1 ff 5d +[ 487.777854] RIP [] _raw_spin_lock+0xe/0x30 +[ 487.777855] RSP +[ 487.777856] CR2: 0000000000000060 +[ 487.777860] ---[ end trace 672a2cd555e0ebd3 ]--- + +The cursor code may be entered with file_priv == NULL && handle == NULL. +The problem was introduced by: + +"bf89209 drm/mga200g: Hold a proper reference for cursor_set" + +which calls drm_gem_object_lookup(dev, file_priv...). Previously this wasn't +a problem because we checked the handle. Move the check early in the function +can fix the problem. + +Signed-off-by: Rui Wang +Reviewed-by: Daniel Vetter +Signed-off-by: Dave Airlie +--- + drivers/gpu/drm/mgag200/mgag200_cursor.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/drivers/gpu/drm/mgag200/mgag200_cursor.c b/drivers/gpu/drm/mgag200/mgag200_cursor.c +index 4f2068fe5d88..a7bf6a90eae5 100644 +--- a/drivers/gpu/drm/mgag200/mgag200_cursor.c ++++ b/drivers/gpu/drm/mgag200/mgag200_cursor.c +@@ -70,6 +70,11 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, + BUG_ON(pixels_2 != pixels_current && pixels_2 != pixels_prev); + BUG_ON(pixels_current == pixels_prev); + ++ if (!handle || !file_priv) { ++ mga_hide_cursor(mdev); ++ return 0; ++ } ++ + obj = drm_gem_object_lookup(dev, file_priv, handle); + if (!obj) + return -ENOENT; +@@ -88,12 +93,6 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, + goto out_unreserve1; + } + +- if (!handle) { +- mga_hide_cursor(mdev); +- ret = 0; +- goto out1; +- } +- + /* Move cursor buffers into VRAM if they aren't already */ + if (!pixels_1->pin_count) { + ret = mgag200_bo_pin(pixels_1, TTM_PL_FLAG_VRAM, +-- +2.5.0 + diff --git a/kernel.spec b/kernel.spec index b1039c1..ce97e19 100644 --- a/kernel.spec +++ b/kernel.spec @@ -714,6 +714,9 @@ Patch650: bpf-fix-branch-offset-adjustment-on-backjumps-after-.patch #rhbz 1306987 Patch651: Input-elantech-mark-protocols-v2-and-v3-as-semi-mt.patch +#rhbz 1305181 1299901 +Patch652: drm-mgag200-fix-kernel-hang-in-cursor-code.patch + # END OF PATCH DEFINITIONS %endif @@ -1492,6 +1495,9 @@ ApplyPatch bpf-fix-branch-offset-adjustment-on-backjumps-after-.patch #rhbz 1306987 ApplyPatch Input-elantech-mark-protocols-v2-and-v3-as-semi-mt.patch +#rhbz 1305181 1299901 +ApplyPatch drm-mgag200-fix-kernel-hang-in-cursor-code.patch + # END OF PATCH APPLICATIONS %endif @@ -2341,6 +2347,9 @@ fi # # %changelog +* Wed Feb 17 2016 Josh Boyer +- Backport mgag200 cursor hang fix (rhbz 1305181 1299901) + * Tue Feb 16 2016 Josh Boyer - Backport fix for elantech touchpads (rhbz 1306987)