Tvrtko Ursulin 6aef660370 drm/i915: Fix forcewake active domain tracking ... In commit 003342a500 ("drm/i915: Keep track of active forcewake domains in a bitmask") I forgot to adjust the newly introduce fw_domains_active state across reset. This caused the assert_forcewakes_inactive to trigger during suspend and resume if there were user held forcewakes. v2: Bitmask checks are required since vfuncs are not always present. v3: Move bitmask tracking to get/put vfunc for simplicity. (Chris Wilson) Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Fixes: 003342a500 ("drm/i915: Keep track of active forcewake domains in a bitmask") Testcase: igt/drv_suspend/forcewake Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com> Cc: "Paneri, Praveen" <praveen.paneri@intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Daniel Vetter <daniel.vetter@intel.com> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: intel-gfx@lists.freedesktop.org Cc: v4.10+ <stable@vger.kernel.org> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Link: http://patchwork.freedesktop.org/patch/msgid/20170310093249.4484-1-tvrtko.ursulin@linux.intel.com (cherry picked from commit b847305080) Signed-off-by: Jani Nikula <jani.nikula@intel.com>		2017-03-13 17:30:54 +02:00
..
gvt	Merge tag 'gvt-fixes-2017-03-08' of https://github.com/01org/gvt-linux into drm-intel-fixes	2017-03-08 12:21:54 +02:00
dvo.h
dvo_ch7xxx.c
dvo_ch7017.c
dvo_ivch.c
dvo_ns2501.c
dvo_sil164.c
dvo_tfp410.c
i915_cmd_parser.c
i915_debugfs.c
i915_drv.c	Less anger inducing pull request for 4.11	2017-02-23 18:58:18 -08:00
i915_drv.h	drm/i915/glk: Fix watermark computations for third sprite plane	2017-03-09 10:43:01 +02:00
i915_gem.c	drm/i915: Use pagecache write to prepopulate shmemfs from pwrite-ioctl	2017-03-09 10:46:07 +02:00
i915_gem.h
i915_gem_batch_pool.c
i915_gem_batch_pool.h
i915_gem_context.c
i915_gem_context.h
i915_gem_dmabuf.c	Merge remote-tracking branch 'ovl/for-viro' into for-linus	2017-03-02 06:41:22 -05:00
i915_gem_evict.c	drm/i915: use correct node for handling cache domain eviction	2017-03-13 17:30:09 +02:00
i915_gem_execbuffer.c	Linux 4.10-rc8	2017-02-23 12:10:12 +10:00
i915_gem_fence_reg.c
i915_gem_fence_reg.h
i915_gem_gtt.c	drm/i915: A hotfix for making aliasing PPGTT work for GVT-g	2017-02-16 11:59:12 +02:00
i915_gem_gtt.h
i915_gem_internal.c	Linux 4.10-rc8	2017-02-23 12:10:12 +10:00
i915_gem_object.h	drm/i915: Use pagecache write to prepopulate shmemfs from pwrite-ioctl	2017-03-09 10:46:07 +02:00
i915_gem_render_state.c	scripts/spelling.txt: add "aligment" pattern and fix typo instances	2017-02-27 18:43:46 -08:00
i915_gem_render_state.h
i915_gem_request.c	sched/headers: Prepare for the reduction of <linux/sched.h>'s signal API dependency	2017-03-02 08:42:37 +01:00
i915_gem_request.h
i915_gem_shrinker.c
i915_gem_stolen.c	drm/i915/gvt: Disable access to stolen memory as a guest	2017-02-16 11:59:13 +02:00
i915_gem_tiling.c	drm/i915: Reject set-tiling-ioctl with stride==0 and a tiling mode	2017-02-16 11:59:10 +02:00
i915_gem_timeline.c
i915_gem_timeline.h
i915_gem_userptr.c	sched/headers: Prepare for new header dependencies before moving code to <linux/sched/mm.h>	2017-03-02 08:42:28 +01:00
i915_gpu_error.c
i915_guc_reg.h
i915_guc_submission.c
i915_ioc32.c
i915_irq.c	Less anger inducing pull request for 4.11	2017-02-23 18:58:18 -08:00
i915_memcpy.c
i915_mm.c
i915_oa_hsw.c
i915_oa_hsw.h
i915_params.c
i915_params.h
i915_pci.c
i915_perf.c
i915_pvinfo.h
i915_reg.h	Less anger inducing pull request for 4.11	2017-02-23 18:58:18 -08:00
i915_suspend.c
i915_sw_fence.c
i915_sw_fence.h
i915_sysfs.c
i915_trace.h
i915_trace_points.c
i915_utils.h
i915_vgpu.c
i915_vgpu.h
i915_vma.c	drm/i915: Remove the vma from the drm_mm if binding fails	2017-03-09 10:43:55 +02:00
i915_vma.h
intel_acpi.c
intel_atomic.c
intel_atomic_plane.c	drm/i915: Track pinned vma in intel_plane_state	2017-02-01 11:45:21 +02:00
intel_audio.c	Less anger inducing pull request for 4.11	2017-02-23 18:58:18 -08:00
intel_bios.c
intel_bios.h
intel_breadcrumbs.c	sched/headers: Prepare for new header dependencies before moving code to <uapi/linux/sched/types.h>	2017-03-02 08:42:27 +01:00
intel_color.c
intel_crt.c	Linux 4.10-rc8	2017-02-23 12:10:12 +10:00
intel_csr.c
intel_ddi.c
intel_device_info.c
intel_display.c	drm/i915: Drain the freed state from the tail of the next commit	2017-03-09 10:47:31 +02:00
intel_dp.c	drm/i915: Avoid spurious WARNs about the wrong pipe in the PPS code	2017-02-16 11:59:13 +02:00
intel_dp_aux_backlight.c
intel_dp_link_training.c
intel_dp_mst.c
intel_dpio_phy.c
intel_dpll_mgr.c	Linux 4.10-rc8	2017-02-23 12:10:12 +10:00
intel_dpll_mgr.h
intel_drv.h	sched/headers: Prepare for new header dependencies before moving code to <linux/sched/clock.h>	2017-03-02 08:42:27 +01:00
intel_dsi.c
intel_dsi.h
intel_dsi_dcs_backlight.c
intel_dsi_panel_vbt.c
intel_dsi_pll.c
intel_dvo.c
intel_engine_cs.c
intel_fbc.c	drm/i915: Track pinned vma in intel_plane_state	2017-02-01 11:45:21 +02:00
intel_fbdev.c	drm/i915/fbdev: Stop repeating tile configuration on stagnation	2017-03-09 10:43:17 +02:00
intel_fifo_underrun.c
intel_frontbuffer.c
intel_frontbuffer.h
intel_guc_fwif.h
intel_guc_loader.c
intel_guc_log.c
intel_gvt.c	drm/i915: make intel_gvt_init() later instead of too early	2017-02-07 17:21:06 +08:00
intel_gvt.h
intel_hangcheck.c
intel_hdmi.c	Less anger inducing pull request for 4.11	2017-02-23 18:58:18 -08:00
intel_hotplug.c
intel_huc.c
intel_i2c.c
intel_lpe_audio.c	drm/i915: Enable VLV audio chicken bit for LPE audio	2017-02-03 16:19:08 +01:00
intel_lrc.c	drm/i915: Restore context and pd for ringbuffer submission after reset	2017-02-16 11:59:11 +02:00
intel_lrc.h
intel_lspcon.c	drm/i915/lspcon: Fix resume time initialization due to unasserted HPD	2017-02-16 11:59:10 +02:00
intel_lvds.c
intel_mocs.c
intel_mocs.h
intel_modes.c
intel_opregion.c	drm/i915: Fix not finding the VBT when it overlaps with OPREGION_ASLE_EXT	2017-02-16 11:59:14 +02:00
intel_overlay.c
intel_panel.c
intel_pipe_crc.c
intel_pm.c	drm/i915/gen9: Increase PCODE request timeout to 50ms	2017-03-09 10:44:25 +02:00
intel_psr.c
intel_renderstate.h
intel_renderstate_gen6.c
intel_renderstate_gen7.c
intel_renderstate_gen8.c
intel_renderstate_gen9.c
intel_ringbuffer.c	drm/i915: Restore context and pd for ringbuffer submission after reset	2017-02-16 11:59:11 +02:00
intel_ringbuffer.h
intel_runtime_pm.c
intel_sdvo.c
intel_sdvo_regs.h
intel_sideband.c
intel_sprite.c	drm/i915: Nuke skl_update_plane debug message from the pipe update critical section	2017-03-13 17:30:26 +02:00
intel_tv.c
intel_uc.c
intel_uc.h
intel_uncore.c	drm/i915: Fix forcewake active domain tracking	2017-03-13 17:30:54 +02:00
intel_vbt_defs.h
Kconfig
Kconfig.debug
Makefile	Less anger inducing pull request for 4.11	2017-02-23 18:58:18 -08:00