Hi Dave, drm-intel-next-2017-03-20: More in i915 for 4.12: - designware i2c fixes from Hans de Goede, in a topic branch shared with other subsystems (maybe, they didn't confirm, but requested the pull) - drop drm_panel usage from the intel dsi vbt panel (Jani) - vblank evasion improvements and tracing (Maarten and Ville) - clarify spinlock irq semantics again a bit (Tvrtko) - new ->pwrite backend hook (right now just for shmem pageche writes), from Chris - more planar/ccs work from Ville - hotplug safe connector iterators everywhere - userptr fixes (Chris) - selftests for cache coloring eviction (Matthew Auld) - extend debugfs drop_caches interface for shrinker testing (Chris) - baytrail "the rps kills the machine" fix (Chris) - use new atomic state iterators, a lot (Maarten) - refactor guc/huc code some (Arkadiusz Hiler) - tighten breadcrumbs rbtree a bit (Chris) - improve wrap-around and time handling in rps residency counters (Mika) - split reset-in-progress in two flags, backoff and handoff (Chris) - other misc reset improvements from a few people - bunch of vgpu interaction fixes with recent code changes - misc stuff all over, as usual I need backmerges for reasons and a resync with Linus' tree might not hurt either, so please pull in -rc3 too (won't matter much whether before or after). There shouldn't be any conflicts, but the next -fixes pull with gvt stuff conflicts horribly with -next. Just a heads up, you can deal with that next week or maybe even later :-) Cheers, Daniel The following changes since commit 6796b129b0e98162a84e0b6322ac28587556d427: Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-next (2017-03-08 12:54:58 +1000) are available in the git repository at: git://anongit.freedesktop.org/git/drm-intel tags/drm-intel-next-2017-03-20 for you to fetch changes up to c5bd2e14e85d180bc7fb3b8b62ac9348bddaf898: drm/i915: Update DRIVER_DATE to 20170320 (2017-03-20 08:21:05 +0100) ---------------------------------------------------------------- More in i915 for 4.12: - designware i2c fixes from Hans de Goede, in a topic branch shared with other subsystems (maybe, they didn't confirm, but requested the pull) - drop drm_panel usage from the intel dsi vbt panel (Jani) - vblank evasion improvements and tracing (Maarten and Ville) - clarify spinlock irq semantics again a bit (Tvrtko) - new ->pwrite backend hook (right now just for shmem pageche writes), from Chris - more planar/ccs work from Ville - hotplug safe connector iterators everywhere - userptr fixes (Chris) - selftests for cache coloring eviction (Matthew Auld) - extend debugfs drop_caches interface for shrinker testing (Chris) - baytrail "the rps kills the machine" fix (Chris) - use new atomic state iterators, a lot (Maarten) - refactor guc/huc code some (Arkadiusz Hiler) - tighten breadcrumbs rbtree a bit (Chris) - improve wrap-around and time handling in rps residency counters (Mika) - split reset-in-progress in two flags, backoff and handoff (Chris) - other misc reset improvements from a few people - bunch of vgpu interaction fixes with recent code changes - misc stuff all over, as usual ---------------------------------------------------------------- Ander Conselvan de Oliveira (3): drm/i915/glk: Remove MODULE_FIRMWARE() tag from Geminilake's DMC drm/i915/glk: Improve rounding caused by pre-CSC gamma tables drm/i915/glk: Enable pooled EUs for Geminilake Andrew Morton (1): drivers/gpu/drm/i915/selftests/i915_selftest.c: fix build with gcc-4.4.4 Anusha Srivatsa (1): drm/i915/: DMC 1.04 for Geminilake Arkadiusz Hiler (11): drm/i915/uc: Drop superfluous externs in intel_uc.h drm/i915/huc: Add huc_to_i915 drm/i915/uc: Rename intel_?uc_{setup, load}() to _init_hw() drm/i915/uc: Move intel_uc_fw_fetch() to intel_uc.c drm/i915/uc: Introduce intel_uc_init_fw() drm/i915/guc: Extract param logic form guc_init_fw() drm/i915/guc: Simplify intel_guc_init_hw() drm/i915/uc: Simplify firmware path handling drm/i915/uc: Separate firmware selection and preparation drm/i915/uc: Add params for specifying firmware drm/i915/uc: Rename intel_uc_fw.fw to .type Bing Niu (1): drm/i915: suppress atomic commit error message under gvt-g env Changbin Du (1): drm/i915: make context status notifier head be per engine Chris Wilson (50): drm/i915: Wake up all waiters before idling drm/i915: Take rpm wakelock for releasing the fence on unbind drm/i915: Avoid clearing the base drm_crtc_state drm/i915: Flush idle work when changing missed-irq fault injection drm/i915: Store a permanent error in obj->mm.pages drm/i915: Use pagecache write to prepopulate shmemfs from pwrite-ioctl drm/i915: Avoiding recursing on ww_mutex inside shrinker drm/i915: Purge i915_gem_object_is_dead() drm/i915: Check for an invalid seqno before __i915_gem_request_started drm/i915/userptr: Deactivate a failed userptr if the worker reports an EFAULT drm/i915/userptr: Only flush the workqueue if required drm/i915/userptr: Disallow wrapping GTT into a userptr drm/i915: Ignore skl+ for debugfs/i915_sr_status drm/i915/cmdparser: Limit clflush to active cachelines drm/i915: Extend debugfs/i915_drop_caches to call i915_gem_shrink_all() drm/i915: Stop using RP_DOWN_EI on Baytrail drm/i915: Use max(render, media) for Baytrail busyness calculation drm/i915: Defer unmasking RPS interrupts until after making adjustments drm/i915: Rename REDIRECT_TO_GUC bit drm/i915: Move whole object to CPU domain for coherent shmem access drm/i915/selftests: Fix error path for ggtt walk_hole() drm/i915/selftests: Catch error from mock_file() drm/i915: Inline gen6_sanitize_rps_pm_mask() drm/i915: Extend rpm wakelock for debugfs/i915_drpc_info drm/i915: Avoid rcu_barrier() from reclaim paths (shrinker) drm/i915: Extend rpm wakelock during i915_handle_error() drm/i915/breadcrumbs: Use booleans for intel_breadcrumbs_busy() drm/i915/breadcrumbs: Update bottom-half before marking as complete drm/i915/breadcrumbs: Disable interrupt bottom-half first on idling drm/i915/breadcrumbs: Assert that we do not shortcut the current bottom-half drm/i915: Only attempt to signal the request once from the interrupt handler drm/i915/breadcrumbs: Tweak commentary drm/i915/userptr: Reinvent GGTT self-faulting protection drm/i915: Replace irq_seqno_barrier on hws write with a clflush drm/i915/scheduler: emulate a scheduler for guc drm/i915: Split I915_RESET_IN_PROGRESS into two flags drm/i915: Move engine->submit_request selection to a vfunc drm/i915: Restore engine->submit_request before unwedging drm/i915: Wait for reset to complete before returning from debugfs/i915_wedged drm/i915: Assert that the context pin_counts do not overflow drm/i915: Avoid use-after-free of ctx in request tracepoints drm/i915: Remove superfluous i915_add_request_no_flush() helper drm/i915: Squelch WARN for VLV_COUNTER_CONTROL drm/i915: Stop using obj->obj_exec_link outside of execbuf drm/i915: Skip execlists_dequeue() early if the list is empty drm/i915: Add i810/i815 pci-ids for completeness drm/i915: Retire an active batch pool object rather than allocate new drm/i915: i915_gem_object_create_from_data() doesn't require struct_mutex drm/i915: Correct error handling for i915_gem_object_create_from_data() drm/i915: Initialise i915_gem_object_create_from_data() directly Daniel Vetter (11): Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued drm/i915: Use drm_connector_list_iter in debugfs drm/i915: use drm_connector_list_iter in intel_hotplug.c drm/i915: use drm_connector_list_iter in intel_opregion.c drm/i915: Make intel_get_pipe_from_connector atomic drm/i915: use for_each_intel_connector_iter in intel_display.c drm/i915: Fix up verify_encoder_state Merge tag 'topic/designware-baytrail-2017-03-02' of git://anongit.freedesktop.org/git/drm-intel into drm-intel-next-queued drm/i915: annote drop_caches debugfs interface with lockdep drm/i915: Merge pre/postclose hooks drm/i915: Update DRIVER_DATE to 20170320 Hans de Goede (12): x86/platform/intel/iosf_mbi: Add a mutex for P-Unit access x86/platform/intel/iosf_mbi: Add a PMIC bus access notifier i2c: designware: Rename accessor_flags to flags i2c: designware-baytrail: Pass dw_i2c_dev into helper functions i2c: designware-baytrail: Only check iosf_mbi_available() for shared hosts i2c: designware-baytrail: Disallow the CPU to enter C6 or C7 while holding the punit semaphore i2c: designware-baytrail: Fix race when resetting the semaphore i2c: designware-baytrail: Add support for cherrytrail i2c: designware-baytrail: Acquire P-Unit access on bus acquire i2c: designware-baytrail: Call pmic_bus_access_notifier_chain drm/i915: Add intel_uncore_suspend / resume functions drm/i915: Listen for PMIC bus access notifications Jani Nikula (9): drm/i915/dsi: remove support for more than one panel driver drm/i915/dsi: call vbt_panel_get_modes directly instead of via drm_panel drm/i915/dsi: stop using the drm_panel framework completely drm/i915/dsi: rename intel_dsi_exec_vbt_sequence to intel_dsi_vbt_exec_sequence drm/i915/dsi: rename intel_dsi_pre_disable to intel_dsi_disable drm/i915/dsi: rename intel_dsi_panel_vbt.c to intel_dsi_vbt.c drm/i915/dsi: arrange intel_dsi.h according to relevant files drm/i915/vbt: don't propagate errors from intel_bios_init() drm/i915/vbt: split out defaults that are set when there is no VBT Maarten Lankhorst (8): drm/i915: Move updating color management to before vblank evasion drm/i915: Complain if we take too long under vblank evasion. drm/i915: Nuke skl_update_plane debug message from the pipe update critical section drm/i915: Use new atomic iterator macros in ddi drm/i915: Use new atomic iterator macros in fbc drm/i915: Use new atomic iterator macros in wm code drm/i915: Use new atomic iterator macros in display code drm/i915: Use new atomic iterator macros in cdclk Matthew Auld (3): drm/i915/selftests: don't leak the gem object drm/i915: use correct node for handling cache domain eviction drm/i915/selftests: exercise cache domain eviction Michal Wajdeczko (2): drm/i915/guc: Use formalized struct definition for ads object drm/i915: Make intel_uc_sanitize_options() more robust Mika Kuoppala (6): drm/i915: Move residency calculation into intel_pm.c drm/i915: Return residency as microseconds drm/i915: Extend vlv/chv residency resolution drm/i915: Convert debugfs to use generic residency calculator drm/i915: Use ktime to calculate rc0 residency drm/i915: Use coarse grained residency counter with byt Paulo Zanoni (2): drm/i915: remove potentially confusing IS_G4X checks drm/i915: move the {skl, bxt}_{i, uni}nit_cdclk declarations Sagar Arun Kamble (4): drm/i915: Initialize pm_intr_keep during intel_irq_init for GuC drm/i915/guc: Release GuC interrupts in i915_guc_submission_disable drm/i915: s/pm_intr_keep/pm_intrmsk_mbz drm/i915/guc: Update rps.pm_intrmsk_mbz in guc_interrupts_capture/release Shashank Sharma (1): drm/i915: Remove intel_ prefix from encoder variables in intel_ddi.c Tvrtko Ursulin (6): drm/i915: No need to save/restore irq status in __i915_request_irq_complete drm/i915: No need to save/restore irq status in intel_breadcrumbs_fake_irq drm/i915: No need to save/restore irq status in intel_engine_wakeup drm/i915/guc: Fix request re-submission after reset drm/i915: Fix forcewake active domain tracking drm/i915/vgpu: Neuter forcewakes for VGPU more thoroughly Ville Syrjälä (13): drm/i915: Nuke debug messages from the pipe update critical section drm/i915: Plumb drm_framebuffer into more places drm/i915: Move nv12 chroma plane handling into intel_surf_alignment() drm/i915: Avoid div-by-zero when computing aux_stride w/o an aux plane drm/i915: Pass the correct plane index to _intel_compute_tile_offset() drm/i915: Use DRM_DEBUG_KMS() for framebuffer failure debug messages drm/i915: Reject HDMI 12bpc if the sink doesn't indicate support drm/i915: Use I915_READ_FW in i915_get_vblank_counter() drm/i915: s/__raw_i915_read32/I915_READ_FW/ in the SKL+ scanline read w/a drm/i915: Organize plane register writes into tighter bunches drm/i915: Use I915_READ_FW for plane updates drm/i915: Optimize VLV/CHV display FIFO updates Revert "drm/i915: Ignore panel type from OpRegion on SKL" Zhenyu Wang (1): drm/i915: Fix vGPU balloon for ggtt guard page arch/x86/include/asm/iosf_mbi.h | 87 +++ arch/x86/platform/intel/iosf_mbi.c | 49 ++ drivers/gpu/drm/i915/Kconfig | 1 + drivers/gpu/drm/i915/Makefile | 2 +- drivers/gpu/drm/i915/gvt/gvt.h | 2 +- drivers/gpu/drm/i915/gvt/scheduler.c | 47 +- drivers/gpu/drm/i915/i915_cmd_parser.c | 25 +- drivers/gpu/drm/i915/i915_debugfs.c | 278 +++++---- drivers/gpu/drm/i915/i915_drv.c | 42 +- drivers/gpu/drm/i915/i915_drv.h | 87 ++- drivers/gpu/drm/i915/i915_gem.c | 260 +++++++-- drivers/gpu/drm/i915/i915_gem_batch_pool.c | 37 +- drivers/gpu/drm/i915/i915_gem_context.c | 3 +- drivers/gpu/drm/i915/i915_gem_context.h | 3 - drivers/gpu/drm/i915/i915_gem_evict.c | 8 +- drivers/gpu/drm/i915/i915_gem_fence_reg.c | 11 +- drivers/gpu/drm/i915/i915_gem_object.h | 9 +- drivers/gpu/drm/i915/i915_gem_request.c | 2 +- drivers/gpu/drm/i915/i915_gem_request.h | 5 +- drivers/gpu/drm/i915/i915_gem_shrinker.c | 2 +- drivers/gpu/drm/i915/i915_gem_userptr.c | 75 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 257 +++++++-- drivers/gpu/drm/i915/i915_irq.c | 207 +++---- drivers/gpu/drm/i915/i915_params.c | 10 + drivers/gpu/drm/i915/i915_params.h | 2 + drivers/gpu/drm/i915/i915_reg.h | 5 +- drivers/gpu/drm/i915/i915_sysfs.c | 28 +- drivers/gpu/drm/i915/i915_trace.h | 8 +- drivers/gpu/drm/i915/i915_utils.h | 2 + drivers/gpu/drm/i915/i915_vgpu.c | 8 +- drivers/gpu/drm/i915/intel_bios.c | 46 +- drivers/gpu/drm/i915/intel_breadcrumbs.c | 101 ++-- drivers/gpu/drm/i915/intel_cdclk.c | 6 +- drivers/gpu/drm/i915/intel_color.c | 4 +- drivers/gpu/drm/i915/intel_csr.c | 5 +- drivers/gpu/drm/i915/intel_ddi.c | 70 +-- drivers/gpu/drm/i915/intel_device_info.c | 9 +- drivers/gpu/drm/i915/intel_display.c | 635 +++++++++++---------- drivers/gpu/drm/i915/intel_drv.h | 29 +- drivers/gpu/drm/i915/intel_dsi.c | 76 +-- drivers/gpu/drm/i915/intel_dsi.h | 14 +- .../{intel_dsi_panel_vbt.c => intel_dsi_vbt.c} | 46 +- drivers/gpu/drm/i915/intel_engine_cs.c | 17 +- drivers/gpu/drm/i915/intel_fbc.c | 2 +- drivers/gpu/drm/i915/intel_fbdev.c | 4 +- drivers/gpu/drm/i915/intel_guc_loader.c | 447 ++------------- drivers/gpu/drm/i915/intel_hdmi.c | 24 +- drivers/gpu/drm/i915/intel_hotplug.c | 28 +- drivers/gpu/drm/i915/intel_huc.c | 113 ++-- drivers/gpu/drm/i915/intel_lrc.c | 36 +- drivers/gpu/drm/i915/intel_lrc.h | 1 - drivers/gpu/drm/i915/intel_opregion.c | 26 +- drivers/gpu/drm/i915/intel_overlay.c | 8 +- drivers/gpu/drm/i915/intel_pm.c | 133 ++++- drivers/gpu/drm/i915/intel_ringbuffer.c | 16 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 11 + drivers/gpu/drm/i915/intel_sprite.c | 288 ++++++---- drivers/gpu/drm/i915/intel_uc.c | 287 ++++++++++ drivers/gpu/drm/i915/intel_uc.h | 25 +- drivers/gpu/drm/i915/intel_uncore.c | 140 +++-- drivers/gpu/drm/i915/selftests/i915_gem_context.c | 6 +- drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 90 +++ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 22 +- drivers/gpu/drm/i915/selftests/i915_selftest.c | 4 +- drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 18 +- drivers/i2c/busses/i2c-designware-baytrail.c | 83 ++- drivers/i2c/busses/i2c-designware-core.c | 14 +- drivers/i2c/busses/i2c-designware-core.h | 13 +- drivers/i2c/busses/i2c-designware-pcidrv.c | 26 +- drivers/i2c/busses/i2c-designware-platdrv.c | 8 +- include/drm/i915_pciids.h | 8 + kernel/locking/lockdep.c | 2 + 72 files changed, 2661 insertions(+), 1842 deletions(-) rename drivers/gpu/drm/i915/{intel_dsi_panel_vbt.c => intel_dsi_vbt.c} (95%) -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx