mbox

[PULL,Wily] drm/i915: Add workarounds for SKL

Message ID 55D5ADAF.6020608@ubuntu.com
State New
Headers show

Pull-request

git://kernel.ubuntu.com/tjaalton/ubuntu-wily.git skl

Message

Timo Aaltonen Aug. 20, 2015, 10:36 a.m. UTC
Hi

  This set of patches got in vivid kernel already, apply it to wily too.



The following changes since commit 83f55519a3e1e75f06c1dde169985522b2c65af5:

  UBUNTU: d-i: Add nicpf and nicvf to nic-modules (2015-08-19 19:36:09 +0100)

are available in the git repository at:

  git://kernel.ubuntu.com/tjaalton/ubuntu-wily.git skl

for you to fetch changes up to cb2d023201df9205714a84585d5de67981179463:

  drm/i915/skl: WaIgnoreDDIAStrap is forever, always init DDI A (2015-08-20 10:24:01 +0300)

----------------------------------------------------------------
Arun Siluvery (13):
      drm/i915/gen8: Add infrastructure to initialize WA batch buffers
      drm/i915/gen8: Re-order init pipe_control in lrc mode
      drm/i915/gen8: Add WaDisableCtxRestoreArbitration workaround
      drm/i915/gen8: Add WaFlushCoherentL3CacheLinesAtContextSwitch workaround
      drm/i915: Bail out early if WA batch is not available for given Gen
      drm/i915/gen8: Add WaClearSlmSpaceAtContextSwitch workaround
      drm/i915: Update WaFlushCoherentL3CacheLinesAtContextSwitch
      drm/i915: Enable WA batch buffers for Gen9
      drm/i915/gen9: Add WaDisableCtxRestoreArbitration workaround
      drm/i915: Update wa_ctx_emit() macro as per kernel coding guidelines
      drm/i915/gen9: Add WaFlushCoherentL3CacheLinesAtContextSwitch workaround
      drm/i915/gen9: Add WaSetDisablePixMaskCammingAndRhwoInCommonSliceChicken
      drm/i915:skl: Add WaEnableGapsTsvCreditFix

Damien Lespiau (1):
      drm/i915/skl: Don't expose the top most plane on gen9 display

Jani Nikula (1):
      drm/i915/skl: WaIgnoreDDIAStrap is forever, always init DDI A

Marc Herbert (1):
      drm/i915/skl: revert duplicated WaBarrierPerformanceFixDisable:skl

Mika Kuoppala (1):
      drm/i915/skl WaDisableSbeCacheDispatchPortSharing

Nick Hoath (1):
      drm/i915/gen9: Implement WaDisableKillLogic for gen 9

Ville Syrjälä (1):
      drm/i915: Move WaBarrierPerformanceFixDisable:skl to skl code from chv code

 drivers/gpu/drm/i915/i915_cmd_parser.c  |   6 +-
 drivers/gpu/drm/i915/i915_dma.c         |  16 +-
 drivers/gpu/drm/i915/i915_reg.h         |  10 +-
 drivers/gpu/drm/i915/intel_display.c    |   3 +-
 drivers/gpu/drm/i915/intel_lrc.c        | 389 ++++++++++++++++++++++++++++++++++++++++++++++-
 drivers/gpu/drm/i915/intel_pm.c         |  13 ++
 drivers/gpu/drm/i915/intel_ringbuffer.c |  28 ++--
 drivers/gpu/drm/i915/intel_ringbuffer.h |  21 +++
 8 files changed, 462 insertions(+), 24 deletions(-)

Comments

Tim Gardner Aug. 20, 2015, 7:03 p.m. UTC | #1
On 08/20/2015 04:36 AM, Timo Aaltonen wrote:
> git://kernel.ubuntu.com/tjaalton/ubuntu-wily.git skl

I'm not too keen on the content of these commit messages. All say 
"cherry picked", but I'm not finding any of them in Linus' repository.
Timo Aaltonen Aug. 20, 2015, 7:06 p.m. UTC | #2
On 20.08.2015 22:03, Tim Gardner wrote:
> On 08/20/2015 04:36 AM, Timo Aaltonen wrote:
>> git://kernel.ubuntu.com/tjaalton/ubuntu-wily.git skl
> 
> I'm not too keen on the content of these commit messages. All say
> "cherry picked", but I'm not finding any of them in Linus' repository.

That's because Linus' tree still has only 4.2, these are from
drm-intel-next.

If you prefer waiting once 4.3-rc1 is released that's fine. Or I can
send another pull request with SAUCE and "backported from.." on the commits.
Tim Gardner Aug. 20, 2015, 7:15 p.m. UTC | #3
On 08/20/2015 01:06 PM, Timo Aaltonen wrote:
> On 20.08.2015 22:03, Tim Gardner wrote:
>> On 08/20/2015 04:36 AM, Timo Aaltonen wrote:
>>> git://kernel.ubuntu.com/tjaalton/ubuntu-wily.git skl
>>
>> I'm not too keen on the content of these commit messages. All say
>> "cherry picked", but I'm not finding any of them in Linus' repository.
>
> That's because Linus' tree still has only 4.2, these are from
> drm-intel-next.
>
> If you prefer waiting once 4.3-rc1 is released that's fine. Or I can
> send another pull request with SAUCE and "backported from.." on the commits.
>
>
>

I would prefer waiting until they have been merged upstream.
Jason DeRose Aug. 20, 2015, 8:28 p.m. UTC | #4
On Thu, Aug 20, 2015 at 1:15 PM, Tim Gardner 
<tim.gardner@canonical.com> wrote:
> On 08/20/2015 01:06 PM, Timo Aaltonen wrote:
>> On 20.08.2015 22:03, Tim Gardner wrote:
>>> On 08/20/2015 04:36 AM, Timo Aaltonen wrote:
>>>> git://kernel.ubuntu.com/tjaalton/ubuntu-wily.git skl
>>> 
>>> I'm not too keen on the content of these commit messages. All say
>>> "cherry picked", but I'm not finding any of them in Linus' 
>>> repository.
>> 
>> That's because Linus' tree still has only 4.2, these are from
>> drm-intel-next.
>> 
>> If you prefer waiting once 4.3-rc1 is released that's fine. Or I can
>> send another pull request with SAUCE and "backported from.." on the 
>> commits.
>> 
>> 
>> 
> 
> I would prefer waiting until they have been merged upstream.

For what it's worth, there are huge Skylake GPU regressions currently in
Wily compared to Vivid and Trusty (with Vivid HWE).  Bad enough that
it's almost impossible to test desktop Wily on Skylake hardware as Unity
is basically unusable.

At a glance, these patches might be the needed fixes, and if they are,
from my perspective it would be nice to have them merged into Wily
sooner rather than later just for testing purposes.

Which doesn't mean merging them now is the right thing to do, of course.
Just my two cents :D

> 
> --
> Tim Gardner tim.gardner@canonical.com
> 
> --
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
Timo Aaltonen Aug. 21, 2015, 2:32 a.m. UTC | #5
On 20.08.2015 23:28, Jason Gerard DeRose wrote:
> 
> 
> On Thu, Aug 20, 2015 at 1:15 PM, Tim Gardner <tim.gardner@canonical.com>
> wrote:
>> On 08/20/2015 01:06 PM, Timo Aaltonen wrote:
>>> On 20.08.2015 22:03, Tim Gardner wrote:
>>>> On 08/20/2015 04:36 AM, Timo Aaltonen wrote:
>>>>> git://kernel.ubuntu.com/tjaalton/ubuntu-wily.git skl
>>>>
>>>> I'm not too keen on the content of these commit messages. All say
>>>> "cherry picked", but I'm not finding any of them in Linus' repository.
>>>
>>> That's because Linus' tree still has only 4.2, these are from
>>> drm-intel-next.
>>>
>>> If you prefer waiting once 4.3-rc1 is released that's fine. Or I can
>>> send another pull request with SAUCE and "backported from.." on the
>>> commits.
>>>
>>>
>>>
>>
>> I would prefer waiting until they have been merged upstream.
> 
> For what it's worth, there are huge Skylake GPU regressions currently in
> Wily compared to Vivid and Trusty (with Vivid HWE).  Bad enough that
> it's almost impossible to test desktop Wily on Skylake hardware as Unity
> is basically unusable.
> 
> At a glance, these patches might be the needed fixes, and if they are,
> from my perspective it would be nice to have them merged into Wily
> sooner rather than later just for testing purposes.
> 
> Which doesn't mean merging them now is the right thing to do, of course.
> Just my two cents :D

Sounds like you need i915.preliminary_hw_support=1 at least..
Timo Aaltonen Aug. 21, 2015, 3:18 a.m. UTC | #6
On 21.08.2015 05:32, Timo Aaltonen wrote:
> On 20.08.2015 23:28, Jason Gerard DeRose wrote:
>>
>>
>> On Thu, Aug 20, 2015 at 1:15 PM, Tim Gardner <tim.gardner@canonical.com>
>> wrote:
>>> On 08/20/2015 01:06 PM, Timo Aaltonen wrote:
>>>> On 20.08.2015 22:03, Tim Gardner wrote:
>>>>> On 08/20/2015 04:36 AM, Timo Aaltonen wrote:
>>>>>> git://kernel.ubuntu.com/tjaalton/ubuntu-wily.git skl
>>>>>
>>>>> I'm not too keen on the content of these commit messages. All say
>>>>> "cherry picked", but I'm not finding any of them in Linus' repository.
>>>>
>>>> That's because Linus' tree still has only 4.2, these are from
>>>> drm-intel-next.
>>>>
>>>> If you prefer waiting once 4.3-rc1 is released that's fine. Or I can
>>>> send another pull request with SAUCE and "backported from.." on the
>>>> commits.
>>>>
>>>>
>>>>
>>>
>>> I would prefer waiting until they have been merged upstream.
>>
>> For what it's worth, there are huge Skylake GPU regressions currently in
>> Wily compared to Vivid and Trusty (with Vivid HWE).  Bad enough that
>> it's almost impossible to test desktop Wily on Skylake hardware as Unity
>> is basically unusable.
>>
>> At a glance, these patches might be the needed fixes, and if they are,
>> from my perspective it would be nice to have them merged into Wily
>> sooner rather than later just for testing purposes.
>>
>> Which doesn't mean merging them now is the right thing to do, of course.
>> Just my two cents :D
> 
> Sounds like you need i915.preliminary_hw_support=1 at least..

..because starting from wily the config option is no longer on by
default, as it might make the installer unusable on new HW. For testing
purposes it's easy to add that option to /etc/default/grub and run
update-grub.

SKL is working mostly fine on Wily if you don't stress it too much.
These WA's will help with stability, eventually.