Return-Path: <kernel-team-bounces@lists.ubuntu.com> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 61465140BA3; Thu, 25 Feb 2016 02:35:03 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from <kernel-team-bounces@lists.ubuntu.com>) id 1aYbSp-0000fK-PA; Wed, 24 Feb 2016 15:34:55 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from <tjaalton@ubuntu.com>) id 1aYbSk-0000fA-55 for kernel-team@lists.ubuntu.com; Wed, 24 Feb 2016 15:34:50 +0000 Received: from ws-23-247.laitilanpuhelin.fi ([188.123.23.247] helo=wilson.tyrell) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from <tjaalton@ubuntu.com>) id 1aYbSj-0001l1-Rb for kernel-team@lists.ubuntu.com; Wed, 24 Feb 2016 15:34:49 +0000 Subject: [PULL v2][Xenial] i915_bpo for SKL/KBL/BXT To: Ubuntu Kernel Team <kernel-team@lists.ubuntu.com> References: <56CC3FE8.9000107@ubuntu.com> From: Timo Aaltonen <tjaalton@ubuntu.com> Message-ID: <56CDCD98.4080303@ubuntu.com> Date: Wed, 24 Feb 2016 17:34:48 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <56CC3FE8.9000107@ubuntu.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions <kernel-team.lists.ubuntu.com> List-Unsubscribe: <https://lists.ubuntu.com/mailman/options/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=unsubscribe> List-Archive: <https://lists.ubuntu.com/archives/kernel-team> List-Post: <mailto:kernel-team@lists.ubuntu.com> List-Help: <mailto:kernel-team-request@lists.ubuntu.com?subject=help> List-Subscribe: <https://lists.ubuntu.com/mailman/listinfo/kernel-team>, <mailto:kernel-team-request@lists.ubuntu.com?subject=subscribe> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com
On 23.02.2016 13:18, Timo Aaltonen wrote: > > Hi > > This time of year again, i915 backport for xx.04. The driver is based on > drm-intel-next-2016-02-14 tag, code that will end up in 4.6. There are > some commits to core drm & headers from 4.5 and some from drm-intel tree. > > This is used on Skylake too, because it shares the audio driver bits with KBL, > and because 4.4 still isn't good enough. The driver has been tested on SKL & KBL. > > BugLink: http://bugs.launchpad.net/bugs/1540390 > > > Folks wishing to test it (on SKL) can check out the canonical-x staging ppa: > > https://launchpad.net/~canonical-x/+archive/ubuntu/x-staging > > but be careful upgrading or you get the new xserver too, which still has issues > on nvidia hybrids. > > At the time of writing armhf i386 and powerpc were still building, but > the others succeeded so I feel confident enough to send this pull request :) So this version fixes a cherry-pick failure, and adds a commit to drm/i915 allowing it to boot with connector mask added to drm_crtc_state. It's currently building on x-staging ppa, and was manually tested on BDW. Thanks to Rico Tzschichholz for the heads-up about -7.22+bpo2 not booting :) -- The following changes since commit 7fa0f68982794301c88528b55653f6657a413b37: UBUNTU: Ubuntu-4.4.0-7.22 (2016-02-18 13:33:53 -0700) are available in the git repository at: https://git.launchpad.net/~tjaalton/ubuntu/+source/linux/+git/xenial i915-bpo for you to fetch changes up to 580ca2421a3227a61654b43e0d52ed25e30bf770: UBUNTU: i915_bpo: [Config] Enable CONFIG_DRM_I915_BPO=m (2016-02-24 16:50:15 +0200) ---------------------------------------------------------------- Chris Wilson (2): mm: Export nr_swap_pages drm/i915: Report context GTT size Deepak S (2): drm/i915/kbl: Add Kabylake PCI ID drm/i915/kbl: Add Kabylake GT4 PCI ID Imre Deak (1): drm/i915/bxt: update list of PCIIDs Jani Nikula (2): drm/i915: remove an extra level of indirection in PCI ID list drm: fix potential dangling else problems in for_each_ macros Libin Yang (1): dp/mst: add SDP stream support Lukas Wunner (1): async: export current_is_async() Maarten Lankhorst (6): drm/i915: Set connector_state->connector using the helper. drm/atomic: add connector mask to drm_crtc_state. drm/atomic: Do not unset crtc when an encoder is stolen drm/i915: Update connector_mask during readout, v2. drm/atomic: Add encoder_mask to crtc_state, v3. UBUNTU: SAUCE: drm/core: Add drm_encoder_index. Michał Winiarski (1): drm/i915/skl: Add missing SKL ids Takashi Iwai (1): drm/i915: Add get_eld audio component Thierry Reding (1): drm: Implement drm_modeset_lock_all_ctx() Timo Aaltonen (12): UBUNTU: SAUCE: i915_bpo: Provide a backport driver for SKL, KBL & BXT graphics UBUNTU: SAUCE: i915_bpo: Update intel_ips.h file location UBUNTU: SAUCE: i915_bpo: Rename the backport driver to i915_bpo UBUNTU: SAUCE: i915_bpo: Add i915_bpo_*() calls for ubuntu/i915 UBUNTU: SAUCE: Backport I915_PARAM_HAS_EXEC_SOFTPIN and EXEC_OBJECT_PINNED UBUNTU: SAUCE: i915_bpo: Revert passing plane/encoder name UBUNTU: SAUCE: sound/hda: Load i915_bpo from the hda driver on SKL/KBL/BXT UBUNTU: SAUCE: i915_bpo: Support only SKL, KBL and BXT with the backport driver UBUNTU: SAUCE: i915_bpo: Revert "drm/i915: Defer probe if gmux is present but its driver isn't" UBUNTU: SAUCE: uapi/drm/i915: Backport I915_EXEC_BSD_MASK UBUNTU: SAUCE: i915_bpo: Revert "drm/i915: Switch DDC when reading the EDID" UBUNTU: i915_bpo: [Config] Enable CONFIG_DRM_I915_BPO=m Ville Syrjälä (1): drm: Add "prefix" parameter to drm_rect_debug_print() debian.master/config/config.common.ubuntu | 1 + drivers/gpu/drm/drm_atomic.c | 18 +- drivers/gpu/drm/drm_atomic_helper.c | 57 +- drivers/gpu/drm/drm_crtc.c | 23 + drivers/gpu/drm/drm_dp_mst_topology.c | 38 +- drivers/gpu/drm/drm_modeset_lock.c | 89 +- drivers/gpu/drm/drm_rect.c | 7 +- drivers/gpu/drm/i915/i915_drv.c | 70 +- drivers/gpu/drm/i915/i915_gem_context.c | 8 + drivers/gpu/drm/i915/intel_audio.c | 42 + drivers/gpu/drm/i915/intel_display.c | 26 +- drivers/gpu/drm/i915/intel_drv.h | 2 + drivers/gpu/drm/i915/intel_sprite.c | 8 +- drivers/platform/x86/intel_ips.c | 39 + include/drm/drmP.h | 3 + include/drm/drm_atomic.h | 6 +- include/drm/drm_crtc.h | 10 +- include/drm/drm_dp_mst_helper.h | 7 +- include/drm/drm_modeset_lock.h | 4 +- include/drm/drm_rect.h | 3 +- include/drm/i915_component.h | 14 + include/drm/i915_drm_bpo.h | 36 + include/drm/i915_pciids.h | 42 +- include/sound/hda_i915.h | 5 + include/uapi/drm/i915_drm.h | 27 +- kernel/async.c | 1 + mm/swapfile.c | 6 + sound/hda/hdac_i915.c | 48 + sound/pci/hda/hda_intel.c | 7 +- ubuntu/Kconfig | 7 + ubuntu/Makefile | 7 + ubuntu/i915/Kconfig | 47 + ubuntu/i915/Makefile | 102 + ubuntu/i915/dvo.h | 139 + ubuntu/i915/dvo_ch7017.c | 414 + ubuntu/i915/dvo_ch7xxx.c | 368 + ubuntu/i915/dvo_ivch.c | 502 + ubuntu/i915/dvo_ns2501.c | 709 ++ ubuntu/i915/dvo_sil164.c | 279 + ubuntu/i915/dvo_tfp410.c | 318 + ubuntu/i915/i915_cmd_parser.c | 1228 +++ ubuntu/i915/i915_debugfs.c | 5574 ++++++++++ ubuntu/i915/i915_dma.c | 1385 +++ ubuntu/i915/i915_drv.c | 1750 +++ ubuntu/i915/i915_drv.h | 3640 +++++++ ubuntu/i915/i915_gem.c | 5361 +++++++++ ubuntu/i915/i915_gem_batch_pool.c | 151 + ubuntu/i915/i915_gem_batch_pool.h | 42 + ubuntu/i915/i915_gem_context.c | 988 ++ ubuntu/i915/i915_gem_debug.c | 70 + ubuntu/i915/i915_gem_dmabuf.c | 356 + ubuntu/i915/i915_gem_evict.c | 278 + ubuntu/i915/i915_gem_execbuffer.c | 1824 ++++ ubuntu/i915/i915_gem_fence.c | 800 ++ ubuntu/i915/i915_gem_gtt.c | 3646 +++++++ ubuntu/i915/i915_gem_gtt.h | 563 + ubuntu/i915/i915_gem_render_state.c | 229 + ubuntu/i915/i915_gem_render_state.h | 49 + ubuntu/i915/i915_gem_shrinker.c | 386 + ubuntu/i915/i915_gem_stolen.c | 709 ++ ubuntu/i915/i915_gem_tiling.c | 335 + ubuntu/i915/i915_gem_userptr.c | 818 ++ ubuntu/i915/i915_gpu_error.c | 1435 +++ ubuntu/i915/i915_guc_reg.h | 111 + ubuntu/i915/i915_guc_submission.c | 1029 ++ ubuntu/i915/i915_ioc32.c | 99 + ubuntu/i915/i915_irq.c | 4705 ++++++++ ubuntu/i915/i915_params.c | 206 + ubuntu/i915/i915_params.h | 68 + ubuntu/i915/i915_reg.h | 8196 ++++++++++++++ ubuntu/i915/i915_suspend.c | 196 + ubuntu/i915/i915_sysfs.c | 648 ++ ubuntu/i915/i915_trace.h | 818 ++ ubuntu/i915/i915_trace_points.c | 13 + ubuntu/i915/i915_vgpu.c | 264 + ubuntu/i915/i915_vgpu.h | 117 + ubuntu/i915/intel_acpi.c | 164 + ubuntu/i915/intel_atomic.c | 312 + ubuntu/i915/intel_atomic_plane.c | 257 + ubuntu/i915/intel_audio.c | 834 ++ ubuntu/i915/intel_bios.c | 1433 +++ ubuntu/i915/intel_bios.h | 994 ++ ubuntu/i915/intel_crt.c | 895 ++ ubuntu/i915/intel_csr.c | 466 + ubuntu/i915/intel_ddi.c | 3336 ++++++ ubuntu/i915/intel_display.c | 16291 ++++++++++++++++++++++++++++ ubuntu/i915/intel_dp.c | 6124 +++++++++++ ubuntu/i915/intel_dp_link_training.c | 342 + ubuntu/i915/intel_dp_mst.c | 627 ++ ubuntu/i915/intel_drv.h | 1618 +++ ubuntu/i915/intel_dsi.c | 1244 +++ ubuntu/i915/intel_dsi.h | 135 + ubuntu/i915/intel_dsi_panel_vbt.c | 714 ++ ubuntu/i915/intel_dsi_pll.c | 531 + ubuntu/i915/intel_dvo.c | 547 + ubuntu/i915/intel_fbc.c | 1261 +++ ubuntu/i915/intel_fbdev.c | 822 ++ ubuntu/i915/intel_fifo_underrun.c | 444 + ubuntu/i915/intel_frontbuffer.c | 243 + ubuntu/i915/intel_guc.h | 130 + ubuntu/i915/intel_guc_fwif.h | 450 + ubuntu/i915/intel_guc_loader.c | 648 ++ ubuntu/i915/intel_hdmi.c | 2237 ++++ ubuntu/i915/intel_hotplug.c | 513 + ubuntu/i915/intel_i2c.c | 735 ++ ubuntu/i915/intel_lrc.c | 2642 +++++ ubuntu/i915/intel_lrc.h | 124 + ubuntu/i915/intel_lvds.c | 1189 ++ ubuntu/i915/intel_mocs.c | 344 + ubuntu/i915/intel_mocs.h | 57 + ubuntu/i915/intel_modes.c | 137 + ubuntu/i915/intel_opregion.c | 1026 ++ ubuntu/i915/intel_overlay.c | 1593 +++ ubuntu/i915/intel_panel.c | 1818 ++++ ubuntu/i915/intel_pm.c | 7344 +++++++++++++ ubuntu/i915/intel_psr.c | 804 ++ ubuntu/i915/intel_renderstate.h | 41 + ubuntu/i915/intel_renderstate_gen6.c | 315 + ubuntu/i915/intel_renderstate_gen7.c | 279 + ubuntu/i915/intel_renderstate_gen8.c | 983 ++ ubuntu/i915/intel_renderstate_gen9.c | 999 ++ ubuntu/i915/intel_ringbuffer.c | 3164 ++++++ ubuntu/i915/intel_ringbuffer.h | 519 + ubuntu/i915/intel_runtime_pm.c | 2328 ++++ ubuntu/i915/intel_sdvo.c | 3082 ++++++ ubuntu/i915/intel_sdvo_regs.h | 730 ++ ubuntu/i915/intel_sideband.c | 269 + ubuntu/i915/intel_sprite.c | 1125 ++ ubuntu/i915/intel_tv.c | 1705 +++ ubuntu/i915/intel_uncore.c | 1641 +++ 130 files changed, 130114 insertions(+), 117 deletions(-) create mode 100644 include/drm/i915_drm_bpo.h create mode 100644 ubuntu/i915/Kconfig create mode 100644 ubuntu/i915/Makefile create mode 100644 ubuntu/i915/dvo.h create mode 100644 ubuntu/i915/dvo_ch7017.c create mode 100644 ubuntu/i915/dvo_ch7xxx.c create mode 100644 ubuntu/i915/dvo_ivch.c create mode 100644 ubuntu/i915/dvo_ns2501.c create mode 100644 ubuntu/i915/dvo_sil164.c create mode 100644 ubuntu/i915/dvo_tfp410.c create mode 100644 ubuntu/i915/i915_cmd_parser.c create mode 100644 ubuntu/i915/i915_debugfs.c create mode 100644 ubuntu/i915/i915_dma.c create mode 100644 ubuntu/i915/i915_drv.c create mode 100644 ubuntu/i915/i915_drv.h create mode 100644 ubuntu/i915/i915_gem.c create mode 100644 ubuntu/i915/i915_gem_batch_pool.c create mode 100644 ubuntu/i915/i915_gem_batch_pool.h create mode 100644 ubuntu/i915/i915_gem_context.c create mode 100644 ubuntu/i915/i915_gem_debug.c create mode 100644 ubuntu/i915/i915_gem_dmabuf.c create mode 100644 ubuntu/i915/i915_gem_evict.c create mode 100644 ubuntu/i915/i915_gem_execbuffer.c create mode 100644 ubuntu/i915/i915_gem_fence.c create mode 100644 ubuntu/i915/i915_gem_gtt.c create mode 100644 ubuntu/i915/i915_gem_gtt.h create mode 100644 ubuntu/i915/i915_gem_render_state.c create mode 100644 ubuntu/i915/i915_gem_render_state.h create mode 100644 ubuntu/i915/i915_gem_shrinker.c create mode 100644 ubuntu/i915/i915_gem_stolen.c create mode 100644 ubuntu/i915/i915_gem_tiling.c create mode 100644 ubuntu/i915/i915_gem_userptr.c create mode 100644 ubuntu/i915/i915_gpu_error.c create mode 100644 ubuntu/i915/i915_guc_reg.h create mode 100644 ubuntu/i915/i915_guc_submission.c create mode 100644 ubuntu/i915/i915_ioc32.c create mode 100644 ubuntu/i915/i915_irq.c create mode 100644 ubuntu/i915/i915_params.c create mode 100644 ubuntu/i915/i915_params.h create mode 100644 ubuntu/i915/i915_reg.h create mode 100644 ubuntu/i915/i915_suspend.c create mode 100644 ubuntu/i915/i915_sysfs.c create mode 100644 ubuntu/i915/i915_trace.h create mode 100644 ubuntu/i915/i915_trace_points.c create mode 100644 ubuntu/i915/i915_vgpu.c create mode 100644 ubuntu/i915/i915_vgpu.h create mode 100644 ubuntu/i915/intel_acpi.c create mode 100644 ubuntu/i915/intel_atomic.c create mode 100644 ubuntu/i915/intel_atomic_plane.c create mode 100644 ubuntu/i915/intel_audio.c create mode 100644 ubuntu/i915/intel_bios.c create mode 100644 ubuntu/i915/intel_bios.h create mode 100644 ubuntu/i915/intel_crt.c create mode 100644 ubuntu/i915/intel_csr.c create mode 100644 ubuntu/i915/intel_ddi.c create mode 100644 ubuntu/i915/intel_display.c create mode 100644 ubuntu/i915/intel_dp.c create mode 100644 ubuntu/i915/intel_dp_link_training.c create mode 100644 ubuntu/i915/intel_dp_mst.c create mode 100644 ubuntu/i915/intel_drv.h create mode 100644 ubuntu/i915/intel_dsi.c create mode 100644 ubuntu/i915/intel_dsi.h create mode 100644 ubuntu/i915/intel_dsi_panel_vbt.c create mode 100644 ubuntu/i915/intel_dsi_pll.c create mode 100644 ubuntu/i915/intel_dvo.c create mode 100644 ubuntu/i915/intel_fbc.c create mode 100644 ubuntu/i915/intel_fbdev.c create mode 100644 ubuntu/i915/intel_fifo_underrun.c create mode 100644 ubuntu/i915/intel_frontbuffer.c create mode 100644 ubuntu/i915/intel_guc.h create mode 100644 ubuntu/i915/intel_guc_fwif.h create mode 100644 ubuntu/i915/intel_guc_loader.c create mode 100755 ubuntu/i915/intel_hdmi.c create mode 100644 ubuntu/i915/intel_hotplug.c create mode 100644 ubuntu/i915/intel_i2c.c create mode 100644 ubuntu/i915/intel_lrc.c create mode 100644 ubuntu/i915/intel_lrc.h create mode 100644 ubuntu/i915/intel_lvds.c create mode 100644 ubuntu/i915/intel_mocs.c create mode 100644 ubuntu/i915/intel_mocs.h create mode 100644 ubuntu/i915/intel_modes.c create mode 100644 ubuntu/i915/intel_opregion.c create mode 100644 ubuntu/i915/intel_overlay.c create mode 100644 ubuntu/i915/intel_panel.c create mode 100644 ubuntu/i915/intel_pm.c create mode 100644 ubuntu/i915/intel_psr.c create mode 100644 ubuntu/i915/intel_renderstate.h create mode 100644 ubuntu/i915/intel_renderstate_gen6.c create mode 100644 ubuntu/i915/intel_renderstate_gen7.c create mode 100644 ubuntu/i915/intel_renderstate_gen8.c create mode 100644 ubuntu/i915/intel_renderstate_gen9.c create mode 100644 ubuntu/i915/intel_ringbuffer.c create mode 100644 ubuntu/i915/intel_ringbuffer.h create mode 100644 ubuntu/i915/intel_runtime_pm.c create mode 100644 ubuntu/i915/intel_sdvo.c create mode 100644 ubuntu/i915/intel_sdvo_regs.h create mode 100644 ubuntu/i915/intel_sideband.c create mode 100644 ubuntu/i915/intel_sprite.c create mode 100644 ubuntu/i915/intel_tv.c create mode 100644 ubuntu/i915/intel_uncore.c
Applied to xenial. I have applied this for the next upload, I am deliberatly separating it from the previous upload to minimise risk. -apw