linux-sg2042/drivers/gpu/drm/i915
Ville Syrjälä 5be6e33400 drm/i915: Do .init_clock_gating() earlier to avoid it clobbering watermarks
Currently ILK-BDW explicitly disable LP1+ watermarks from their
.init_clock_gating() hooks. Unfortunately that hook gets called way too
late since by that time we've already initialized all the watermark
state tracking which then gets out of sync with the hardware state.

We may eventually want to consider killing off the explicit LP1+
disable from .init_clock_gating(). In the meantime however, we can
avoid the problem by reordering the init sequence such that
intel_modeset_init_hw()->intel_init_clock_gating() gets called
prior to the hardware state takeover.

I suppose prior to the two stage watermark programming we were
magically saved by something that forced the watermarks to be
reprogrammed fully after .init_clock_gating() got called. But
now that no longer happens.

Note that the diff might look a bit odd as it kills off one
call of intel_update_cdclk(), but that's fine because
intel_modeset_init_hw() does the exact same thing. Previously
we just did it twice.

Actually even this new init sequence is pretty bogus as
.init_clock_gating() really should be called before any gem
hardware init since it can  configure various clock gating
workarounds and whatnot that affect the GT side as well. Also
intel_modeset_init() really should get split up into better
defined init stages. Another "fun" detail is that
intel_modeset_gem_init() is where RPS/RC6 gets configured.
Why that is done from the display code is beyond me. I've
decided to leave all this be for now, and just try to fix
the init sequence enough for watermarks to work.

Cc: stable@vger.kernel.org
Cc: Gabriele Mazzotta <gabriele.mzt@gmail.com>
Cc: David Purton <dcpurton@marshwiggle.net>
Cc: Matt Roper <matthew.d.roper@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reported-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
Reported-by: David Purton <dcpurton@marshwiggle.net>
Tested-by: Gabriele Mazzotta <gabriele.mzt@gmail.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96645
Fixes: ed4a6a7ca8 ("drm/i915: Add two-stage ILK-style watermark programming (v11)")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170220140443.30891-1-ville.syrjala@linux.intel.com
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2017-03-02 21:24:39 +02:00
..
gvt Merge airlied/drm-next into drm-misc-next 2017-02-27 09:30:11 +01:00
selftests drm/i915: Assert all sg are initialised in fake_dma_object for selftests 2017-02-25 18:54:36 +00:00
Kconfig drm/i915: Support explicit fencing for execbuf 2017-01-27 19:55:48 +00:00
Kconfig.debug drm/i915/tracepoints: Add request submit and execute tracepoints 2017-02-21 13:18:14 +00:00
Makefile drm/i915: Perform object clflushing asynchronously 2017-02-22 12:12:15 +00: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 drm/i915: Consolidate checks for memcpy-from-wc support 2017-01-06 16:02:07 +00:00
i915_debugfs.c drm/i915: Include GT/seqno activity in engine/hangcheck debugfs 2017-03-02 15:47:19 +00:00
i915_drv.c Merge airlied/drm-next into drm-misc-next 2017-02-27 09:30:11 +01:00
i915_drv.h drm/i915: Include power-management state in gpu error dump 2017-03-02 16:47:45 +00:00
i915_gem.c drm/i915: Hold rpm during GEM suspend in driver unload/suspend 2017-03-02 12:44:08 +00:00
i915_gem.h drm/i915: Rename conditional GEM execution macros 2017-02-10 21:43:43 +00:00
i915_gem_batch_pool.c drm/i915: Use reservation_object_lock() 2017-02-21 12:48:51 +00:00
i915_gem_batch_pool.h
i915_gem_clflush.c drm/i915: Remove 'retire' parameter from intel_fb_obj_flush 2017-02-22 12:12:17 +00:00
i915_gem_clflush.h drm/i915: Perform object clflushing asynchronously 2017-02-22 12:12:15 +00:00
i915_gem_context.c drm/i915: Reduce context alignment 2017-02-27 16:01:47 +00:00
i915_gem_context.h drm/i915: Reduce context alignment 2017-02-27 16:01:47 +00:00
i915_gem_dmabuf.c drm/i915: Add some mock tests for dmabuf interop 2017-02-13 20:45:50 +00:00
i915_gem_evict.c drm/i915: Remove i915_address_space.start 2017-02-15 10:07:32 +00:00
i915_gem_execbuffer.c drm/i915: Drop support for I915_EXEC_CONSTANTS_* execbuf parameters. 2017-02-24 17:51:05 +00:00
i915_gem_fence_reg.c drm/i915: Replace 4096 with PAGE_SIZE or I915_GTT_PAGE_SIZE 2017-01-10 20:54:32 +00:00
i915_gem_fence_reg.h drm/i915: Replace 4096 with PAGE_SIZE or I915_GTT_PAGE_SIZE 2017-01-10 20:54:32 +00:00
i915_gem_gtt.c drm/i915: Remove redundant TLB invalidate on switching ppgtt 2017-02-27 16:01:46 +00:00
i915_gem_gtt.h drm/i915: Use preferred kernel types in i915_gem_gtt.c 2017-02-15 10:07:35 +00:00
i915_gem_internal.c Linux 4.10-rc8 2017-02-23 12:10:12 +10:00
i915_gem_object.h drm/i915: Prevent concurrent tiling/framebuffer modifications 2017-03-01 17:57:17 +00:00
i915_gem_render_state.c drm/i915: Remove i915_vma_create from VMA API 2017-01-19 10:17:39 +00:00
i915_gem_render_state.h drm/i915: Reuse the active golden render state batch 2016-10-28 20:53:44 +01:00
i915_gem_request.c drm/i915: s/assert_spin_locked/lockdep_assert_held/ 2017-03-02 15:18:55 +00:00
i915_gem_request.h drm/i915: Signal first fence from irq handler if complete 2017-02-27 21:57:20 +00:00
i915_gem_shrinker.c drm/i915: Prevent concurrent tiling/framebuffer modifications 2017-03-01 17:57:17 +00:00
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: Prevent concurrent tiling/framebuffer modifications 2017-03-01 17:57:17 +00:00
i915_gem_timeline.c drm/i915: Assert all timeline requests are gone before fini 2017-01-05 15:34:40 +00:00
i915_gem_timeline.h drm/i915: Keep a global seqno per-engine 2017-02-23 14:49:26 +00:00
i915_gem_userptr.c Linux 4.10-rc2 2017-01-04 11:35:18 +01:00
i915_gpu_error.c drm/i915: Include power-management state in gpu error dump 2017-03-02 16:47:45 +00:00
i915_guc_reg.h drm/i915/huc: Add HuC fw loading support 2017-01-19 11:18:55 +02:00
i915_guc_submission.c drm/i915/guc: Disable irq for __i915_guc_submit wq_lock 2017-03-02 15:18:55 +00:00
i915_ioc32.c
i915_irq.c drm/i915: s/assert_spin_locked/lockdep_assert_held/ 2017-03-02 15:18:55 +00:00
i915_memcpy.c
i915_mm.c
i915_oa_hsw.c drm/i915: Add more Haswell OA metric sets 2016-11-22 14:40:00 +01:00
i915_oa_hsw.h drm/i915: advertise available metrics via sysfs 2016-11-22 14:38:51 +01:00
i915_params.c drm/i915: Enable atomic support by default on supported platforms. 2017-02-09 15:56:45 +01:00
i915_params.h drm/i915: Use bool i915_param.alpha_support 2017-02-06 22:37:33 +00:00
i915_pci.c drm/i915: Provide a hook for selftests 2017-02-13 20:45:21 +00:00
i915_perf.c drm/i915: s/assert_spin_locked/lockdep_assert_held/ 2017-03-02 15:18:55 +00:00
i915_pvinfo.h
i915_reg.h drm/i915: Tighten mmio arrays for MIPI_PORT 2017-03-01 09:45:43 +00:00
i915_selftest.h drm/i915: Use fault-injection to force the shrinker to run in live GTT tests 2017-02-13 20:46:32 +00:00
i915_suspend.c drm/i915: Make i915_save/restore_state and intel_i2c_reset take dev_priv 2016-12-01 18:01:23 +00:00
i915_sw_fence.c drm/i915: Flush the change in debugobject before reallocation 2017-01-16 12:21:19 +00:00
i915_sw_fence.h drm/i915: Hold a reference on the request for its fence chain 2016-12-05 11:00:32 +02:00
i915_sysfs.c drm/i915: The return of i915_gpu_info to debugfs 2017-02-14 22:30:22 +00:00
i915_trace.h drm/i915: Remove change_domain tracepoint 2017-02-22 12:12:11 +00:00
i915_trace_points.c
i915_utils.h drm/i915: Sanity check the computed size and base of stolen memory 2017-01-31 11:19:23 +00:00
i915_vgpu.c drm/i915: Remove i915_address_space.start 2017-02-15 10:07:32 +00:00
i915_vgpu.h
i915_vma.c drm/i915: Remove the vma from the drm_mm if binding fails 2017-02-27 13:10:12 +00:00
i915_vma.h drm/i915: Exercise i915_vma_pin/i915_vma_insert 2017-02-13 20:46:41 +00:00
intel_acpi.c
intel_atomic.c drm/i915/glk: Fix Geminilake scalers mode programming 2017-02-23 14:57:01 +02:00
intel_atomic_plane.c drm/i915: Track pinned vma in intel_plane_state 2017-02-01 11:45:21 +02:00
intel_audio.c drm/i915: Start moving the cdclk stuff into a distinct state structure 2017-02-08 18:07:10 +02:00
intel_bios.c drm/i915: Use range_overflows() 2017-01-06 16:02:11 +00:00
intel_bios.h drm/i915/dsi: Fix swapping of MIPI_SEQ_DEASSERT_RESET / MIPI_SEQ_ASSERT_RESET 2016-12-20 16:28:25 +02:00
intel_breadcrumbs.c drm/i915: s/assert_spin_locked/lockdep_assert_held/ 2017-03-02 15:18:55 +00:00
intel_cdclk.c drm/i915: Replace the .modeset_commit_cdclk() hook with a more direct .set_cdclk() hook 2017-02-08 18:07:11 +02:00
intel_color.c drm/i915/glk: Load the degamma LUT even in legacy gamma mode 2017-02-17 17:14:28 +02:00
intel_crt.c drm/i915: Store encoder power domain in struct intel_encoder 2017-02-27 09:07:51 +02:00
intel_csr.c drm/i915: DMC 1.03 for Geminilake 2017-02-20 10:35:03 +02:00
intel_ddi.c drm/i915: Only enable DDI IO power domains after enabling DPLL 2017-02-27 09:09:14 +02:00
intel_device_info.c drm/i915: use BUILD_BUG_ON to ensure platform name has been set up 2017-03-01 13:11:24 +02:00
intel_display.c drm/i915: Do .init_clock_gating() earlier to avoid it clobbering watermarks 2017-03-02 21:24:39 +02:00
intel_dp.c drm/i915: Store encoder power domain in struct intel_encoder 2017-02-27 09:07:51 +02:00
intel_dp_aux_backlight.c
intel_dp_link_training.c drm/i915/skl: drop workarounds for A0 and B0 revisions 2016-09-26 12:08:22 +03:00
intel_dp_mst.c drm/i915: Enable DDI IO power domains in the DP MST path 2017-03-02 10:49:00 +02:00
intel_dpio_phy.c drm/i915: Only poll DW3_A when init DDI PHY for ports B and C. 2016-12-02 12:16:25 -08:00
intel_dpll_mgr.c Linux 4.10-rc8 2017-02-23 12:10:12 +10:00
intel_dpll_mgr.h drm/i915: Remove unused function intel_ddi_get_link_dpll() 2017-02-10 11:40:27 +02:00
intel_drv.h drm/i915: Restore the invalid access without RPM warning 2017-03-02 12:45:23 +00:00
intel_dsi.c drm/i915/glk: Fix DSI enable I/O sequence 2017-03-02 16:34:13 +02:00
intel_dsi.h drm/i915/dsi: Make intel_dsi_enable/disable directly exec VBT sequences 2017-02-28 12:47:04 +02:00
intel_dsi_dcs_backlight.c
intel_dsi_panel_vbt.c drm/i915/dsi: Make intel_dsi_enable/disable directly exec VBT sequences 2017-02-28 12:47:04 +02:00
intel_dsi_pll.c drm/i915/glk: Validate only DSI PORT A PLL divider 2017-02-28 11:54:52 +02:00
intel_dvo.c drm/i915: Store encoder power domain in struct intel_encoder 2017-02-27 09:07:51 +02:00
intel_engine_cs.c drm/i915: Move w/a LRI debug message from context-init to driver load 2017-03-01 20:29:24 +00:00
intel_fbc.c drm/i915: Suppress fbc suggestion to increase stolen if disabled 2017-02-23 22:48:30 +00:00
intel_fbdev.c drm/i915/fbdev: Stop repeating tile configuration on stagnation 2017-02-24 12:25:42 +00:00
intel_fifo_underrun.c drm/i915: s/assert_spin_locked/lockdep_assert_held/ 2017-03-02 15:18:55 +00:00
intel_frontbuffer.c drm/i915: Remove 'retire' parameter from intel_fb_obj_flush 2017-02-22 12:12:17 +00:00
intel_frontbuffer.h drm/i915: Remove 'retire' parameter from intel_fb_obj_flush 2017-02-22 12:12:17 +00:00
intel_guc_fwif.h drm/i915/huc: Support HuC authentication 2017-01-19 11:19:07 +02:00
intel_guc_loader.c drm/i915/guc: Don't take struct_mutex for object unreference 2017-02-14 22:30:22 +00:00
intel_guc_log.c drm/i915/guc: Move GuC log related functions into dedicated file 2017-01-18 07:29:04 +00:00
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 drm/i915/gvt: clean up intel_gvt.h as interface for i915 core 2016-10-20 17:18:30 +08:00
intel_hangcheck.c drm/i915: Add initial selftests for hang detection and resets 2017-02-13 20:46:53 +00:00
intel_hdmi.c drm/i915: Store encoder power domain in struct intel_encoder 2017-02-27 09:07:51 +02:00
intel_hotplug.c drm/i915: s/assert_spin_locked/lockdep_assert_held/ 2017-03-02 15:18:55 +00:00
intel_huc.c i915/HuC: Add an extra check for platforms that do not have HUC 2017-03-02 16:15:44 +02:00
intel_i2c.c drm/i915: Introduce IS_GEN9_BC for Skylake and Kabylake. 2017-01-24 10:29:00 -08:00
intel_lrc.c drm/i915/bdw: Do not write the replay bit of the ring mode register 2017-02-27 14:02:50 +02:00
intel_lrc.h drm/i915: Split intel_engine allocation and initialisation 2017-01-24 12:29:47 +00:00
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 drm/i915: Store encoder power domain in struct intel_encoder 2017-02-27 09:07:51 +02:00
intel_mocs.c drm/i915: Emit to ringbuffer directly 2017-02-14 14:30:46 +00:00
intel_mocs.h drm/i915: Make various init functions take dev_priv 2016-12-01 18:01:15 +00:00
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 drm/i915: Emit to ringbuffer directly 2017-02-14 14:30:46 +00:00
intel_panel.c drm/i915: Start moving the cdclk stuff into a distinct state structure 2017-02-08 18:07:10 +02:00
intel_pipe_crc.c drm/i915: s/assert_spin_locked/lockdep_assert_held/ 2017-03-02 15:18:55 +00:00
intel_pm.c drm/i915: s/assert_spin_locked/lockdep_assert_held/ 2017-03-02 15:18:55 +00:00
intel_psr.c drm/i915/psr: Fix compiler warnings for hsw_psr_disable() 2017-01-18 10:25:01 +00:00
intel_renderstate.h
intel_renderstate_gen6.c
intel_renderstate_gen7.c
intel_renderstate_gen8.c
intel_renderstate_gen9.c
intel_ringbuffer.c drm/i915: Reduce context alignment 2017-02-27 16:01:47 +00:00
intel_ringbuffer.h drm/i915: Delay disabling the user interrupt for breadcrumbs 2017-02-27 21:57:23 +00:00
intel_runtime_pm.c drm/i915: Only enable DDI IO power domains after enabling DPLL 2017-02-27 09:09:14 +02:00
intel_sdvo.c drm/i915: Store encoder power domain in struct intel_encoder 2017-02-27 09:07:51 +02:00
intel_sdvo_regs.h
intel_sideband.c drm/i915: Distinguish between timeout and error in sideband transactions 2017-02-27 17:22:19 +00:00
intel_sprite.c drm/i915/glk: Enable pipe CSC 2017-02-17 17:15:01 +02:00
intel_tv.c drm/i915: Store encoder power domain in struct intel_encoder 2017-02-27 09:07:51 +02:00
intel_uc.c drm/i915/guc: Move GuC log related functions into dedicated file 2017-01-18 07:29:04 +00:00
intel_uc.h drm/i915/huc: Support HuC authentication 2017-01-19 11:19:07 +02:00
intel_uncore.c drm/i915: s/assert_spin_locked/lockdep_assert_held/ 2017-03-02 15:18:55 +00:00
intel_vbt_defs.h drm/915: Parsing the missed out DTD fields from the VBT 2016-12-23 15:13:39 +02:00