Hi Dave, Here goes drm-intel-next-2017-12-01. As Gustavo already pointed out, when applying this and drm-misc-next you will get the build failure. And the fix up is: - enum plane plane; + enum i9xx_plane_id plane; Changes on this tag: - Init clock gate fix (Ville) - Execlists event handling corrections (Chris, Michel) - Improvements on GPU Cache invalidation and context switch (Chris) - More perf OA changes (Lionel) - More selftests improvements and fixes (Chris, Matthew) - Clean-up on modules parameters (Chris) - Clean-up around old ringbuffer submission and hw semaphore on old platforms (Chris) - More Cannonlake stabilization effort (David, James) - Display planes clean-up and improvements (Ville) - New PMU interface for perf queries... (Tvrtko) - ... and other subsequent PMU changes and fixes (Tvrtko, Chris) - Remove success dmesg noise from rotation (Chris) - New DMC for Kabylake (Anusha) - Fixes around atomic commits (Daniel) - GuC updates and fixes (Sagar, Michal, Chris) - Couple gmbus/i2c fixes (Ville) - Use exponential backoff for all our wait_for() (Chris) - Fixes for i915/fbdev (Chris) - Backlight fixes (Arnd) - Updates on shrinker (Chris) - Make Hotplug enable more robuts (Chris) - Disable huge pages (TPH) on lack of a needed workaround (Joonas) - New GuC images for SKL, KBL, BXT (Sagar) - Add HW Workaround for Geminilake performance (Valtteri) - Fixes for PPS timings (Imre) - More IPS fixes (Maarten) - Many fixes for Display Port on gen2-gen4 (Ville) - Retry GPU reset making the recover from hang more robust (Chris) Thanks, Rodrigo.The following changes since commit 010d118c20617021025a930bc8e90f371ab99da5: drm/i915: Update DRIVER_DATE to 20171117 (2017-11-17 14:47:02 -0800) are available in the git repository at: git://anongit.freedesktop.org/drm/drm-intel tags/drm-intel-next-2017-12-01 for you to fetch changes up to d65efe7c951371fbad2c426b59bbac8bf2e60662: drm/i915: Update DRIVER_DATE to 20171201 (2017-12-01 17:07:19 -0800) ---------------------------------------------------------------- drm-intel-next-2017-12-01: - Init clock gate fix (Ville) - Execlists event handling corrections (Chris, Michel) - Improvements on GPU Cache invalidation and context switch (Chris) - More perf OA changes (Lionel) - More selftests improvements and fixes (Chris, Matthew) - Clean-up on modules parameters (Chris) - Clean-up around old ringbuffer submission and hw semaphore on old platforms (Chris) - More Cannonlake stabilization effort (David, James) - Display planes clean-up and improvements (Ville) - New PMU interface for perf queries... (Tvrtko) - ... and other subsequent PMU changes and fixes (Tvrtko, Chris) - Remove success dmesg noise from rotation (Chris) - New DMC for Kabylake (Anusha) - Fixes around atomic commits (Daniel) - GuC updates and fixes (Sagar, Michal, Chris) - Couple gmbus/i2c fixes (Ville) - Use exponential backoff for all our wait_for() (Chris) - Fixes for i915/fbdev (Chris) - Backlight fixes (Arnd) - Updates on shrinker (Chris) - Make Hotplug enable more robuts (Chris) - Disable huge pages (TPH) on lack of a needed workaround (Joonas) - New GuC images for SKL, KBL, BXT (Sagar) - Add HW Workaround for Geminilake performance (Valtteri) - Fixes for PPS timings (Imre) - More IPS fixes (Maarten) - Many fixes for Display Port on gen2-gen4 (Ville) - Retry GPU reset making the recover from hang more robust (Chris) ---------------------------------------------------------------- Anusha Srivatsa (1): drm/i915/dmc: DMC 1.04 for Kabylake Arnd Bergmann (2): drm/i915: fix intel_backlight_device_register declaration drm/i915: hide unused intel_panel_set_backlight function Chris Wilson (39): drm/i915/execlists: Listen to COMPLETE context event not ACTIVE_IDLE drm/i915/execlists: Reduce completed event mask to COMPLETE | PREEMPTED drm/i915/execlists: Assert that we don't get mixed IDLE_ACTIVE | COMPLETE events drm/i915: Pull the unconditional GPU cache invalidation into request construction drm/i915: Automatic i915_switch_context for legacy drm/i915/selftest: Make guc clients static drm/i915: Remove i915.enable_execlists module parameter drm/i915: Remove obsolete ringbuffer emission for gen8+ drm/i915: Disable semaphores on Sandybridge drm/i915: Move debugfs/i915_semaphore_status to i915_engine_info drm/i915: Remove i915.semaphores modparam drm/i915/selftests: Declare we allocated the guc clients drm/i915/selftests: Avoid drm_gem_handle_create under struct_mutex drm/i915/selftests: Use NOWARN for large allocations drm/i915: Remove success dmesg noise for intel_rotate_pages() drm/i915: Call i915_gem_init_userptr() before taking struct_mutex drm/i915: Save/restore irq state for vlv_residency_raw() drm/i915: Unwind incomplete legacy context switches drm/i915: Move mi_set_context() into the legacy ringbuffer submission drm/i915/pmu: Hide the (unsigned long)ptr cast drm/i915/selftests: Hold rpm wakeref for request + ggtt usage drm/i915/pmu: Remove conditional HOTPLUG_CPU registration drm/i915: Select DEBUG_FS for our test suite drm/i915/guc: Advance over port[0] if set and not preempting drm/i915/guc: Tidy ELSP port assignment drm/i915: Use exponential backoff for wait_for() drm/i915/fbdev: Serialise early hotplug events with async fbdev config drm/i915: Flush everything on switching to the kernel_context drm/i915: Record default HW state in the GPU error state drm/i915: Rename shrinker init/cleanup to match driver initialisation phase drm/i915: Update shrinker drm_i915_private naming convention drm/i915: Rename i915_gem_timelines_mark_idle drm/i915: Enable hotplug polling after registering the outputs drm/i915: Skip switch-to-kernel-context on suspend when wedged drm/i915: Tidy up signed/unsigned comparison drm/i915: Set fake_vma.size as well as fake_vma.node.size for capture drm/i915/selftests: Wake the device before executing requests on the GPU drm/i915: Sleep and retry a GPU reset if at first we don't succeed drm/i915: Remove unsafe i915.enable_rc6 Daniel Vetter (2): drm/i915: sync dp link status checks against atomic commmits drm/i915: remove stale comment from sanitize_encoder David Weinehall (1): drm/i915: Don't use GEN6_RC_VIDEO_FREQ on gen10+ Imre Deak (1): drm/i915: Avoid PPS HW/SW state mismatch due to rounding James Ausmus (1): drm/i915/cnl: Mask previous DDI - PLL mapping Joonas Lahtinen (1): drm/i915: Disable THP until we have a GPU read BW W/A Lionel Landwerlin (2): drm/i915/perf: replace .reg accesses with i915_mmio_reg_offset drm/i915/perf: reuse timestamp frequency from device info Maarten Lankhorst (2): drm/i915: Make ips_enabled a property depending on whether IPS is enabled, v3. drm/i915: Enable IPS with only sprite plane visible too, v4. Matthew Auld (2): drm/i915/selftests: rein in igt_write_huge drm/i915/selftests: test descending addresses Michal Wajdeczko (2): drm/i915/guc: Rename i915_guc_reg.h to intel_guc_reg.h drm/i915/guc: Use consistent name for scratch register count Michel Thierry (1): drm/i915/execlists: Delay writing to ELSP until HW has processed the previous write Rodrigo Vivi (1): drm/i915: Update DRIVER_DATE to 20171201 Sagar Arun Kamble (4): drm/i915/guc: Update header guard name of intel_guc_submission.h drm/i915/guc: Change default GuC FW for SKL to v9.33 drm/i915/guc: Change default GuC FW for BXT to v9.29 drm/i915/guc: Change default GuC FW for KBL to v9.39 Tvrtko Ursulin (17): drm/i915: Extract intel_get_cagf drm/i915/pmu: Expose a PMU interface for perf queries drm/i915/pmu: Suspend sampling when GPU is idle drm/i915: Wrap context schedule notification drm/i915: Engine busy time tracking drm/i915/pmu: Wire up engine busy stats to PMU drm/i915/pmu: Add interrupt count metric drm/i915: Convert intel_rc6_residency_us to ns drm/i915/pmu: Add RC6 residency metrics drm/i915/pmu: Drop I915_ENGINE_SAMPLE_MAX from uapi headers drm/i915/pmu: Clear the previous sample value when parking drm/i915/pmu: Only allow running on a single CPU drm/i915/pmu: Stop averaging with the previous sample drm/i915/pmu: Aggregate all RC6 states into one counter drm/i915/pmu: Return -EINVAL when selecting the inactive CPU drm/i915: Move engine->needs_cmd_parser to engine->flags drm/i915: Consolidate checks for engine stats availability Valtteri Rantala (1): drm/i915/glk: Apply WaProgramL3SqcReg1DefaultForPerf for GLK too Ville Syrjälä (21): drm/i915: Fix init_clock_gating for resume drm/i915: Add .get_hw_state() method for planes drm/i915: Redo plane sanitation during readout drm/i915: s/enum plane/enum i9xx_plane_id/ drm/i915: Use enum i9xx_plane_id for the .get_fifo_size() hooks drm/i915: Cleanup enum pipe/enum plane_id/enum i9xx_plane_id in initial fb readout drm/i915: Nuke ironlake_get_initial_plane_config() drm/i915: Switch fbc over to for_each_new_intel_plane_in_state() drm/i915: Nuke crtc->plane drm/i915: Use plane->get_hw_state() for initial plane fb readout drm/i915: Add rudimentary plane state verification drm/i915: Don't try indexed reads to alternate slave addresses drm/i915: Prevent zero length "index" write drm/i915: Disable DP audio for g4x drm/i915: Don't add the "force audio" property to DP connectors that don't support audio drm/i915: Fix has_audio readout for DDI A drm/i915: Fix deadlock in i830_disable_pipe() drm/i915: Fix vblank timestamp/frame counter jumps on gen2 drm/i915: Wait for pipe to start on i830 as well drm/i915: Pass crtc state to intel_pipe_{enable,disable}() drm/i915: Interlaced DP output doesn't work on VLV/CHV drivers/gpu/drm/i915/Kconfig.debug | 1 + drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/gvt/render.c | 3 +- drivers/gpu/drm/i915/i915_cmd_parser.c | 7 +- drivers/gpu/drm/i915/i915_debugfs.c | 143 +--- drivers/gpu/drm/i915/i915_drv.c | 68 +- drivers/gpu/drm/i915/i915_drv.h | 56 +- drivers/gpu/drm/i915/i915_gem.c | 64 +- drivers/gpu/drm/i915/i915_gem_context.c | 316 +------- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 17 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 11 +- drivers/gpu/drm/i915/i915_gem_render_state.c | 4 - drivers/gpu/drm/i915/i915_gem_request.c | 25 +- drivers/gpu/drm/i915/i915_gem_shrinker.c | 138 ++-- drivers/gpu/drm/i915/i915_gem_timeline.c | 6 +- drivers/gpu/drm/i915/i915_gem_timeline.h | 2 +- drivers/gpu/drm/i915/i915_gemfs.c | 3 +- drivers/gpu/drm/i915/i915_gpu_error.c | 60 +- drivers/gpu/drm/i915/i915_irq.c | 4 +- drivers/gpu/drm/i915/i915_params.c | 15 - drivers/gpu/drm/i915/i915_params.h | 3 - drivers/gpu/drm/i915/i915_pci.c | 2 + drivers/gpu/drm/i915/i915_perf.c | 86 +- drivers/gpu/drm/i915/i915_pmu.c | 865 +++++++++++++++++++++ drivers/gpu/drm/i915/i915_pmu.h | 111 +++ drivers/gpu/drm/i915/i915_reg.h | 3 + drivers/gpu/drm/i915/i915_sysfs.c | 33 +- drivers/gpu/drm/i915/intel_cdclk.c | 2 +- drivers/gpu/drm/i915/intel_csr.c | 4 +- drivers/gpu/drm/i915/intel_ddi.c | 21 +- drivers/gpu/drm/i915/intel_display.c | 810 ++++++++++--------- drivers/gpu/drm/i915/intel_dp.c | 81 +- drivers/gpu/drm/i915/intel_drv.h | 30 +- drivers/gpu/drm/i915/intel_engine_cs.c | 167 +++- drivers/gpu/drm/i915/intel_fbc.c | 35 +- drivers/gpu/drm/i915/intel_fbdev.c | 10 +- drivers/gpu/drm/i915/intel_guc.c | 3 +- drivers/gpu/drm/i915/intel_guc.h | 2 +- drivers/gpu/drm/i915/intel_guc_fw.c | 14 +- .../drm/i915/{i915_guc_reg.h => intel_guc_reg.h} | 7 +- drivers/gpu/drm/i915/intel_guc_submission.c | 38 +- drivers/gpu/drm/i915/intel_guc_submission.h | 4 +- drivers/gpu/drm/i915/intel_gvt.c | 5 - drivers/gpu/drm/i915/intel_hangcheck.c | 44 +- drivers/gpu/drm/i915/intel_i2c.c | 4 +- drivers/gpu/drm/i915/intel_lrc.c | 86 +- drivers/gpu/drm/i915/intel_lrc.h | 4 - drivers/gpu/drm/i915/intel_panel.c | 88 +-- drivers/gpu/drm/i915/intel_pipe_crc.c | 2 - drivers/gpu/drm/i915/intel_pm.c | 234 +++--- drivers/gpu/drm/i915/intel_ringbuffer.c | 624 ++++++--------- drivers/gpu/drm/i915/intel_ringbuffer.h | 174 ++++- drivers/gpu/drm/i915/intel_sprite.c | 85 +- drivers/gpu/drm/i915/intel_uc_fw.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 3 - drivers/gpu/drm/i915/selftests/huge_pages.c | 176 +++-- drivers/gpu/drm/i915/selftests/i915_gem_context.c | 31 +- drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 2 + drivers/gpu/drm/i915/selftests/i915_gem_request.c | 20 - drivers/gpu/drm/i915/selftests/i915_random.c | 2 +- drivers/gpu/drm/i915/selftests/intel_guc.c | 4 +- drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 9 - include/uapi/drm/i915_drm.h | 40 + 63 files changed, 2851 insertions(+), 2063 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_pmu.c create mode 100644 drivers/gpu/drm/i915/i915_pmu.h rename drivers/gpu/drm/i915/{i915_guc_reg.h => intel_guc_reg.h} (98%) _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel