[Intel-gfx] [git pull] drm fixes

[Josh Boyer]

On Tue, Mar 24, 2015 at 3:32 AM, Daniel Vetter <daniel at ffwll.ch> wrote:
> On Mon, Mar 23, 2015 at 02:34:27PM -0400, Josh Boyer wrote:
>> On Mon, Mar 23, 2015 at 11:33 AM, Josh Boyer <jwboyer at fedoraproject.org> wrote:
>>
>> <snip>
>>
>> >> Xi Ruoyao (1):
>> >>       drm/i915: Ensure plane->state->fb stays in sync with plane->fb
>>
>> Turns out to be that commit.
>>
>> git bisect start 'drivers/gpu/drm/i915/'
>> # good: [b314acaccd7e0d55314d96be4a33b5f50d0b3344] Merge branch
>> 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
>> git bisect good b314acaccd7e0d55314d96be4a33b5f50d0b3344
>> # bad: [bc465aa9d045feb0e13b4a8f32cc33c1943f62d6] Linux 4.0-rc5
>> git bisect bad bc465aa9d045feb0e13b4a8f32cc33c1943f62d6
>> # bad: [319c1d420a0b62d9dbb88104afebaabc968cdbfa] drm/i915: Ensure
>> plane->state->fb stays in sync with plane->fb
>> git bisect bad 319c1d420a0b62d9dbb88104afebaabc968cdbfa
>> # first bad commit: [319c1d420a0b62d9dbb88104afebaabc968cdbfa]
>> drm/i915: Ensure plane->state->fb stays in sync with plane->fb
>>
>> Doing a straight revert on top of 4.0-rc5 makes things work again,
>> albeit with the WARN_ON(obj->frontbuffer_bits) splat still being
>> there.
>
> Can you please test the tip of drm-fixes:
>
> commit 8218c3f4df3bb1c637c17552405039a6dd3c1ee1
> Author: Daniel Vetter <daniel.vetter at ffwll.ch>
> Date:   Fri Feb 27 12:58:13 2015 +0100
>
>     drm: Fixup racy refcounting in plane_force_disable
>
> http://cgit.freedesktop.org/~airlied/linux/commit/?h=drm-fixes&id=8218c3f4df3bb1c637c17552405039a6dd3c1ee1
>
> Because fumble that patch didn't make it to drm-fixes a while ago and
> instead landed in drm-next.

That seems to have helped with totally different issues a macbook I
have was seeing.  However, it still doesn't fix the issue with the
Celeron based NUC machine.

I built a kernel based on Linus' latest tree as of this morning,
without reverting 319c1d4 and adding the commit you pointed to.  The
NUC still won't boot without HDMI connected.  With HDMI connected I
still see the trace below.  If I do the blacklist and then insmod
dance with HDMI unplugged it shows the same spew I reported yesterday
which starts with the same backtrace.

I'll try building a kernel with 319c1d4 reverted + your patch.  I
suspect things will work fine with that combination because the two
issues are unrelated.

josh

[  +0.000027] WARNING: CPU: 1 PID: 144 at include/linux/kref.h:47
drm_framebuffer_reference+0x7a/0x90 [drm]()
[  +0.000003] Modules linked in: i915(+) i2c_algo_bit drm_kms_helper
drm sdhci_acpi sdhci mmc_core video
[  +0.000012] CPU: 1 PID: 144 Comm: systemd-udevd Not tainted
4.0.0-0.rc5.git1.1.fc23.x86_64 #1
[  +0.000003] Hardware name:
\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff
\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff\xffffffff/DN2820FYK,
BIOS FYBYT10H.86A.0034.2014.0513.1413 05/13/2014
[  +0.000003]  0000000000000000 00000000b82c27d6 ffff88003f98f688
ffffffff8177ada9
[  +0.000004]  0000000000000000 0000000000000000 ffff88003f98f6c8
ffffffff8109c78a
[  +0.000004]  ffff8802345c91a8 ffff880234b0bd80 ffff880234b923c0
ffff88003fae0000
[  +0.000004] Call Trace:
[  +0.000010]  [<ffffffff8177ada9>] dump_stack+0x45/0x57
[  +0.000005]  [<ffffffff8109c78a>] warn_slowpath_common+0x8a/0xc0
[  +0.000004]  [<ffffffff8109c8ba>] warn_slowpath_null+0x1a/0x20
[  +0.000012]  [<ffffffffa00a822a>] drm_framebuffer_reference+0x7a/0x90 [drm]
[  +0.000016]  [<ffffffffa00ba6ad>] drm_atomic_set_fb_for_plane+0x2d/0x90 [drm]
[  +0.000048]  [<ffffffffa014e8c5>]
i9xx_get_initial_plane_config+0x295/0x3e0 [i915]
[  +0.000015]  [<ffffffffa00b8ed6>] ? drm_modeset_unlock_all+0x36/0x70 [drm]
[  +0.000031]  [<ffffffffa015f721>] intel_modeset_init+0x9f1/0x1a40 [i915]
[  +0.000027]  [<ffffffffa0128f5b>] ?
valleyview_irq_postinstall+0x3b/0x50 [i915]
[  +0.000034]  [<ffffffffa01943ef>] i915_driver_load+0xe5f/0x10f0 [i915]
[  +0.000005]  [<ffffffff8169654b>] ? netlink_broadcast_filtered+0x12b/0x380
[  +0.000006]  [<ffffffff8139b730>] ? kobj_ns_drop+0x50/0x50
[  +0.000004]  [<ffffffff8139bae8>] ? kobject_uevent_env+0x178/0x540
[  +0.000006]  [<ffffffff814d98d9>] ? devtmpfs_create_node+0x109/0x140
[  +0.000004]  [<ffffffff814cde27>] ? get_device+0x17/0x30
[  +0.000005]  [<ffffffff814d3ce5>] ? klist_class_dev_get+0x15/0x20
[  +0.000005]  [<ffffffff81770bc2>] ? klist_add_tail+0x32/0x40
[  +0.000004]  [<ffffffff814cf85f>] ? device_add+0x19f/0x6a0
[  +0.000012]  [<ffffffffa00a2825>] drm_dev_register+0xb5/0x110 [drm]
[  +0.000011]  [<ffffffffa00a59bd>] drm_get_pci_dev+0x8d/0x200 [drm]
[  +0.000022]  [<ffffffffa00eb22b>] i915_pci_probe+0x3b/0x60 [i915]
[  +0.000006]  [<ffffffff813e4485>] local_pci_probe+0x45/0xa0
[  +0.000005]  [<ffffffff81299a72>] ? sysfs_do_create_link_sd.isra.2+0x72/0xc0
[  +0.000004]  [<ffffffff813e57e9>] pci_device_probe+0xf9/0x150
[  +0.000005]  [<ffffffff814d2d83>] driver_probe_device+0xa3/0x400
[  +0.000004]  [<ffffffff814d31bb>] __driver_attach+0x9b/0xa0
[  +0.000004]  [<ffffffff814d3120>] ? __device_attach+0x40/0x40
[  +0.000004]  [<ffffffff814d0a43>] bus_for_each_dev+0x73/0xc0
[  +0.000004]  [<ffffffff814d27ee>] driver_attach+0x1e/0x20
[  +0.000004]  [<ffffffff814d23a0>] bus_add_driver+0x180/0x250
[  +0.000004]  [<ffffffff814d39b4>] driver_register+0x64/0xf0
[  +0.000004]  [<ffffffff813e3d0c>] __pci_register_driver+0x4c/0x50
[  +0.000012]  [<ffffffffa00a5c2a>] drm_pci_init+0xfa/0x130 [drm]
[  +0.000004]  [<ffffffffa01f4000>] ? 0xffffffffa01f4000
[  +0.000022]  [<ffffffffa01f40a0>] i915_init+0xa0/0xa8 [i915]
[  +0.000006]  [<ffffffff81002148>] do_one_initcall+0xd8/0x210
[  +0.000005]  [<ffffffff811fc599>] ? kmem_cache_alloc_trace+0x1a9/0x230
[  +0.000004]  [<ffffffff81779fad>] ? do_init_module+0x28/0x1cc
[  +0.000004]  [<ffffffff81779fe6>] do_init_module+0x61/0x1cc
[  +0.000005]  [<ffffffff81120c4b>] load_module+0x20ab/0x2520
[  +0.000004]  [<ffffffff8111c550>] ? store_uevent+0x70/0x70
[  +0.000005]  [<ffffffff811dd9ec>] ? vmap_page_range_noflush+0x22c/0x350
[  +0.000006]  [<ffffffff8112118d>] SyS_init_module+0xcd/0x120
[  +0.000006]  [<ffffffff81781509>] system_call_fastpath+0x12/0x17
[  +0.000003] ---[ end trace fde4b7d97a3cd3f5 ]---
[  +0.022245] ACPI: Video Device [GFX0] (multi-head: yes  rom: no  post: no)