mbox

[PULL?] i915_bpo rebase to ~4.6-rc1

Message ID 56F3DE88.4030903@ubuntu.com
State New
Headers show

Pull-request

https://git.launchpad.net/~tjaalton/ubuntu/+source/linux/+git/xenial i915-bpo

Message

Timo Aaltonen March 24, 2016, 12:33 p.m. UTC
BugLink: http://bugs.launchpad.net/bugs/1560395

	Hi

  This branch would update i915_bpo from an upstream prerelease tag to what
will be in 4.6-rc1. The caveat is that while the module loads and works fine
on Skylake, it fails on Kabylake with

i915_bpo: Unknown symbol pm_runtime_get_if_in_use (err 0)

and I've no idea why, since the commit to add that symbol is included and
the kernel should have that.. but I've sent this anyway in case someone
has better ideas on why it fails here...

--

The following changes since commit 3045e95c430122aff2e6c0c9ae650e812e4117c3:

  UBUNTU: Ubuntu-4.4.0-15.31 (2016-03-18 12:49:37 -0600)

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 885ec0587d39584356e5040eef275a97daeb7f30:

  drm/atomic-helper: Implement subsystem-level suspend/resume (2016-03-24 12:19:30 +0200)

----------------------------------------------------------------
Maarten Lankhorst (1):
      drm/core: Add drm_for_each_encoder_mask, v2.

Rafael J. Wysocki (1):
      PM / runtime: Add new helper for conditional usage count incrementation

Thierry Reding (1):
      drm/atomic-helper: Implement subsystem-level suspend/resume

Timo Aaltonen (1):
      UBUNTU: SAUCE: i915_bpo: Update to drm-intel-next-fixes-2016-03-16

 Documentation/power/runtime_pm.txt        |   6 +
 debian.master/config/config.common.ubuntu |   1 +
 drivers/base/power/runtime.c              |  24 ++
 drivers/gpu/drm/drm_atomic_helper.c       | 162 +++++++-
 drivers/gpu/drm/drm_crtc_helper.c         |   6 +
 include/drm/drm_atomic_helper.h           |   6 +
 include/drm/drm_crtc.h                    |  11 +
 include/linux/pm_runtime.h                |   5 +
 ubuntu/i915/Kconfig                       |  13 +-
 ubuntu/i915/i915_debugfs.c                |  56 +--
 ubuntu/i915/i915_dma.c                    |   4 +-
 ubuntu/i915/i915_drv.c                    |   8 -
 ubuntu/i915/i915_drv.h                    |  16 +-
 ubuntu/i915/i915_gem.c                    |  99 +++--
 ubuntu/i915/i915_gem_context.c            |   8 +-
 ubuntu/i915/i915_gem_evict.c              |   6 +-
 ubuntu/i915/i915_gem_execbuffer.c         |   5 +-
 ubuntu/i915/i915_gem_gtt.c                |  22 +-
 ubuntu/i915/i915_gem_gtt.h                |  11 +-
 ubuntu/i915/i915_gem_shrinker.c           |   4 +-
 ubuntu/i915/i915_gem_stolen.c             |   4 +-
 ubuntu/i915/i915_gem_userptr.c            |   2 +-
 ubuntu/i915/i915_gpu_error.c              |   8 +-
 ubuntu/i915/i915_irq.c                    |  37 +-
 ubuntu/i915/i915_params.c                 |  17 +-
 ubuntu/i915/i915_params.h                 |   1 -
 ubuntu/i915/i915_reg.h                    |  16 +-
 ubuntu/i915/i915_trace.h                  |  27 +-
 ubuntu/i915/intel_atomic.c                |   1 +
 ubuntu/i915/intel_audio.c                 |   3 +
 ubuntu/i915/intel_crt.c                   |  23 +-
 ubuntu/i915/intel_csr.c                   |  10 +-
 ubuntu/i915/intel_ddi.c                   | 113 ++++--
 ubuntu/i915/intel_display.c               | 625 ++++++++++++++++--------------
 ubuntu/i915/intel_dp.c                    |  53 ++-
 ubuntu/i915/intel_drv.h                   |  14 +-
 ubuntu/i915/intel_dsi.c                   |  29 +-
 ubuntu/i915/intel_dsi.h                   |   2 +
 ubuntu/i915/intel_dsi_panel_vbt.c         |   5 +-
 ubuntu/i915/intel_dsi_pll.c               |   2 +-
 ubuntu/i915/intel_fbc.c                   |   4 +-
 ubuntu/i915/intel_fbdev.c                 |  17 +-
 ubuntu/i915/intel_guc_loader.c            |   6 +-
 ubuntu/i915/intel_hdmi.c                  |  16 +-
 ubuntu/i915/intel_i2c.c                   |   6 +
 ubuntu/i915/intel_lrc.c                   |  33 +-
 ubuntu/i915/intel_lvds.c                  |  14 +-
 ubuntu/i915/intel_pm.c                    |  22 +-
 ubuntu/i915/intel_psr.c                   |   9 +
 ubuntu/i915/intel_ringbuffer.c            |   4 +-
 ubuntu/i915/intel_runtime_pm.c            | 196 ++++++++--
 ubuntu/i915/intel_tv.c                    |  11 +-
 52 files changed, 1167 insertions(+), 636 deletions(-)

Comments

Tim Gardner March 28, 2016, 1:09 p.m. UTC | #1
On 03/24/2016 06:33 AM, Timo Aaltonen wrote:
> 
> BugLink: http://bugs.launchpad.net/bugs/1560395
> 
> 	Hi
> 
>   This branch would update i915_bpo from an upstream prerelease tag to what
> will be in 4.6-rc1. The caveat is that while the module loads and works fine
> on Skylake, it fails on Kabylake with
> 
> i915_bpo: Unknown symbol pm_runtime_get_if_in_use (err 0)
> 
> and I've no idea why, since the commit to add that symbol is included and
> the kernel should have that.. but I've sent this anyway in case someone
> has better ideas on why it fails here...
> 
> --

That seems pretty weird. Are you sure you have linux-image-extra
installed on the Kabylake system ? I installed on a non-i915 system and
was able to modprobe the i915_bpo module without encountering any
missing symbols.

I am going to hold off on this pull request until you are a little more
sure of your bits.

rtg
Timo Aaltonen March 28, 2016, 2:42 p.m. UTC | #2
28.03.2016, 16:09, Tim Gardner kirjoitti:
> On 03/24/2016 06:33 AM, Timo Aaltonen wrote:
>>
>> BugLink: http://bugs.launchpad.net/bugs/1560395
>>
>> 	Hi
>>
>>   This branch would update i915_bpo from an upstream prerelease tag to what
>> will be in 4.6-rc1. The caveat is that while the module loads and works fine
>> on Skylake, it fails on Kabylake with
>>
>> i915_bpo: Unknown symbol pm_runtime_get_if_in_use (err 0)
>>
>> and I've no idea why, since the commit to add that symbol is included and
>> the kernel should have that.. but I've sent this anyway in case someone
>> has better ideas on why it fails here...
>>
>> --
> 
> That seems pretty weird. Are you sure you have linux-image-extra
> installed on the Kabylake system ? I installed on a non-i915 system and
> was able to modprobe the i915_bpo module without encountering any
> missing symbols.
> 
> I am going to hold off on this pull request until you are a little more
> sure of your bits.

Yeah, I figured it out.. the KBL system had linux-signed-image of the
same abi version installed and that conflicted with the local kernel
image build, so I purged linux-signed-* and it works fine now.

so I think it's fine to merge now :)
Tim Gardner March 28, 2016, 2:52 p.m. UTC | #3