• Ville Syrjälä's avatar
    drm/i915: Cleanup phys status page too · 17e44975
    Ville Syrjälä authored
    commit 7d3fdfff upstream.
    
    Restore the lost phys status page cleanup.
    
    Fixes the following splat with DMA_API_DEBUG=y:
    
    WARNING: CPU: 0 PID: 21615 at ../lib/dma-debug.c:974 dma_debug_device_change+0x190/0x1f0()
    pci 0000:00:02.0: DMA-API: device driver has pending DMA allocations while released from device [count=1]
                   One of leaked entries details: [device address=0x0000000023163000] [size=4096 bytes] [mapped with DMA_BIDIRECTIONAL] [mapped as coherent]
    Modules linked in: i915(-) i2c_algo_bit drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops drm sha256_generic hmac drbg ctr ccm sch_fq_codel binfmt_misc joydev mousedev arc4 ath5k iTCO_wdt mac80211 smsc_ircc2 ath snd_intel8x0m snd_intel8x0 snd_ac97_codec ac97_bus psmouse snd_pcm input_leds i2c_i801 pcspkr snd_timer cfg80211 snd soundcore i2c_core ehci_pci firewire_ohci ehci_hcd firewire_core lpc_ich 8139too rfkill crc_itu_t mfd_core mii usbcore rng_core intel_agp intel_gtt usb_common agpgart irda crc_ccitt fujitsu_laptop led_class parport_pc video parport evdev backlight
    CPU: 0 PID: 21615 Comm: rmmod Tainted: G     U          4.4.0-rc4-mgm-ovl+ #4
    Hardware name: FUJITSU SIEMENS LIFEBOOK S6120/FJNB16C, BIOS Version 1.26  05/10/2004
     e31a3de0 e31a3de0 e31a3d9c c128d4bd e31a3dd0 c1045a0c c15e00c4 e31a3dfc
     0000546f c15dfad2 000003ce c12b3740 000003ce c12b3740 00000000 00000001
     f61fb8a0 e31a3de8 c1045a83 00000009 e31a3de0 c15e00c4 e31a3dfc e31a3e4c
    Call Trace:
     [<c128d4bd>] dump_stack+0x16/0x19
     [<c1045a0c>] warn_slowpath_common+0x8c/0xd0
     [<c12b3740>] ? dma_debug_device_change+0x190/0x1f0
     [<c12b3740>] ? dma_debug_device_change+0x190/0x1f0
     [<c1045a83>] warn_slowpath_fmt+0x33/0x40
     [<c12b3740>] dma_debug_device_change+0x190/0x1f0
     [<c1065499>] notifier_call_chain+0x59/0x70
     [<c10655af>] __blocking_notifier_call_chain+0x3f/0x80
     [<c106560f>] blocking_notifier_call_chain+0x1f/0x30
     [<c134cfb3>] __device_release_driver+0xc3/0xf0
     [<c134d0d7>] driver_detach+0x97/0xa0
     [<c134c440>] bus_remove_driver+0x40/0x90
     [<c134db18>] driver_unregister+0x28/0x60
     [<c1079e8c>] ? trace_hardirqs_on_caller+0x12c/0x1d0
     [<c12c0618>] pci_unregister_driver+0x18/0x80
     [<f83e96e7>] drm_pci_exit+0x87/0xb0 [drm]
     [<f8b3be2d>] i915_exit+0x1b/0x1ee [i915]
     [<c10b999c>] SyS_delete_module+0x14c/0x210
     [<c1079e8c>] ? trace_hardirqs_on_caller+0x12c/0x1d0
     [<c115a9bd>] ? ____fput+0xd/0x10
     [<c1002014>] do_fast_syscall_32+0xa4/0x450
     [<c149f6fa>] sysenter_past_esp+0x3b/0x5d
    ---[ end trace c2ecbc77760f10a0 ]---
    Mapped at:
     [<c12b3183>] debug_dma_alloc_coherent+0x33/0x90
     [<f83e989c>] drm_pci_alloc+0x18c/0x1e0 [drm]
     [<f8acd59f>] intel_init_ring_buffer+0x2af/0x490 [i915]
     [<f8acd8b0>] intel_init_render_ring_buffer+0x130/0x750 [i915]
     [<f8aaea4e>] i915_gem_init_rings+0x1e/0x110 [i915]
    
    v2: s/BUG_ON/WARN_ON/ since dim doens't like the former anymore
    
    Cc: Chris Wilson <chris@chris-wilson.co.uk>
    Fixes: 5c6c6003 ("drm/i915: Remove DRI1 ring accessors and API")
    Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
    Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> (v1)
    Link: http://patchwork.freedesktop.org/patch/msgid/1452538112-5331-1-git-send-email-ville.syrjala@linux.intel.comReviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
    Signed-off-by: default avatarKamal Mostafa <kamal@canonical.com>
    17e44975
intel_ringbuffer.c 73.7 KB