diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-07-14 15:16:34 +0200 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-07-14 15:18:15 +0200 |
commit | 0dcac5008fcf57cce66ef091204efbde86956c7a (patch) | |
tree | ffff160c18cea9edb7602ee3e84babd0449a9cf0 /drivers/gpu/drm/drm_crtc_internal.h | |
parent | 01d3434a565ada5ca084c68ec1e087ada5a7b157 (diff) | |
download | linux-0dcac5008fcf57cce66ef091204efbde86956c7a.tar.bz2 |
Revert "drm: Resurrect atomic rmfb code"
This reverts commit 11c21e73f848844d439cbccb42a1018b8c560e5c.
For reasons totally unclear this manages to wreak havoc with the audio
rpm refcount:
------------[ cut here ]------------
WARNING: CPU: 0 PID: 215 at drivers/gpu/drm/i915/intel_runtime_pm.c:1729 intel_display_power_put+0xe8/0x100 [i915]
Use count on domain AUDIO is already zero
Modules linked in: i915 ax88179_178a usbnet mii snd_hda_codec_hdmi snd_hda_codec_realtek snd_hda_codec_generic snd_hda_codec x86_pkg_temp_thermal snd_hwdep intel_powerclamp snd_hda_core co
f_pclmul crc32_pclmul snd_pcm ghash_clmulni_intel mei_me mei e1000e ptp pps_core i2c_hid [last unloaded: i915]
CPU: 0 PID: 215 Comm: kworker/0:2 Not tainted 4.7.0-rc6+ #44
Hardware name: Intel Corporation Skylake Client platform/Skylake Halo DDR4 RVP11, BIOS SKLSE2R1.R00.X106.B00.1601180206 01/18/2016
Workqueue: events output_poll_execute
0000000000000000 ffff88045573fa38 ffffffff813a2d6b ffff88045573fa88
0000000000000000 ffff88045573fa78 ffffffff81075db6 000006c15a590000
ffff88045a59a238 ffff88045a590054 ffff88045a590000 ffff88045a590000
Call Trace:
[<ffffffff813a2d6b>] dump_stack+0x4d/0x72
[<ffffffff81075db6>] __warn+0xc6/0xe0
[<ffffffff81075e1a>] warn_slowpath_fmt+0x4a/0x50
[<ffffffffa046399d>] ? hsw_audio_codec_disable+0xdd/0x110 [i915]
[<ffffffffa041e638>] intel_display_power_put+0xe8/0x100 [i915]
[<ffffffffa049d776>] intel_disable_ddi+0x46/0x80 [i915]
[<ffffffffa0474eef>] haswell_crtc_disable+0x16f/0x290 [i915]
[<ffffffffa047cb53>] intel_atomic_commit_tail+0x153/0x10e0 [i915]
[<ffffffff814aa020>] ? drm_atomic_helper_swap_state+0x140/0x2d0
[<ffffffffa047dedd>] intel_atomic_commit+0x3fd/0x520 [i915]
[<ffffffff814d0252>] ? drm_atomic_add_affected_connectors+0x22/0xf0
[<ffffffff814cf8a2>] drm_atomic_commit+0x32/0x50
[<ffffffff814aed07>] restore_fbdev_mode+0x147/0x260
[<ffffffff814b026e>] drm_fb_helper_restore_fbdev_mode_unlocked+0x2e/0x70
[<ffffffff814b02d8>] drm_fb_helper_set_par+0x28/0x50
[<ffffffff814b0203>] drm_fb_helper_hotplug_event+0x143/0x180
[<ffffffffa0498ab5>] intel_fbdev_output_poll_changed+0x15/0x20 [i915]
[<ffffffff814a1f92>] drm_kms_helper_hotplug_event+0x22/0x30
[<ffffffff814a2172>] output_poll_execute+0x192/0x1e0
[<ffffffff8108cf7c>] process_one_work+0x14c/0x480
[<ffffffff8108d4fa>] worker_thread+0x24a/0x4e0
[<ffffffff8108d2b0>] ? process_one_work+0x480/0x480
[<ffffffff8108d2b0>] ? process_one_work+0x480/0x480
[<ffffffff81092904>] kthread+0xc4/0xe0
[<ffffffff8173013f>] ret_from_fork+0x1f/0x40
[<ffffffff81092840>] ? kthread_worker_fn+0x180/0x180
---[ end trace 2d440da5f0c053e4 ]---
Instead of scratching heads too much while CI is down, let's revert
before more trouble is caused.
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reported-by: Mika Kuoppala <mika.kuoppala@intel.com>
Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Acked-by: Mika Kuoppala <mika.kuoppala@intel.com>
Acked-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1468502194-17029-1-git-send-email-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers/gpu/drm/drm_crtc_internal.h')
-rw-r--r-- | drivers/gpu/drm/drm_crtc_internal.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h index b248e2238a05..47a500b90fd7 100644 --- a/drivers/gpu/drm/drm_crtc_internal.h +++ b/drivers/gpu/drm/drm_crtc_internal.h @@ -125,7 +125,6 @@ int drm_atomic_get_property(struct drm_mode_object *obj, struct drm_property *property, uint64_t *val); int drm_mode_atomic_ioctl(struct drm_device *dev, void *data, struct drm_file *file_priv); -int drm_atomic_remove_fb(struct drm_framebuffer *fb); int drm_modeset_register_all(struct drm_device *dev); void drm_modeset_unregister_all(struct drm_device *dev); |