date:20200107

[Intel-gfx] ✓ Fi.CI.BAT: success for linux-next: manual merge of the generic-ioremap tree with the drm-intel tree

2020-01-07 Thread Patchwork

== Series Details ==

Series: linux-next: manual merge of the generic-ioremap tree with the drm-intel 
tree
URL   : https://patchwork.freedesktop.org/series/71736/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7699 -> Patchwork_16021


Summary
---

  **SUCCESS**

  No regressions found.

  External URL: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/index.html

Known issues


  Here are the changes found in Patchwork_16021 that come from known issues:

### IGT changes ###

 Issues hit 

  * igt@i915_module_load@reload-with-fault-injection:
- fi-skl-6770hq:  [PASS][1] -> [DMESG-WARN][2] ([i915#88])
   [1]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/fi-skl-6770hq/igt@i915_module_l...@reload-with-fault-injection.html
   [2]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/fi-skl-6770hq/igt@i915_module_l...@reload-with-fault-injection.html

  * igt@i915_selftest@live_blt:
- fi-hsw-4770r:   [PASS][3] -> [DMESG-FAIL][4] ([i915#553])
   [3]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/fi-hsw-4770r/igt@i915_selftest@live_blt.html
   [4]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/fi-hsw-4770r/igt@i915_selftest@live_blt.html
- fi-hsw-4770:[PASS][5] -> [DMESG-FAIL][6] ([i915#563])
   [5]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/fi-hsw-4770/igt@i915_selftest@live_blt.html
   [6]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/fi-hsw-4770/igt@i915_selftest@live_blt.html

  * igt@i915_selftest@live_execlists:
- fi-kbl-soraka:  [PASS][7] -> [DMESG-FAIL][8] ([i915#656])
   [7]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/fi-kbl-soraka/igt@i915_selftest@live_execlists.html
   [8]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/fi-kbl-soraka/igt@i915_selftest@live_execlists.html
- fi-skl-6770hq:  [PASS][9] -> [DMESG-FAIL][10] ([i915#841])
   [9]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/fi-skl-6770hq/igt@i915_selftest@live_execlists.html
   [10]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/fi-skl-6770hq/igt@i915_selftest@live_execlists.html

  
 Possible fixes 

  * igt@i915_pm_rpm@module-reload:
- fi-skl-6770hq:  [FAIL][11] ([i915#178]) -> [PASS][12]
   [11]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/fi-skl-6770hq/igt@i915_pm_...@module-reload.html
   [12]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/fi-skl-6770hq/igt@i915_pm_...@module-reload.html

  * igt@i915_selftest@live_blt:
- fi-ivb-3770:[DMESG-FAIL][13] ([i915#725]) -> [PASS][14]
   [13]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/fi-ivb-3770/igt@i915_selftest@live_blt.html
   [14]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/fi-ivb-3770/igt@i915_selftest@live_blt.html

  * igt@i915_selftest@live_gt_heartbeat:
- fi-bxt-dsi: [DMESG-FAIL][15] ([fdo#112406]) -> [PASS][16]
   [15]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7699/fi-bxt-dsi/igt@i915_selftest@live_gt_heartbeat.html
   [16]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/fi-bxt-dsi/igt@i915_selftest@live_gt_heartbeat.html

  
  [fdo#112406]: https://bugs.freedesktop.org/show_bug.cgi?id=112406
  [i915#178]: https://gitlab.freedesktop.org/drm/intel/issues/178
  [i915#553]: https://gitlab.freedesktop.org/drm/intel/issues/553
  [i915#563]: https://gitlab.freedesktop.org/drm/intel/issues/563
  [i915#656]: https://gitlab.freedesktop.org/drm/intel/issues/656
  [i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
  [i915#841]: https://gitlab.freedesktop.org/drm/intel/issues/841
  [i915#88]: https://gitlab.freedesktop.org/drm/intel/issues/88


Participating hosts (49 -> 40)
--

  Additional (1): fi-skl-lmem 
  Missing(10): fi-ilk-m540 fi-hsw-4200u fi-glk-dsi fi-byt-squawks 
fi-bsw-cyan fi-ctg-p8600 fi-gdg-551 fi-tgl-y fi-byt-clapper fi-bdw-samus 


Build changes
-

  * CI: CI-20190529 -> None
  * Linux: CI_DRM_7699 -> Patchwork_16021

  CI-20190529: 20190529
  CI_DRM_7699: 9aa67e1d77888cf258597d5009a6ab1762418ef6 @ 
git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5358: c6fc013f414b806175dc4143c58ab445e5235ea5 @ 
git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_16021: 5e406a43874d35e4986470c60079363e79817ef5 @ 
git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

5e406a43874d linux-next: manual merge of the generic-ioremap tree with the 
drm-intel tree

== Logs ==

For more details see: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16021/index.html
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [alsa-devel] USB Type-C monitor flashes once when play a video file after unplug and re-plug the monitor

2020-01-07 Thread Takashi Iwai

On Wed, 08 Jan 2020 04:07:17 +0100,
 wrote:
> 
> Hi Takashi
> 
> Is the attachment what you suspect? That merged to our kernel v4.19 already, 
> have any suggestions? Thanks.

Then I have no concrete idea.  It might be some other changes in HDMI
codec driver or it might be a fix in i915 graphics side, or even
thunderbolt or whatever, too...


Takashi

> 
> -Original Message-
> From: Takashi Iwai  
> Sent: Wednesday, January 8, 2020 2:57 AM
> To: Nathan Ciobanu 
> Cc: Kao. Lucien (TPE) ; Cheng. AJ (TPE) 
> ; intel-gfx@lists.freedesktop.org; 
> alsa-de...@alsa-project.org; Wang. CindyXT (TPE) ; 
> Ye. Nelson (TPE) ; Yap. Shane (TPE) 
> ; Tseng. Evan (TPE) 
> Subject: Re: [alsa-devel] USB Type-C monitor flashes once when play a video 
> file after unplug and re-plug the monitor
> 
> On Tue, 07 Jan 2020 18:24:57 +0100,
> Nathan Ciobanu wrote:
> > 
> > On Mon, Jan 06, 2020 at 08:08:04AM +, lucien_...@compal.com wrote:
> > > Hi Takashi
> > > 
> > > We verified on Ubuntu 19.10 with kernel 5.4.0.0-050400-generic (please 
> > > refer to attachment), the result is positive which symptom doesn't happen 
> > > anymore once I played music or video sound output through Dell S2718D 
> > > Type-C monitor. It seems had some fix in latest kernel.
> > 
> > Takashi, can you point to the patch series you suspect may have fixed this 
> > issue? 
> 
> The first suspect would be
> 2756d9143aa517b97961e85412882b8ce31371a6
> ALSA: hda - Fix intermittent CORB/RIRB stall on Intel chips
> 
> Takashi
> 
> > 
> > Thanks,
> > Nathan
> > > 
> > > Thanks.
> > > 
> > > 
> > > -Original Message-
> > > From: Takashi Iwai 
> > > Sent: Friday, January 3, 2020 5:16 PM
> > > To: Cheng. AJ (TPE) 
> > > Cc: intel-gfx@lists.freedesktop.org; alsa-de...@alsa-project.org; 
> > > nathan.d.ciob...@linux.intel.com; Wang. CindyXT (TPE) 
> > > ; Ye. Nelson (TPE) ; 
> > > Yap. Shane (TPE) ; Kao. Lucien (TPE) 
> > > ; Tseng. Evan (TPE) 
> > > Subject: Re: [alsa-devel] USB Type-C monitor flashes once when play 
> > > a video file after unplug and re-plug the monitor
> > > 
> > > On Fri, 03 Jan 2020 02:57:03 +0100,
> > >  wrote:
> > > > 
> > > > Hi Sirs,
> > > > Here is chromebook SW team from Compal.
> > > > As the mail title, we hit issue that the external monitor will flash 
> > > > once when play video after hot pluging.
> > > > We can reproduce not only on chromebook but also ubuntu 16.04.
> > > > There has higher failure rate with Dell Solomon dock and Dell S2718D 
> > > > monitor.
> > > > 
> > > > We found adding the delay in "sound/pci/hda/patch_hdmi.c " can fix 
> > > > this issue.(as the attachment) May need your help to review and advice. 
> > > > Thanks.
> > > > 
> > > > Here is the issue number in gitlab for more detail.
> > > > https://gitlab.freedesktop.org/drm/intel/issues/318
> > > 
> > > Could you check whether it still happens with the latest upstream kernel, 
> > > at least 5.4.y, if it wasn't tested yet?
> > > 
> > > I don't want to put a long delay just because of random reason unless 
> > > it's really mandatory.  I'm wondering whether the recent write-sync 
> > > change improves the situation, so let's check the recent code.
> > > 
> > > 
> > > thanks,
> > > 
> > > Takashi
> > > 
> > > > 
> > > > 
> > > > 
> > > > AJ Cheng
> > > > NID/NID1
> > > > e-mail: aj_ch...@compal.com
> > > > Tel:  +886-2-8797-8599 ext. 17561
> > > > Mobile : +886-932827829
> > > > COMPAL Electronics, Inc.
> > > > 
> > > > [2 flash_once.diff ]
> > > > 
> > > > ___
> > > > Alsa-devel mailing list
> > > > alsa-de...@alsa-project.org
> > > > https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> > 
> > 
> 
> ==
> =
> This message may contain information which is private, privileged or
> confidential of Compal Electronics, Inc.
> If you are not the intended recipient of this message, please notify the
> sender and destroy/delete the message.
> Any review, retransmission, dissemination or other use of, or taking of any
> action in reliance upon this information,
> by persons or entities other than the intended recipient is prohibited.
> ==
> =
> 
> 
> [1.2  ]
> 
> [2 0001-UPSTREAM-ALSA-hda-Fix-intermittent-CORB-RIRB-stall-o.patch 
> ]
> 
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for linux-next: manual merge of the generic-ioremap tree with the drm-intel tree

2020-01-07 Thread Patchwork

== Series Details ==

Series: linux-next: manual merge of the generic-ioremap tree with the drm-intel 
tree
URL   : https://patchwork.freedesktop.org/series/71736/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
5e406a43874d linux-next: manual merge of the generic-ioremap tree with the 
drm-intel tree
-:15: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ 
chars of sha1> ("")' - ie: 'commit 2c86e55d2ab5 ("drm/i915/gtt: 
split up i915_gem_gtt")'
#15: 
  2c86e55d2ab5 ("drm/i915/gtt: split up i915_gem_gtt")

total: 1 errors, 0 warnings, 0 checks, 8 lines checked

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] linux-next: manual merge of the generic-ioremap tree with the drm-intel tree

2020-01-07 Thread Stephen Rothwell

Hi all,

Today's linux-next merge of the generic-ioremap tree got a conflict in:

  drivers/gpu/drm/i915/i915_gem_gtt.c

between commit:

  2c86e55d2ab5 ("drm/i915/gtt: split up i915_gem_gtt")

from the drm-intel tree and commit:

  4bdc0d676a64 ("remove ioremap_nocache and devm_ioremap_nocache")

from the generic-ioremap tree.

I fixed it up (I used the file from the former and added the following
merge fix patch) and can carry the fix as necessary. This is now fixed
as far as linux-next is concerned, but any non trivial conflicts should
be mentioned to your upstream maintainer when your tree is submitted for
merging.  You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.

From: Stephen Rothwell 
Date: Wed, 8 Jan 2020 17:04:59 +1100
Subject: [PATCH] fix up for "drm/i915/gtt: split up i915_gem_gtt"

Signed-off-by: Stephen Rothwell 
---
 drivers/gpu/drm/i915/gt/intel_ggtt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_ggtt.c 
b/drivers/gpu/drm/i915/gt/intel_ggtt.c
index 99189cdba8a9..1a2b5dcde960 100644
--- a/drivers/gpu/drm/i915/gt/intel_ggtt.c
+++ b/drivers/gpu/drm/i915/gt/intel_ggtt.c
@@ -801,7 +801,7 @@ static int ggtt_probe_common(struct i915_ggtt *ggtt, u64 
size)
 * readback check when writing GTT PTE entries.
 */
if (IS_GEN9_LP(i915) || INTEL_GEN(i915) >= 10)
-   ggtt->gsm = ioremap_nocache(phys_addr, size);
+   ggtt->gsm = ioremap(phys_addr, size);
else
ggtt->gsm = ioremap_wc(phys_addr, size);
if (!ggtt->gsm) {
-- 
2.24.0

-- 
Cheers,
Stephen Rothwell


pgpodBnqgKYgb.pgp
Description: OpenPGP digital signature
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915: conversion to new drm logging macros.

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915: conversion to new drm logging macros.
URL   : https://patchwork.freedesktop.org/series/71698/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_7695_full -> Patchwork_16016_full


Summary
---

  **FAILURE**

  Serious unknown changes coming with Patchwork_16016_full absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_16016_full, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  

Possible new issues
---

  Here are the unknown changes that may have been introduced in 
Patchwork_16016_full:

### IGT changes ###

 Possible regressions 

  * igt@gem_busy@close-race:
- shard-hsw:  [PASS][1] -> [TIMEOUT][2]
   [1]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-hsw1/igt@gem_b...@close-race.html
   [2]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/shard-hsw7/igt@gem_b...@close-race.html

  * igt@kms_plane@pixel-format-pipe-c-planes-source-clamping:
- shard-tglb: [PASS][3] -> [INCOMPLETE][4]
   [3]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb2/igt@kms_pl...@pixel-format-pipe-c-planes-source-clamping.html
   [4]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/shard-tglb9/igt@kms_pl...@pixel-format-pipe-c-planes-source-clamping.html

  
Known issues


  Here are the changes found in Patchwork_16016_full that come from known 
issues:

### IGT changes ###

 Issues hit 

  * igt@gem_busy@busy-vcs1:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#112080]) +11 similar 
issues
   [5]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb2/igt@gem_b...@busy-vcs1.html
   [6]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/shard-iclb3/igt@gem_b...@busy-vcs1.html

  * igt@gem_ctx_persistence@vcs1-mixed-process:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#109276] / [fdo#112080]) 
+3 similar issues
   [7]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb4/igt@gem_ctx_persiste...@vcs1-mixed-process.html
   [8]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/shard-iclb6/igt@gem_ctx_persiste...@vcs1-mixed-process.html

  * igt@gem_exec_schedule@pi-distinct-iova-bsd:
- shard-iclb: [PASS][9] -> [SKIP][10] ([i915#677]) +3 similar issues
   [9]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb5/igt@gem_exec_sched...@pi-distinct-iova-bsd.html
   [10]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/shard-iclb2/igt@gem_exec_sched...@pi-distinct-iova-bsd.html

  * igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [PASS][11] -> [SKIP][12] ([fdo#112146]) +2 similar 
issues
   [11]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb7/igt@gem_exec_sched...@preempt-other-chain-bsd.html
   [12]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/shard-iclb4/igt@gem_exec_sched...@preempt-other-chain-bsd.html

  * igt@gem_exec_schedule@smoketest-bsd1:
- shard-tglb: [PASS][13] -> [INCOMPLETE][14] ([i915#463] / 
[i915#472])
   [13]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb2/igt@gem_exec_sched...@smoketest-bsd1.html
   [14]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/shard-tglb9/igt@gem_exec_sched...@smoketest-bsd1.html

  * igt@gem_exec_schedule@smoketest-bsd2:
- shard-tglb: [PASS][15] -> [INCOMPLETE][16] ([i915#472] / 
[i915#707])
   [15]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb4/igt@gem_exec_sched...@smoketest-bsd2.html
   [16]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/shard-tglb3/igt@gem_exec_sched...@smoketest-bsd2.html

  * igt@gem_exec_suspend@basic-s3:
- shard-tglb: [PASS][17] -> [INCOMPLETE][18] ([fdo#111736] / 
[i915#460] / [i915#472])
   [17]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb1/igt@gem_exec_susp...@basic-s3.html
   [18]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/shard-tglb9/igt@gem_exec_susp...@basic-s3.html
- shard-skl:  [PASS][19] -> [INCOMPLETE][20] ([i915#69])
   [19]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-skl1/igt@gem_exec_susp...@basic-s3.html
   [20]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/shard-skl7/igt@gem_exec_susp...@basic-s3.html

  * igt@gem_persistent_relocs@forked-interruptible-thrash-inactive:
- shard-snb:  [PASS][21] -> [TIMEOUT][22] ([i915#530])
   [21]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-snb4/igt@gem_persistent_rel...@forked-interruptible-thrash-inactive.html
   [22]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/shard-snb4/igt@gem_persistent_rel...@forked-interruptible-thrash-inactive.html

  *

[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/gt: Drop a defunct timeline assertion

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915/gt: Drop a defunct timeline assertion
URL   : https://patchwork.freedesktop.org/series/71697/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7695_full -> Patchwork_16015_full


Summary
---

  **SUCCESS**

  No regressions found.

  

Known issues


  Here are the changes found in Patchwork_16015_full that come from known 
issues:

### IGT changes ###

 Issues hit 

  * igt@gem_busy@busy-vcs1:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#112080]) +10 similar 
issues
   [1]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb2/igt@gem_b...@busy-vcs1.html
   [2]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/shard-iclb5/igt@gem_b...@busy-vcs1.html

  * igt@gem_ctx_isolation@bcs0-s3:
- shard-kbl:  [PASS][3] -> [DMESG-WARN][4] ([i915#180]) +1 similar 
issue
   [3]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-kbl3/igt@gem_ctx_isolat...@bcs0-s3.html
   [4]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/shard-kbl1/igt@gem_ctx_isolat...@bcs0-s3.html

  * igt@gem_ctx_persistence@vcs1-mixed-process:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#109276] / [fdo#112080]) 
+2 similar issues
   [5]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb4/igt@gem_ctx_persiste...@vcs1-mixed-process.html
   [6]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/shard-iclb6/igt@gem_ctx_persiste...@vcs1-mixed-process.html

  * igt@gem_eio@unwedge-stress:
- shard-tglb: [PASS][7] -> [INCOMPLETE][8] ([i915#469])
   [7]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb1/igt@gem_...@unwedge-stress.html
   [8]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/shard-tglb1/igt@gem_...@unwedge-stress.html

  * igt@gem_exec_gttfill@basic:
- shard-tglb: [PASS][9] -> [INCOMPLETE][10] ([fdo#111593] / 
[i915#472])
   [9]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb5/igt@gem_exec_gttf...@basic.html
   [10]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/shard-tglb8/igt@gem_exec_gttf...@basic.html

  * igt@gem_exec_nop@basic-sequential:
- shard-tglb: [PASS][11] -> [INCOMPLETE][12] ([i915#435] / 
[i915#472]) +1 similar issue
   [11]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb7/igt@gem_exec_...@basic-sequential.html
   [12]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/shard-tglb8/igt@gem_exec_...@basic-sequential.html

  * igt@gem_exec_schedule@independent-bsd2:
- shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#109276]) +20 similar 
issues
   [13]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb1/igt@gem_exec_sched...@independent-bsd2.html
   [14]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/shard-iclb3/igt@gem_exec_sched...@independent-bsd2.html

  * igt@gem_exec_schedule@pi-common-bsd:
- shard-iclb: [PASS][15] -> [SKIP][16] ([i915#677]) +2 similar 
issues
   [15]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb3/igt@gem_exec_sched...@pi-common-bsd.html
   [16]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/shard-iclb2/igt@gem_exec_sched...@pi-common-bsd.html

  * igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [PASS][17] -> [SKIP][18] ([fdo#112146]) +4 similar 
issues
   [17]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb7/igt@gem_exec_sched...@preempt-other-chain-bsd.html
   [18]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/shard-iclb1/igt@gem_exec_sched...@preempt-other-chain-bsd.html

  * igt@gem_exec_schedule@preempt-queue-chain-blt:
- shard-tglb: [PASS][19] -> [INCOMPLETE][20] ([fdo#111606] / 
[fdo#111677] / [i915#472])
   [19]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb1/igt@gem_exec_sched...@preempt-queue-chain-blt.html
   [20]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/shard-tglb4/igt@gem_exec_sched...@preempt-queue-chain-blt.html

  * igt@gem_mmap_gtt@hang:
- shard-snb:  [PASS][21] -> [INCOMPLETE][22] ([i915#82])
   [21]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-snb2/igt@gem_mmap_...@hang.html
   [22]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/shard-snb4/igt@gem_mmap_...@hang.html

  * igt@gem_persistent_relocs@forked-interruptible-thrash-inactive:
- shard-tglb: [PASS][23] -> [TIMEOUT][24] ([fdo#112126] / 
[i915#530])
   [23]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb2/igt@gem_persistent_rel...@forked-interruptible-thrash-inactive.html
   [24]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/shard-tglb6/igt@gem_persistent_rel...@forked-interruptible-thrash-inactive.html

  * igt@gen9_exec_parse@allowed-all:
- shard-glk:  [PASS][25] -> [DMESG-WARN][26] ([i915#716])
   [25]:

[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/gt: Take responsibility for engine->release as the last step

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915/gt: Take responsibility for engine->release as the last step
URL   : https://patchwork.freedesktop.org/series/71696/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7695_full -> Patchwork_16014_full


Summary
---

  **SUCCESS**

  No regressions found.

  

Possible new issues
---

  Here are the unknown changes that may have been introduced in 
Patchwork_16014_full:

### Piglit changes ###

 Suppressed 

  The following results come from untrusted machines, tests, or statuses.
  They do not affect the overall result.

  * spec@ext_framebuffer_multisample_blit_scaled@blit-scaled samples=8 with 
gl_texture_2d_multisample_array:
- {pig-hsw-4770r}:NOTRUN -> [WARN][1]
   [1]: None

  
Known issues


  Here are the changes found in Patchwork_16014_full that come from known 
issues:

### IGT changes ###

 Issues hit 

  * igt@gem_ctx_persistence@vcs0-mixed-process:
- shard-glk:  [PASS][2] -> [FAIL][3] ([i915#679])
   [2]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-glk4/igt@gem_ctx_persiste...@vcs0-mixed-process.html
   [3]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/shard-glk4/igt@gem_ctx_persiste...@vcs0-mixed-process.html

  * igt@gem_ctx_persistence@vcs1-mixed-process:
- shard-iclb: [PASS][4] -> [SKIP][5] ([fdo#109276] / [fdo#112080])
   [4]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb4/igt@gem_ctx_persiste...@vcs1-mixed-process.html
   [5]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/shard-iclb7/igt@gem_ctx_persiste...@vcs1-mixed-process.html

  * igt@gem_ctx_shared@q-smoketest-bsd:
- shard-tglb: [PASS][6] -> [INCOMPLETE][7] ([i915#461])
   [6]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb5/igt@gem_ctx_sha...@q-smoketest-bsd.html
   [7]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/shard-tglb3/igt@gem_ctx_sha...@q-smoketest-bsd.html

  * igt@gem_exec_await@wide-all:
- shard-tglb: [PASS][8] -> [INCOMPLETE][9] ([fdo#111736] / 
[i915#472])
   [8]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb1/igt@gem_exec_aw...@wide-all.html
   [9]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/shard-tglb8/igt@gem_exec_aw...@wide-all.html

  * igt@gem_exec_gttfill@basic:
- shard-tglb: [PASS][10] -> [INCOMPLETE][11] ([fdo#111593] / 
[i915#472])
   [10]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb5/igt@gem_exec_gttf...@basic.html
   [11]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/shard-tglb9/igt@gem_exec_gttf...@basic.html

  * igt@gem_exec_nop@basic-sequential:
- shard-tglb: [PASS][12] -> [INCOMPLETE][13] ([i915#435] / 
[i915#472])
   [12]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb7/igt@gem_exec_...@basic-sequential.html
   [13]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/shard-tglb2/igt@gem_exec_...@basic-sequential.html

  * igt@gem_exec_reloc@basic-gtt-read-active:
- shard-skl:  [PASS][14] -> [DMESG-WARN][15] ([i915#109])
   [14]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-skl8/igt@gem_exec_re...@basic-gtt-read-active.html
   [15]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/shard-skl10/igt@gem_exec_re...@basic-gtt-read-active.html

  * igt@gem_exec_schedule@preempt-other-chain-bsd:
- shard-iclb: [PASS][16] -> [SKIP][17] ([fdo#112146]) +3 similar 
issues
   [16]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb7/igt@gem_exec_sched...@preempt-other-chain-bsd.html
   [17]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/shard-iclb4/igt@gem_exec_sched...@preempt-other-chain-bsd.html

  * igt@gem_exec_schedule@preempt-queue-chain-blt:
- shard-tglb: [PASS][18] -> [INCOMPLETE][19] ([fdo#111606] / 
[fdo#111677] / [i915#472])
   [18]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb1/igt@gem_exec_sched...@preempt-queue-chain-blt.html
   [19]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/shard-tglb9/igt@gem_exec_sched...@preempt-queue-chain-blt.html

  * igt@gem_exec_suspend@basic-s0:
- shard-tglb: [PASS][20] -> [INCOMPLETE][21] ([i915#472]) +2 
similar issues
   [20]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb6/igt@gem_exec_susp...@basic-s0.html
   [21]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/shard-tglb6/igt@gem_exec_susp...@basic-s0.html

  * igt@gem_exec_suspend@basic-s3-devices:
- shard-tglb: [PASS][22] -> [INCOMPLETE][23] ([i915#460] / 
[i915#472])
   [22]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb9/igt@gem_exec_susp...@basic-s3-devices.html
   [23]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/shard-tglb6/igt@gem_exec_susp...@basic-s3-devices.html

  *

Re: [Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree

2020-01-07 Thread Stephen Rothwell

Hi all,

On Wed, 8 Jan 2020 12:04:50 +1100 Stephen Rothwell  
wrote:
>
>  -hw_flags = 0;
>  +/* For resource streamer on HSW+ and power context elsewhere */
>  +BUILD_BUG_ON(HSW_MI_RS_SAVE_STATE_EN != MI_SAVE_EXT_STATE_EN);
>  +BUILD_BUG_ON(HSW_MI_RS_RESTORE_STATE_EN != 
> MI_RESTORE_EXT_STATE_EN);
>  +
>  +flags = MI_SAVE_EXT_STATE_EN | MI_MM_SPACE_GTT;
> - if (!i915_gem_context_is_kernel(rq->gem_context))
> + if (!test_bit(CONTEXT_VALID_BIT, >flags))

I see from the drm-intel tree that this should have not have the '!'.
I have fixed up my resolution for tomorrow (and it has been fixed for
today's linux-next in the merge of the drm-intel tree.

-- 
Cheers,
Stephen Rothwell


pgpmSWhgpJ1_s.pgp
Description: OpenPGP digital signature
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915: Add missing include file

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915: Add missing include file 
URL   : https://patchwork.freedesktop.org/series/71695/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7695_full -> Patchwork_16013_full


Summary
---

  **SUCCESS**

  No regressions found.

  

Known issues


  Here are the changes found in Patchwork_16013_full that come from known 
issues:

### IGT changes ###

 Issues hit 

  * igt@gem_busy@busy-vcs1:
- shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#112080]) +10 similar 
issues
   [1]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb2/igt@gem_b...@busy-vcs1.html
   [2]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/shard-iclb6/igt@gem_b...@busy-vcs1.html

  * igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#110841])
   [3]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb5/igt@gem_ctx_sha...@exec-single-timeline-bsd.html
   [4]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/shard-iclb2/igt@gem_ctx_sha...@exec-single-timeline-bsd.html

  * igt@gem_exec_async@concurrent-writes-bsd:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#112146]) +2 similar 
issues
   [5]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb5/igt@gem_exec_as...@concurrent-writes-bsd.html
   [6]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/shard-iclb2/igt@gem_exec_as...@concurrent-writes-bsd.html

  * igt@gem_exec_await@wide-all:
- shard-tglb: [PASS][7] -> [INCOMPLETE][8] ([fdo#111736] / 
[i915#472])
   [7]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb1/igt@gem_exec_aw...@wide-all.html
   [8]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/shard-tglb9/igt@gem_exec_aw...@wide-all.html

  * igt@gem_exec_gttfill@basic:
- shard-tglb: [PASS][9] -> [INCOMPLETE][10] ([fdo#111593] / 
[i915#472])
   [9]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb5/igt@gem_exec_gttf...@basic.html
   [10]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/shard-tglb3/igt@gem_exec_gttf...@basic.html

  * igt@gem_exec_nop@basic-sequential:
- shard-tglb: [PASS][11] -> [INCOMPLETE][12] ([i915#435] / 
[i915#472])
   [11]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb7/igt@gem_exec_...@basic-sequential.html
   [12]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/shard-tglb8/igt@gem_exec_...@basic-sequential.html

  * igt@gem_exec_schedule@pi-common-bsd:
- shard-iclb: [PASS][13] -> [SKIP][14] ([i915#677])
   [13]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb3/igt@gem_exec_sched...@pi-common-bsd.html
   [14]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/shard-iclb4/igt@gem_exec_sched...@pi-common-bsd.html

  * igt@gem_exec_schedule@preempt-queue-contexts-blt:
- shard-tglb: [PASS][15] -> [INCOMPLETE][16] ([fdo#111606] / 
[fdo#111677] / [i915#472])
   [15]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb1/igt@gem_exec_sched...@preempt-queue-contexts-blt.html
   [16]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/shard-tglb6/igt@gem_exec_sched...@preempt-queue-contexts-blt.html

  * igt@gem_exec_schedule@preempt-queue-contexts-chain-bsd1:
- shard-tglb: [PASS][17] -> [INCOMPLETE][18] ([fdo#111677] / 
[i915#472])
   [17]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb1/igt@gem_exec_sched...@preempt-queue-contexts-chain-bsd1.html
   [18]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/shard-tglb4/igt@gem_exec_sched...@preempt-queue-contexts-chain-bsd1.html

  * igt@gem_exec_suspend@basic-s0:
- shard-tglb: [PASS][19] -> [INCOMPLETE][20] ([i915#472])
   [19]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb6/igt@gem_exec_susp...@basic-s0.html
   [20]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/shard-tglb4/igt@gem_exec_susp...@basic-s0.html

  * 
igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrash-inactive:
- shard-apl:  [PASS][21] -> [TIMEOUT][22] ([i915#530])
   [21]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-apl4/igt@gem_persistent_rel...@forked-interruptible-faulting-reloc-thrash-inactive.html
   [22]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/shard-apl7/igt@gem_persistent_rel...@forked-interruptible-faulting-reloc-thrash-inactive.html

  * igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-iclb: [PASS][23] -> [FAIL][24] ([i915#644])
   [23]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb8/igt@gem_pp...@flink-and-close-vma-leak.html
   [24]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/shard-iclb2/igt@gem_pp...@flink-and-close-vma-leak.html

  * igt@gem_softpin@noreloc-s3:
- shard-apl:  [PASS][25] ->

[Intel-gfx] ✗ Fi.CI.BAT: failure for linux-next: manual merge of the drm tree with the drm-intel-fixes tree

2020-01-07 Thread Patchwork

== Series Details ==

Series: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
URL   : https://patchwork.freedesktop.org/series/71725/
State : failure

== Summary ==

Applying: linux-next: manual merge of the drm tree with the drm-intel-fixes tree
Using index info to reconstruct a base tree...
M   drivers/gpu/drm/i915/display/intel_ddi.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c
No changes -- Patch already applied.

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree

2020-01-07 Thread Stephen Rothwell

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/display/intel_display.c

between commit:

  2b2c4a83d69d ("drm/i915/dp: Disable Port sync mode correctly on teardown")

from the drm-intel-fixes tree and commit:

  773b4b54351c ("drm/i915: Move stuff from haswell_crtc_disable() into encoder 
.post_disable()")

from the drm tree.

I fixed it up (I applied the change to icl_disable_transcoder_port_sync()
from the former commit in its new location - see patch below) and can
carry the fix as necessary. This is now fixed as far as linux-next is
concerned, but any non trivial conflicts should be mentioned to your
upstream maintainer when your tree is submitted for merging.  You may
also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

From: Stephen Rothwell 
Date: Wed, 8 Jan 2020 12:12:45 +1100
Subject: [PATCH] drm/i915: fixup for "drm/i915/dp: Disable Port sync mode
 correctly on teardown"

Signed-off-by: Stephen Rothwell 
---
 drivers/gpu/drm/i915/display/intel_ddi.c | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c 
b/drivers/gpu/drm/i915/display/intel_ddi.c
index c9ba7d7f3787..e535a3b85575 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -3860,8 +3860,6 @@ static void icl_disable_transcoder_port_sync(const struct 
intel_crtc_state *old_
 {
struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-   i915_reg_t reg;
-   u32 trans_ddi_func_ctl2_val;
 
if (old_crtc_state->master_transcoder == INVALID_TRANSCODER)
return;
@@ -3869,10 +3867,7 @@ static void icl_disable_transcoder_port_sync(const 
struct intel_crtc_state *old_
DRM_DEBUG_KMS("Disabling Transcoder Port Sync on Slave Transcoder %s\n",
  transcoder_name(old_crtc_state->cpu_transcoder));
 
-   reg = TRANS_DDI_FUNC_CTL2(old_crtc_state->cpu_transcoder);
-   trans_ddi_func_ctl2_val = ~(PORT_SYNC_MODE_ENABLE |
-   PORT_SYNC_MODE_MASTER_SELECT_MASK);
-   I915_WRITE(reg, trans_ddi_func_ctl2_val);
+   I915_WRITE(TRANS_DDI_FUNC_CTL2(old_crtc_state->cpu_transcoder), 0);
 }
 
 static void intel_ddi_post_disable(struct intel_encoder *encoder,
-- 
2.24.0

-- 
Cheers,
Stephen Rothwell


pgpryv5l5Gtma.pgp
Description: OpenPGP digital signature
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree

2020-01-07 Thread Stephen Rothwell

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/i915_drv.h

between commit:

  ce69e553b9a4 ("drm/i915/gt: Restore coarse power gating")

from the drm-intel-fixes tree and commit:

  90eb7d2aa3ce ("drm/i915: Simplify NEEDS_WaRsDisableCoarsePowerGating")

from the drm tree.

I fixed it up (I have no idea about this, so I just used the latter
version) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell


pgpITkf845QVF.pgp
Description: OpenPGP digital signature
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] linux-next: manual merge of the drm tree with the drm-intel-fixes tree

2020-01-07 Thread Stephen Rothwell

Hi all,

Today's linux-next merge of the drm tree got a conflict in:

  drivers/gpu/drm/i915/gt/intel_ring_submission.c

between commit:

  103309977589 ("drm/i915/gt: Do not restore invalid RS state")

from the drm-intel-fixes tree and commit:

  3cd6e8860ecd ("drm/i915/gen7: Re-enable full-ppgtt for ivb & hsw")
  f997056d5b17 ("drm/i915/gt: Push the flush_pd before the set-context")
  f70de8d2ca6b ("drm/i915/gt: Track the context validity explicitly")
  902eb748e5c3 ("drm/i915/gt: Tidy up full-ppgtt on Ivybridge")

from the drm tree.

I fixed it up (I think - see below) and can carry the fix as necessary.
This is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/gt/intel_ring_submission.c
index 93026217c121,81f872f9ef03..
--- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
@@@ -1574,28 -1602,20 +1594,26 @@@ static int switch_context(struct i915_r
  
GEM_BUG_ON(HAS_EXECLISTS(rq->i915));
  
-   if (vm) {
-   ret = load_pd_dir(rq, i915_vm_to_ppgtt(vm));
-   if (ret)
-   return ret;
-   }
+   ret = switch_mm(rq, vm_alias(ce));
+   if (ret)
+   return ret;
  
if (ce->state) {
 -  u32 hw_flags;
 +  u32 flags;
  
GEM_BUG_ON(rq->engine->id != RCS0);
  
 -  hw_flags = 0;
 +  /* For resource streamer on HSW+ and power context elsewhere */
 +  BUILD_BUG_ON(HSW_MI_RS_SAVE_STATE_EN != MI_SAVE_EXT_STATE_EN);
 +  BUILD_BUG_ON(HSW_MI_RS_RESTORE_STATE_EN != 
MI_RESTORE_EXT_STATE_EN);
 +
 +  flags = MI_SAVE_EXT_STATE_EN | MI_MM_SPACE_GTT;
-   if (!i915_gem_context_is_kernel(rq->gem_context))
+   if (!test_bit(CONTEXT_VALID_BIT, >flags))
 -  hw_flags = MI_RESTORE_INHIBIT;
 +  flags |= MI_RESTORE_EXT_STATE_EN;
 +  else
 +  flags |= MI_RESTORE_INHIBIT;
  
 -  ret = mi_set_context(rq, hw_flags);
 +  ret = mi_set_context(rq, flags);
if (ret)
return ret;
}


pgpnkNxiMEij6.pgp
Description: OpenPGP digital signature
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/gtt: split up i915_gem_gtt (rev2)

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915/gtt: split up i915_gem_gtt (rev2)
URL   : https://patchwork.freedesktop.org/series/71678/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_7695_full -> Patchwork_16012_full


Summary
---

  **FAILURE**

  Serious unknown changes coming with Patchwork_16012_full absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_16012_full, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  

Possible new issues
---

  Here are the unknown changes that may have been introduced in 
Patchwork_16012_full:

### IGT changes ###

 Possible regressions 

  * igt@gem_ctx_persistence@smoketest:
- shard-tglb: [PASS][1] -> [INCOMPLETE][2]
   [1]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb3/igt@gem_ctx_persiste...@smoketest.html
   [2]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/shard-tglb4/igt@gem_ctx_persiste...@smoketest.html

  
Known issues


  Here are the changes found in Patchwork_16012_full that come from known 
issues:

### IGT changes ###

 Issues hit 

  * igt@gem_ctx_isolation@vcs1-none:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#109276] / [fdo#112080]) 
+2 similar issues
   [3]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb4/igt@gem_ctx_isolat...@vcs1-none.html
   [4]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/shard-iclb5/igt@gem_ctx_isolat...@vcs1-none.html

  * igt@gem_ctx_persistence@rcs0-mixed-process:
- shard-tglb: [PASS][5] -> [FAIL][6] ([i915#679])
   [5]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb5/igt@gem_ctx_persiste...@rcs0-mixed-process.html
   [6]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/shard-tglb5/igt@gem_ctx_persiste...@rcs0-mixed-process.html

  * igt@gem_ctx_shared@exec-single-timeline-bsd:
- shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#110841])
   [7]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb5/igt@gem_ctx_sha...@exec-single-timeline-bsd.html
   [8]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/shard-iclb2/igt@gem_ctx_sha...@exec-single-timeline-bsd.html

  * igt@gem_ctx_shared@q-smoketest-bsd:
- shard-tglb: [PASS][9] -> [INCOMPLETE][10] ([i915#461])
   [9]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb5/igt@gem_ctx_sha...@q-smoketest-bsd.html
   [10]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/shard-tglb3/igt@gem_ctx_sha...@q-smoketest-bsd.html

  * igt@gem_eio@unwedge-stress:
- shard-tglb: [PASS][11] -> [INCOMPLETE][12] ([i915#469])
   [11]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb1/igt@gem_...@unwedge-stress.html
   [12]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/shard-tglb9/igt@gem_...@unwedge-stress.html

  * igt@gem_exec_async@concurrent-writes-bsd:
- shard-iclb: [PASS][13] -> [SKIP][14] ([fdo#112146]) +1 similar 
issue
   [13]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb5/igt@gem_exec_as...@concurrent-writes-bsd.html
   [14]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/shard-iclb2/igt@gem_exec_as...@concurrent-writes-bsd.html

  * igt@gem_exec_nop@basic-series:
- shard-tglb: [PASS][15] -> [INCOMPLETE][16] ([i915#435] / 
[i915#472])
   [15]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb2/igt@gem_exec_...@basic-series.html
   [16]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/shard-tglb4/igt@gem_exec_...@basic-series.html

  * igt@gem_exec_schedule@preempt-queue-bsd1:
- shard-iclb: [PASS][17] -> [SKIP][18] ([fdo#109276]) +11 similar 
issues
   [17]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-iclb1/igt@gem_exec_sched...@preempt-queue-bsd1.html
   [18]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/shard-iclb6/igt@gem_exec_sched...@preempt-queue-bsd1.html

  * igt@gem_exec_schedule@preempt-queue-chain-blt:
- shard-tglb: [PASS][19] -> [INCOMPLETE][20] ([fdo#111606] / 
[fdo#111677] / [i915#472])
   [19]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-tglb1/igt@gem_exec_sched...@preempt-queue-chain-blt.html
   [20]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/shard-tglb8/igt@gem_exec_sched...@preempt-queue-chain-blt.html

  * igt@gem_persistent_relocs@forked-interruptible-faulting-reloc-thrashing:
- shard-glk:  [PASS][21] -> [TIMEOUT][22] ([i915#530])
   [21]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/shard-glk8/igt@gem_persistent_rel...@forked-interruptible-faulting-reloc-thrashing.html
   [22]:

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gt: Always force restore freshly pinned contexts

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915/gt: Always force restore freshly pinned contexts
URL   : https://patchwork.freedesktop.org/series/71706/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7697 -> Patchwork_16019


Summary
---

  **SUCCESS**

  No regressions found.

  External URL: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16019/index.html

Known issues


  Here are the changes found in Patchwork_16019 that come from known issues:

### IGT changes ###

 Issues hit 

  * igt@i915_selftest@live_blt:
- fi-hsw-4770:[PASS][1] -> [DMESG-FAIL][2] ([i915#770])
   [1]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7697/fi-hsw-4770/igt@i915_selftest@live_blt.html
   [2]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16019/fi-hsw-4770/igt@i915_selftest@live_blt.html

  
 Possible fixes 

  * igt@gem_close_race@basic-threads:
- fi-byt-j1900:   [TIMEOUT][3] ([i915#816]) -> [PASS][4]
   [3]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7697/fi-byt-j1900/igt@gem_close_r...@basic-threads.html
   [4]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16019/fi-byt-j1900/igt@gem_close_r...@basic-threads.html
- fi-byt-n2820:   [TIMEOUT][5] ([i915#816]) -> [PASS][6]
   [5]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7697/fi-byt-n2820/igt@gem_close_r...@basic-threads.html
   [6]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16019/fi-byt-n2820/igt@gem_close_r...@basic-threads.html

  * igt@i915_module_load@reload-with-fault-injection:
- fi-skl-6770hq:  [INCOMPLETE][7] ([i915#671]) -> [PASS][8]
   [7]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7697/fi-skl-6770hq/igt@i915_module_l...@reload-with-fault-injection.html
   [8]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16019/fi-skl-6770hq/igt@i915_module_l...@reload-with-fault-injection.html
- fi-kbl-x1275:   [INCOMPLETE][9] ([i915#879]) -> [PASS][10]
   [9]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7697/fi-kbl-x1275/igt@i915_module_l...@reload-with-fault-injection.html
   [10]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16019/fi-kbl-x1275/igt@i915_module_l...@reload-with-fault-injection.html

  * igt@i915_selftest@live_coherency:
- fi-cfl-guc: [DMESG-FAIL][11] ([i915#889]) -> [PASS][12] +5 
similar issues
   [11]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7697/fi-cfl-guc/igt@i915_selftest@live_coherency.html
   [12]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16019/fi-cfl-guc/igt@i915_selftest@live_coherency.html

  * igt@i915_selftest@live_gt_timelines:
- fi-cfl-guc: [DMESG-WARN][13] ([i915#889]) -> [PASS][14] +16 
similar issues
   [13]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7697/fi-cfl-guc/igt@i915_selftest@live_gt_timelines.html
   [14]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16019/fi-cfl-guc/igt@i915_selftest@live_gt_timelines.html

  
 Warnings 

  * igt@i915_selftest@live_blt:
- fi-ivb-3770:[DMESG-FAIL][15] ([i915#770]) -> [DMESG-FAIL][16] 
([i915#725])
   [15]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7697/fi-ivb-3770/igt@i915_selftest@live_blt.html
   [16]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16019/fi-ivb-3770/igt@i915_selftest@live_blt.html

  * igt@i915_selftest@live_gem_contexts:
- fi-cfl-guc: [DMESG-WARN][17] ([i915#889]) -> [INCOMPLETE][18] 
([fdo#106070] / [i915#424])
   [17]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7697/fi-cfl-guc/igt@i915_selftest@live_gem_contexts.html
   [18]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16019/fi-cfl-guc/igt@i915_selftest@live_gem_contexts.html

  
  [fdo#106070]: https://bugs.freedesktop.org/show_bug.cgi?id=106070
  [i915#424]: https://gitlab.freedesktop.org/drm/intel/issues/424
  [i915#671]: https://gitlab.freedesktop.org/drm/intel/issues/671
  [i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
  [i915#770]: https://gitlab.freedesktop.org/drm/intel/issues/770
  [i915#816]: https://gitlab.freedesktop.org/drm/intel/issues/816
  [i915#879]: https://gitlab.freedesktop.org/drm/intel/issues/879
  [i915#889]: https://gitlab.freedesktop.org/drm/intel/issues/889


Participating hosts (47 -> 38)
--

  Additional (5): fi-hsw-peppy fi-ilk-650 fi-gdg-551 fi-elk-e7500 fi-skl-lmem 
  Missing(14): fi-ilk-m540 fi-hsw-4200u fi-bdw-gvtdvm fi-glk-dsi 
fi-byt-squawks fi-bwr-2160 fi-snb-2520m fi-bsw-cyan fi-ctg-p8600 fi-cfl-8109u 
fi-pnv-d510 fi-blb-e6850 fi-byt-clapper fi-bdw-samus 


Build changes
-

  * CI: CI-20190529 -> None
  * Linux: CI_DRM_7697 -> Patchwork_16019

  CI-20190529: 20190529
  CI_DRM_7697: 52b73829cd05668fd06586c8d2ab4af6e058dd8a @ 
git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5358: c6fc013f414b806175dc4143c58ab445e5235ea5 @ 
git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_16019:

[Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [v4,rebased,1/2] drm/i915/display/icl+: Do not program clockgating

2020-01-07 Thread Patchwork

== Series Details ==

Series: series starting with [v4,rebased,1/2] drm/i915/display/icl+: Do not 
program clockgating
URL   : https://patchwork.freedesktop.org/series/71705/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7697 -> Patchwork_16018


Summary
---

  **SUCCESS**

  No regressions found.

  External URL: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16018/index.html

Known issues


  Here are the changes found in Patchwork_16018 that come from known issues:

### IGT changes ###

 Issues hit 

  * igt@i915_selftest@live_blt:
- fi-hsw-4770:[PASS][1] -> [DMESG-FAIL][2] ([i915#553] / [i915#725])
   [1]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7697/fi-hsw-4770/igt@i915_selftest@live_blt.html
   [2]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16018/fi-hsw-4770/igt@i915_selftest@live_blt.html

  
 Possible fixes 

  * igt@gem_close_race@basic-threads:
- fi-byt-j1900:   [TIMEOUT][3] ([i915#816]) -> [PASS][4]
   [3]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7697/fi-byt-j1900/igt@gem_close_r...@basic-threads.html
   [4]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16018/fi-byt-j1900/igt@gem_close_r...@basic-threads.html

  * igt@i915_module_load@reload-with-fault-injection:
- fi-skl-6770hq:  [INCOMPLETE][5] ([i915#671]) -> [PASS][6]
   [5]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7697/fi-skl-6770hq/igt@i915_module_l...@reload-with-fault-injection.html
   [6]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16018/fi-skl-6770hq/igt@i915_module_l...@reload-with-fault-injection.html
- fi-kbl-x1275:   [INCOMPLETE][7] ([i915#879]) -> [PASS][8]
   [7]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7697/fi-kbl-x1275/igt@i915_module_l...@reload-with-fault-injection.html
   [8]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16018/fi-kbl-x1275/igt@i915_module_l...@reload-with-fault-injection.html

  * igt@i915_selftest@live_reset:
- fi-cfl-guc: [DMESG-FAIL][9] ([i915#889]) -> [PASS][10] +7 similar 
issues
   [9]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7697/fi-cfl-guc/igt@i915_selftest@live_reset.html
   [10]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16018/fi-cfl-guc/igt@i915_selftest@live_reset.html

  * igt@i915_selftest@live_workarounds:
- fi-cfl-guc: [DMESG-WARN][11] ([i915#889]) -> [PASS][12] +23 
similar issues
   [11]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7697/fi-cfl-guc/igt@i915_selftest@live_workarounds.html
   [12]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16018/fi-cfl-guc/igt@i915_selftest@live_workarounds.html

  
 Warnings 

  * igt@i915_selftest@live_blt:
- fi-ivb-3770:[DMESG-FAIL][13] ([i915#770]) -> [DMESG-FAIL][14] 
([i915#725])
   [13]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7697/fi-ivb-3770/igt@i915_selftest@live_blt.html
   [14]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16018/fi-ivb-3770/igt@i915_selftest@live_blt.html

  * igt@kms_chamelium@vga-edid-read:
- fi-icl-u2:  [SKIP][15] ([fdo#109309]) -> [FAIL][16] ([i915#217])
   [15]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7697/fi-icl-u2/igt@kms_chamel...@vga-edid-read.html
   [16]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16018/fi-icl-u2/igt@kms_chamel...@vga-edid-read.html

  
  [fdo#109309]: https://bugs.freedesktop.org/show_bug.cgi?id=109309
  [i915#217]: https://gitlab.freedesktop.org/drm/intel/issues/217
  [i915#553]: https://gitlab.freedesktop.org/drm/intel/issues/553
  [i915#671]: https://gitlab.freedesktop.org/drm/intel/issues/671
  [i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
  [i915#770]: https://gitlab.freedesktop.org/drm/intel/issues/770
  [i915#816]: https://gitlab.freedesktop.org/drm/intel/issues/816
  [i915#879]: https://gitlab.freedesktop.org/drm/intel/issues/879
  [i915#889]: https://gitlab.freedesktop.org/drm/intel/issues/889


Participating hosts (47 -> 43)
--

  Additional (6): fi-hsw-4770r fi-hsw-peppy fi-ilk-650 fi-gdg-551 fi-elk-e7500 
fi-skl-lmem 
  Missing(10): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan 
fi-bwr-2160 fi-kbl-7500u fi-ctg-p8600 fi-bsw-kefka fi-byt-clapper fi-bdw-samus 


Build changes
-

  * CI: CI-20190529 -> None
  * Linux: CI_DRM_7697 -> Patchwork_16018

  CI-20190529: 20190529
  CI_DRM_7697: 52b73829cd05668fd06586c8d2ab4af6e058dd8a @ 
git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5358: c6fc013f414b806175dc4143c58ab445e5235ea5 @ 
git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_16018: e87f5bd04649b4eb78d081a5c0f4e3313531465e @ 
git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

e87f5bd04649 drm/i915/display: Fix warning about MST and DDI restrictions
104edb93da04 drm/i915/display/icl+: Do not program clockgating

== Logs ==

For more details see:

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Pin the context as we work on it

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915: Pin the context as we work on it
URL   : https://patchwork.freedesktop.org/series/71700/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7696 -> Patchwork_16017


Summary
---

  **SUCCESS**

  No regressions found.

  External URL: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16017/index.html

Known issues


  Here are the changes found in Patchwork_16017 that come from known issues:

### IGT changes ###

 Issues hit 

  * igt@i915_selftest@live_blt:
- fi-hsw-4770:[PASS][1] -> [DMESG-FAIL][2] ([i915#563])
   [1]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7696/fi-hsw-4770/igt@i915_selftest@live_blt.html
   [2]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16017/fi-hsw-4770/igt@i915_selftest@live_blt.html

  * igt@i915_selftest@live_execlists:
- fi-kbl-soraka:  [PASS][3] -> [DMESG-FAIL][4] ([i915#656])
   [3]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7696/fi-kbl-soraka/igt@i915_selftest@live_execlists.html
   [4]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16017/fi-kbl-soraka/igt@i915_selftest@live_execlists.html

  * igt@kms_chamelium@hdmi-hpd-fast:
- fi-icl-u2:  [PASS][5] -> [FAIL][6] ([i915#217])
   [5]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7696/fi-icl-u2/igt@kms_chamel...@hdmi-hpd-fast.html
   [6]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16017/fi-icl-u2/igt@kms_chamel...@hdmi-hpd-fast.html

  
 Possible fixes 

  * igt@i915_selftest@live_blt:
- fi-hsw-4770r:   [DMESG-FAIL][7] ([i915#770]) -> [PASS][8]
   [7]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7696/fi-hsw-4770r/igt@i915_selftest@live_blt.html
   [8]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16017/fi-hsw-4770r/igt@i915_selftest@live_blt.html

  * igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u:   [FAIL][9] ([fdo#111407]) -> [PASS][10]
   [9]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7696/fi-kbl-7500u/igt@kms_chamel...@hdmi-hpd-fast.html
   [10]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16017/fi-kbl-7500u/igt@kms_chamel...@hdmi-hpd-fast.html

  
  [fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
  [i915#217]: https://gitlab.freedesktop.org/drm/intel/issues/217
  [i915#563]: https://gitlab.freedesktop.org/drm/intel/issues/563
  [i915#656]: https://gitlab.freedesktop.org/drm/intel/issues/656
  [i915#770]: https://gitlab.freedesktop.org/drm/intel/issues/770


Participating hosts (45 -> 38)
--

  Additional (4): fi-bsw-kefka fi-skl-lmem fi-gdg-551 fi-snb-2600 
  Missing(11): fi-tgl-u fi-bsw-n3050 fi-byt-j1900 fi-skl-6770hq 
fi-byt-squawks fi-snb-2520m fi-ctg-p8600 fi-ivb-3770 fi-byt-clapper fi-bsw-nick 
fi-skl-6600u 


Build changes
-

  * CI: CI-20190529 -> None
  * Linux: CI_DRM_7696 -> Patchwork_16017

  CI-20190529: 20190529
  CI_DRM_7696: 2333c946e97c61a7bc60a56b180f76638adfc312 @ 
git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5358: c6fc013f414b806175dc4143c58ab445e5235ea5 @ 
git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_16017: 35325e0a23376298eb20a8aad287b58f40178ba1 @ 
git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

35325e0a2337 drm/i915: Pin the context as we work on it

== Logs ==

For more details see: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16017/index.html
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: conversion to new drm logging macros.

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915: conversion to new drm logging macros.
URL   : https://patchwork.freedesktop.org/series/71698/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7695 -> Patchwork_16016


Summary
---

  **SUCCESS**

  No regressions found.

  External URL: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/index.html

Known issues


  Here are the changes found in Patchwork_16016 that come from known issues:

### IGT changes ###

 Issues hit 

  * igt@gem_mmap_gtt@basic-copy:
- fi-glk-dsi: [PASS][1] -> [INCOMPLETE][2] ([i915#58] / 
[k.org#198133])
   [1]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-glk-dsi/igt@gem_mmap_...@basic-copy.html
   [2]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/fi-glk-dsi/igt@gem_mmap_...@basic-copy.html

  * igt@i915_selftest@live_blt:
- fi-ivb-3770:[PASS][3] -> [DMESG-FAIL][4] ([i915#725])
   [3]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-ivb-3770/igt@i915_selftest@live_blt.html
   [4]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/fi-ivb-3770/igt@i915_selftest@live_blt.html
- fi-hsw-4770:[PASS][5] -> [DMESG-FAIL][6] ([i915#563])
   [5]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-hsw-4770/igt@i915_selftest@live_blt.html
   [6]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/fi-hsw-4770/igt@i915_selftest@live_blt.html
- fi-hsw-4770r:   [PASS][7] -> [DMESG-FAIL][8] ([i915#553])
   [7]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-hsw-4770r/igt@i915_selftest@live_blt.html
   [8]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/fi-hsw-4770r/igt@i915_selftest@live_blt.html

  * igt@i915_selftest@live_gem_contexts:
- fi-hsw-peppy:   [PASS][9] -> [DMESG-FAIL][10] ([i915#722])
   [9]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-hsw-peppy/igt@i915_selftest@live_gem_contexts.html
   [10]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/fi-hsw-peppy/igt@i915_selftest@live_gem_contexts.html

  * igt@kms_chamelium@hdmi-hpd-fast:
- fi-icl-u2:  [PASS][11] -> [FAIL][12] ([i915#217])
   [11]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-icl-u2/igt@kms_chamel...@hdmi-hpd-fast.html
   [12]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/fi-icl-u2/igt@kms_chamel...@hdmi-hpd-fast.html

  
 Possible fixes 

  * igt@gem_close_race@basic-threads:
- fi-byt-j1900:   [TIMEOUT][13] ([i915#816]) -> [PASS][14]
   [13]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-byt-j1900/igt@gem_close_r...@basic-threads.html
   [14]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/fi-byt-j1900/igt@gem_close_r...@basic-threads.html

  * igt@i915_module_load@reload-with-fault-injection:
- fi-skl-6770hq:  [INCOMPLETE][15] ([i915#671]) -> [PASS][16]
   [15]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-skl-6770hq/igt@i915_module_l...@reload-with-fault-injection.html
   [16]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/fi-skl-6770hq/igt@i915_module_l...@reload-with-fault-injection.html

  * igt@i915_selftest@live_blt:
- fi-bsw-nick:[DMESG-FAIL][17] ([i915#723]) -> [PASS][18]
   [17]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-bsw-nick/igt@i915_selftest@live_blt.html
   [18]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/fi-bsw-nick/igt@i915_selftest@live_blt.html

  
 Warnings 

  * igt@runner@aborted:
- fi-kbl-8809g:   [FAIL][19] ([i915#192] / [i915#193] / [i915#194]) -> 
[FAIL][20] ([i915#858])
   [19]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-kbl-8809g/igt@run...@aborted.html
   [20]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16016/fi-kbl-8809g/igt@run...@aborted.html

  
  [i915#192]: https://gitlab.freedesktop.org/drm/intel/issues/192
  [i915#193]: https://gitlab.freedesktop.org/drm/intel/issues/193
  [i915#194]: https://gitlab.freedesktop.org/drm/intel/issues/194
  [i915#217]: https://gitlab.freedesktop.org/drm/intel/issues/217
  [i915#553]: https://gitlab.freedesktop.org/drm/intel/issues/553
  [i915#563]: https://gitlab.freedesktop.org/drm/intel/issues/563
  [i915#58]: https://gitlab.freedesktop.org/drm/intel/issues/58
  [i915#671]: https://gitlab.freedesktop.org/drm/intel/issues/671
  [i915#722]: https://gitlab.freedesktop.org/drm/intel/issues/722
  [i915#723]: https://gitlab.freedesktop.org/drm/intel/issues/723
  [i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
  [i915#816]: https://gitlab.freedesktop.org/drm/intel/issues/816
  [i915#858]: https://gitlab.freedesktop.org/drm/intel/issues/858
  [k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133


Participating hosts (53 -> 43)
--

  Missing(10): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan 
fi-bwr-2160 fi-ilk-650

Re: [Intel-gfx] [PATCH] drm/i915/dsi: Parse the I2C element from the VBT MIPI sequence block

2020-01-07 Thread Matt Roper

On Tue, Jan 07, 2020 at 06:49:04PM +0200, Ville Syrjälä wrote:
> On Fri, Jan 03, 2020 at 04:00:54PM -0800, Vivek Kasireddy wrote:
> > On Fri, 3 Jan 2020 12:05:11 +0100
> > Hans de Goede  wrote:
> > Hi Hans,
> > 
> > > Hi Vivek,
> > > 
> > > On 03-01-2020 01:00, Vivek Kasireddy wrote:
> > > > Parsing the i2c element is mainly done to transfer the payload from
> > > > the MIPI sequence block to the relevant slave device. In some
> > > > cases, the commands that are part of the payload can be used to
> > > > turn on the backlight.
> > > > 
> > > > This patch is actually a refactored version of this old patch:
> > > > https://lists.freedesktop.org/archives/intel-gfx/2014-December/056897.html
> > > > 
> > > > In addition to the refactoring, the old patch is augmented by
> > > > looking up the i2c bus from ACPI NS instead of relying on the bus
> > > > number provided in the VBT.
> > > > 
> > > > Cc: Deepak M 
> > > > Cc: Nabendu Maiti 
> > > > Cc: Matt Roper 
> > > > Cc: Bob Paauwe 
> > > > Signed-off-by: Vivek Kasireddy   
> > > 
> > > Thank you for this patch, I have been doing a lot of work to make
> > > DSI panels on Bay Trail and Cherry Trail devices work better, as such
> > > I've done a lot of testing of DSI panels. But I have never seen any
> > > MIPI sequences actually use the i2c commands. May I ask how you have
> > > tested this? Do you have a device which actually uses the i2c
> > > commands?
> > Oh, they sure exist; we do have a device that uses i2c commands to turn
> > on the backlight that we have tested this patch on. 
> 
> And what exactly is that device? That is valuable information that the
> commit message should contain.

I'm not sure if we're allowed to disclose that information.  I believe
Vivek is working with an engineering sample and the device itself might
not have been publicly announced by the device manufacturer yet.


Matt

> 
> > 
> > > 
> > > I also have some small review comments inline:
> > > 
> > > > ---
> > > >   drivers/gpu/drm/i915/display/intel_dsi.h |  3 +
> > > >   drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 93
> > > >  2 files changed, 96 insertions(+)
> > > > 
> > > > diff --git a/drivers/gpu/drm/i915/display/intel_dsi.h
> > > > b/drivers/gpu/drm/i915/display/intel_dsi.h index
> > > > b15be5814599..5651bc8aa5c2 100644 ---
> > > > a/drivers/gpu/drm/i915/display/intel_dsi.h +++
> > > > b/drivers/gpu/drm/i915/display/intel_dsi.h @@ -68,6 +68,9 @@ struct
> > > > intel_dsi { /* number of DSI lanes */
> > > > unsigned int lane_count;
> > > >   
> > > > +   /* i2c bus associated with the slave device */
> > > > +   int i2c_bus_num;
> > > > +
> > > > /*
> > > >  * video mode pixel format
> > > >  *
> > > > diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
> > > > b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index
> > > > f90946c912ee..60441a5a3dba 100644 ---
> > > > a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++
> > > > b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -83,6 +83,12 @@
> > > > static struct gpio_map vlv_gpio_table[] = { {
> > > > VLV_GPIO_NC_11_PANEL1_BKLTCTL }, };
> > > >   
> > > > +struct i2c_adapter_lookup {
> > > > +   u16 slave_addr;
> > > > +   struct intel_dsi *intel_dsi;
> > > > +   acpi_handle dev_handle;
> > > > +};
> > > > +
> > > >   #define CHV_GPIO_IDX_START_N  0
> > > >   #define CHV_GPIO_IDX_START_E  73
> > > >   #define CHV_GPIO_IDX_START_SW 100
> > > > @@ -375,8 +381,93 @@ static const u8 *mipi_exec_gpio(struct
> > > > intel_dsi *intel_dsi, const u8 *data) return data;
> > > >   }
> > > >   
> > > > +static int i2c_adapter_lookup(struct acpi_resource *ares, void
> > > > *data) +{
> > > > +   struct i2c_adapter_lookup *lookup = data;
> > > > +   struct intel_dsi *intel_dsi = lookup->intel_dsi;
> > > > +   struct acpi_resource_i2c_serialbus *sb;
> > > > +   struct i2c_adapter *adapter;
> > > > +   acpi_handle adapter_handle;
> > > > +   acpi_status status;
> > > > +
> > > > +   if (intel_dsi->i2c_bus_num >= 0 ||
> > > > +   !i2c_acpi_get_i2c_resource(ares, ))
> > > > +   return 1;
> > > > +
> > > > +   if (lookup->slave_addr != sb->slave_address)
> > > > +   return 1;
> > > > +
> > > > +   status = acpi_get_handle(lookup->dev_handle,
> > > > +sb->resource_source.string_ptr,
> > > > +_handle);
> > > > +   if (ACPI_FAILURE(status))
> > > > +   return 1;
> > > > +
> > > > +   adapter = i2c_acpi_find_adapter_by_handle(adapter_handle);
> > > > +   if (adapter)
> > > > +   intel_dsi->i2c_bus_num = adapter->nr;
> > > > +
> > > > +   return 1;
> > > > +}
> > > > +
> > > >   static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const
> > > > u8 *data) {
> > > > +   struct drm_device *dev = intel_dsi->base.base.dev;
> > > > +   struct i2c_adapter *adapter;

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gt: Drop a defunct timeline assertion

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915/gt: Drop a defunct timeline assertion
URL   : https://patchwork.freedesktop.org/series/71697/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7695 -> Patchwork_16015


Summary
---

  **SUCCESS**

  No regressions found.

  External URL: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/index.html

Known issues


  Here are the changes found in Patchwork_16015 that come from known issues:

### IGT changes ###

 Issues hit 

  * igt@i915_module_load@reload-with-fault-injection:
- fi-cfl-8700k:   [PASS][1] -> [DMESG-WARN][2] ([i915#889])
   [1]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-cfl-8700k/igt@i915_module_l...@reload-with-fault-injection.html
   [2]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/fi-cfl-8700k/igt@i915_module_l...@reload-with-fault-injection.html

  * igt@i915_selftest@live_blt:
- fi-hsw-4770:[PASS][3] -> [DMESG-FAIL][4] ([i915#553] / [i915#725])
   [3]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-hsw-4770/igt@i915_selftest@live_blt.html
   [4]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/fi-hsw-4770/igt@i915_selftest@live_blt.html

  * igt@i915_selftest@live_execlists:
- fi-kbl-soraka:  [PASS][5] -> [DMESG-FAIL][6] ([i915#656])
   [5]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-kbl-soraka/igt@i915_selftest@live_execlists.html
   [6]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/fi-kbl-soraka/igt@i915_selftest@live_execlists.html

  * igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u:   [PASS][7] -> [FAIL][8] ([fdo#111096] / [i915#323])
   [7]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-kbl-7500u/igt@kms_chamel...@hdmi-hpd-fast.html
   [8]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/fi-kbl-7500u/igt@kms_chamel...@hdmi-hpd-fast.html

  * igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy:   [PASS][9] -> [DMESG-WARN][10] ([i915#44])
   [9]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-hsw-peppy/igt@kms_frontbuffer_track...@basic.html
   [10]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/fi-hsw-peppy/igt@kms_frontbuffer_track...@basic.html

  
 Possible fixes 

  * igt@gem_close_race@basic-threads:
- fi-byt-j1900:   [TIMEOUT][11] ([i915#816]) -> [PASS][12]
   [11]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-byt-j1900/igt@gem_close_r...@basic-threads.html
   [12]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/fi-byt-j1900/igt@gem_close_r...@basic-threads.html

  * igt@gem_exec_suspend@basic-s0:
- fi-byt-n2820:   [FAIL][13] ([i915#694]) -> [PASS][14]
   [13]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-byt-n2820/igt@gem_exec_susp...@basic-s0.html
   [14]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/fi-byt-n2820/igt@gem_exec_susp...@basic-s0.html

  * igt@i915_module_load@reload-with-fault-injection:
- fi-skl-6770hq:  [INCOMPLETE][15] ([i915#671]) -> [PASS][16]
   [15]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-skl-6770hq/igt@i915_module_l...@reload-with-fault-injection.html
   [16]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/fi-skl-6770hq/igt@i915_module_l...@reload-with-fault-injection.html

  * igt@i915_selftest@live_blt:
- fi-bsw-nick:[DMESG-FAIL][17] ([i915#723]) -> [PASS][18]
   [17]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-bsw-nick/igt@i915_selftest@live_blt.html
   [18]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/fi-bsw-nick/igt@i915_selftest@live_blt.html

  
 Warnings 

  * igt@runner@aborted:
- fi-kbl-8809g:   [FAIL][19] ([i915#192] / [i915#193] / [i915#194]) -> 
[FAIL][20] ([i915#858])
   [19]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-kbl-8809g/igt@run...@aborted.html
   [20]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16015/fi-kbl-8809g/igt@run...@aborted.html

  
  [fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
  [i915#192]: https://gitlab.freedesktop.org/drm/intel/issues/192
  [i915#193]: https://gitlab.freedesktop.org/drm/intel/issues/193
  [i915#194]: https://gitlab.freedesktop.org/drm/intel/issues/194
  [i915#323]: https://gitlab.freedesktop.org/drm/intel/issues/323
  [i915#44]: https://gitlab.freedesktop.org/drm/intel/issues/44
  [i915#553]: https://gitlab.freedesktop.org/drm/intel/issues/553
  [i915#656]: https://gitlab.freedesktop.org/drm/intel/issues/656
  [i915#671]: https://gitlab.freedesktop.org/drm/intel/issues/671
  [i915#694]: https://gitlab.freedesktop.org/drm/intel/issues/694
  [i915#723]: https://gitlab.freedesktop.org/drm/intel/issues/723
  [i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
  [i915#816]: https://gitlab.freedesktop.org/drm/intel/issues/816
  [i915#858]: https://gitlab.freedesktop.org/drm/intel/issues/858

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gt: Take responsibility for engine->release as the last step

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915/gt: Take responsibility for engine->release as the last step
URL   : https://patchwork.freedesktop.org/series/71696/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7695 -> Patchwork_16014


Summary
---

  **SUCCESS**

  No regressions found.

  External URL: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/index.html

Known issues


  Here are the changes found in Patchwork_16014 that come from known issues:

### IGT changes ###

 Issues hit 

  * igt@gem_close_race@basic-threads:
- fi-byt-n2820:   [PASS][1] -> [TIMEOUT][2] ([i915#816])
   [1]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-byt-n2820/igt@gem_close_r...@basic-threads.html
   [2]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/fi-byt-n2820/igt@gem_close_r...@basic-threads.html

  * igt@i915_module_load@reload-with-fault-injection:
- fi-cfl-guc: [PASS][3] -> [INCOMPLETE][4] ([i915#505] / [i915#671])
   [3]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-cfl-guc/igt@i915_module_l...@reload-with-fault-injection.html
   [4]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/fi-cfl-guc/igt@i915_module_l...@reload-with-fault-injection.html
- fi-kbl-x1275:   [PASS][5] -> [INCOMPLETE][6] ([i915#879])
   [5]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-kbl-x1275/igt@i915_module_l...@reload-with-fault-injection.html
   [6]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/fi-kbl-x1275/igt@i915_module_l...@reload-with-fault-injection.html

  * igt@i915_selftest@live_blt:
- fi-ivb-3770:[PASS][7] -> [DMESG-FAIL][8] ([i915#725])
   [7]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-ivb-3770/igt@i915_selftest@live_blt.html
   [8]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/fi-ivb-3770/igt@i915_selftest@live_blt.html

  * igt@i915_selftest@live_execlists:
- fi-kbl-soraka:  [PASS][9] -> [DMESG-FAIL][10] ([i915#656])
   [9]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-kbl-soraka/igt@i915_selftest@live_execlists.html
   [10]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/fi-kbl-soraka/igt@i915_selftest@live_execlists.html

  * igt@i915_selftest@live_hangcheck:
- fi-icl-dsi: [PASS][11] -> [DMESG-FAIL][12] ([i915#333] / 
[i915#419])
   [11]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-icl-dsi/igt@i915_selftest@live_hangcheck.html
   [12]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/fi-icl-dsi/igt@i915_selftest@live_hangcheck.html

  * igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u:   [PASS][13] -> [FAIL][14] ([fdo#111096] / [i915#323])
   [13]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-kbl-7500u/igt@kms_chamel...@hdmi-hpd-fast.html
   [14]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/fi-kbl-7500u/igt@kms_chamel...@hdmi-hpd-fast.html

  * igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy:   [PASS][15] -> [DMESG-WARN][16] ([i915#44])
   [15]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-hsw-peppy/igt@kms_frontbuffer_track...@basic.html
   [16]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/fi-hsw-peppy/igt@kms_frontbuffer_track...@basic.html

  
 Possible fixes 

  * igt@i915_module_load@reload-with-fault-injection:
- fi-skl-6770hq:  [INCOMPLETE][17] ([i915#671]) -> [PASS][18]
   [17]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-skl-6770hq/igt@i915_module_l...@reload-with-fault-injection.html
   [18]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/fi-skl-6770hq/igt@i915_module_l...@reload-with-fault-injection.html

  * igt@i915_selftest@live_blt:
- fi-bsw-nick:[DMESG-FAIL][19] ([i915#723]) -> [PASS][20]
   [19]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-bsw-nick/igt@i915_selftest@live_blt.html
   [20]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/fi-bsw-nick/igt@i915_selftest@live_blt.html

  
 Warnings 

  * igt@runner@aborted:
- fi-kbl-8809g:   [FAIL][21] ([i915#192] / [i915#193] / [i915#194]) -> 
[FAIL][22] ([i915#858])
   [21]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-kbl-8809g/igt@run...@aborted.html
   [22]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16014/fi-kbl-8809g/igt@run...@aborted.html

  
  [fdo#111096]: https://bugs.freedesktop.org/show_bug.cgi?id=111096
  [i915#192]: https://gitlab.freedesktop.org/drm/intel/issues/192
  [i915#193]: https://gitlab.freedesktop.org/drm/intel/issues/193
  [i915#194]: https://gitlab.freedesktop.org/drm/intel/issues/194
  [i915#323]: https://gitlab.freedesktop.org/drm/intel/issues/323
  [i915#333]: https://gitlab.freedesktop.org/drm/intel/issues/333
  [i915#419]: https://gitlab.freedesktop.org/drm/intel/issues/419
  [i915#44]: https://gitlab.freedesktop.org/drm/intel/issues/44
  [i915#505]:

Re: [Intel-gfx] [PATCH] drm/i915/dsb: Increase log level if DSB engine gets busy

2020-01-07 Thread Lucas De Marchi

On Thu, Dec 26, 2019 at 9:34 PM Sharma, Swati2  wrote:
>
> On 27-Dec-19 2:39 AM, Lucas De Marchi wrote:
> > On Wed, Dec 25, 2019 at 10:07 AM Swati Sharma  
> > wrote:
> >>
> >> Increase the log level if DSB engine gets busy. If dsb engine
> >> is busy, it should be an error condition to indicate there might be
> >> some difficulty with the hardware.
> >>
> >> If DSB engine gets busy, load luts will fail and as per current
> >> driver design if one instance of DSB engine gets busy, we are not
> >> allocating the other instance. So, increase the log level to indicate there
> >> could be an issue with driver/hardware.
> >>
> >> Signed-off-by: Swati Sharma 
> >> ---
> >>   drivers/gpu/drm/i915/display/intel_dsb.c | 4 ++--
> >>   1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/i915/display/intel_dsb.c 
> >> b/drivers/gpu/drm/i915/display/intel_dsb.c
> >> index ada006a690df..6f67b5dfa128 100644
> >> --- a/drivers/gpu/drm/i915/display/intel_dsb.c
> >> +++ b/drivers/gpu/drm/i915/display/intel_dsb.c
> >> @@ -52,7 +52,7 @@ static inline bool intel_dsb_enable_engine(struct 
> >> intel_dsb *dsb)
> >>
> >>  dsb_ctrl = I915_READ(DSB_CTRL(pipe, dsb->id));
> >>  if (DSB_STATUS & dsb_ctrl) {
> >> -   DRM_DEBUG_KMS("DSB engine is busy.\n");
> >> +   DRM_ERROR("DSB engine is busy.\n");
> >
> > are we seeing this? Isn't it a dbg message because in this case we
> > would fallback to direct mmio?
> We are seeing this issue and is already under debug.
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7630/shard-tglb5/igt@kms_available_modes_crc@available_mode_test_crc.html

I'm not sure what benefit it has in just raising the log level here.
Btw, the only caller of this function already has a pointless check
for "engine is busy". You may want to remove that too if you follow this route.

I think it would be more interesting to root cause the issue:  if DSB
*may* get busy, then we'd better leave this as a dbg and fallback on a
chain of
MMIO writes or a delayed commit or failed its initialization early. If
this is really unexpected, why are we hitting this?

As why DSB is busy: is it because we had a previous dsb_commit() that
is keeping DSB busy so we can't have another subsequent commit? Why
didn't we fail the call to dsb_init() early Since it's not possible to
have unpaired dsb_init() / dsb_commit(), if that is the cause then if
DSB is busy on dsb_commit, it should as well be busy on dsb_init().

Lucas De Marchi

>
> <7> [303.727858] [drm:intel_dsb_commit [i915]] DSB engine is busy.
> <7> [303.727975] [drm:icl_load_luts [i915]] DSB engine is busy.
> >
> > Lucas De Marchi
> >
> >>  return false;
> >>  }
> >>
> >> @@ -72,7 +72,7 @@ static inline bool intel_dsb_disable_engine(struct 
> >> intel_dsb *dsb)
> >>
> >>  dsb_ctrl = I915_READ(DSB_CTRL(pipe, dsb->id));
> >>  if (DSB_STATUS & dsb_ctrl) {
> >> -   DRM_DEBUG_KMS("DSB engine is busy.\n");
> >> +   DRM_ERROR("DSB engine is busy.\n");
> >>  return false;
> >>  }
> >>
> >> --
> >> 2.24.1
> >>
> >> ___
> >> Intel-gfx mailing list
> >> Intel-gfx@lists.freedesktop.org
> >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> >
> >
> >
>
>
> --
> ~Swati Sharma



-- 
Lucas De Marchi
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: conversion to new drm logging macros.

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915: conversion to new drm logging macros.
URL   : https://patchwork.freedesktop.org/series/71698/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
9baa398403ea drm/i915: convert to using the drm_dbg_kms() macro.
1cae57305c57 drm/i915: use new struct drm_device logging macros.
-:524: WARNING:LONG_LINE: line over 100 characters
#524: FILE: drivers/gpu/drm/i915/intel_pm.c:5337:
+   enast(old_wm->trans_wm.ignore_lines), 
old_wm->trans_wm.plane_res_l,

-:534: WARNING:LONG_LINE: line over 100 characters
#534: FILE: drivers/gpu/drm/i915/intel_pm.c:5347:
+   enast(new_wm->trans_wm.ignore_lines), 
new_wm->trans_wm.plane_res_l);

total: 0 errors, 2 warnings, 0 checks, 634 lines checked
ea6cb30e7a0c drm/i915: use new struct drm_device based logging macros.
9209ec64ba41 drm/i915: convert to using new struct drm_device logging macros
4bfa0a3eef65 drm/i915: use new struct drm_device based macros.

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [alsa-devel] USB Type-C monitor flashes once when play a video file after unplug and re-plug the monitor

2020-01-07 Thread Takashi Iwai

On Tue, 07 Jan 2020 18:24:57 +0100,
Nathan Ciobanu wrote:
> 
> On Mon, Jan 06, 2020 at 08:08:04AM +, lucien_...@compal.com wrote:
> > Hi Takashi
> > 
> > We verified on Ubuntu 19.10 with kernel 5.4.0.0-050400-generic (please 
> > refer to attachment), the result is positive which symptom doesn't happen 
> > anymore once I played music or video sound output through Dell S2718D 
> > Type-C monitor. It seems had some fix in latest kernel.
> 
> Takashi, can you point to the patch series you suspect may have fixed this 
> issue? 

The first suspect would be
2756d9143aa517b97961e85412882b8ce31371a6
ALSA: hda - Fix intermittent CORB/RIRB stall on Intel chips


Takashi

> 
> Thanks,
> Nathan
> > 
> > Thanks.
> > 
> > 
> > -Original Message-
> > From: Takashi Iwai  
> > Sent: Friday, January 3, 2020 5:16 PM
> > To: Cheng. AJ (TPE) 
> > Cc: intel-gfx@lists.freedesktop.org; alsa-de...@alsa-project.org; 
> > nathan.d.ciob...@linux.intel.com; Wang. CindyXT (TPE) 
> > ; Ye. Nelson (TPE) ; Yap. 
> > Shane (TPE) ; Kao. Lucien (TPE) 
> > ; Tseng. Evan (TPE) 
> > Subject: Re: [alsa-devel] USB Type-C monitor flashes once when play a video 
> > file after unplug and re-plug the monitor
> > 
> > On Fri, 03 Jan 2020 02:57:03 +0100,
> >  wrote:
> > > 
> > > Hi Sirs,
> > > Here is chromebook SW team from Compal.
> > > As the mail title, we hit issue that the external monitor will flash once 
> > > when play video after hot pluging.
> > > We can reproduce not only on chromebook but also ubuntu 16.04.
> > > There has higher failure rate with Dell Solomon dock and Dell S2718D 
> > > monitor.
> > > 
> > > We found adding the delay in "sound/pci/hda/patch_hdmi.c " can fix 
> > > this issue.(as the attachment) May need your help to review and advice. 
> > > Thanks.
> > > 
> > > Here is the issue number in gitlab for more detail.
> > > https://gitlab.freedesktop.org/drm/intel/issues/318
> > 
> > Could you check whether it still happens with the latest upstream kernel, 
> > at least 5.4.y, if it wasn't tested yet?
> > 
> > I don't want to put a long delay just because of random reason unless it's 
> > really mandatory.  I'm wondering whether the recent write-sync change 
> > improves the situation, so let's check the recent code.
> > 
> > 
> > thanks,
> > 
> > Takashi
> > 
> > > 
> > > 
> > > 
> > > AJ Cheng
> > > NID/NID1
> > > e-mail: aj_ch...@compal.com
> > > Tel:  +886-2-8797-8599 ext. 17561
> > > Mobile : +886-932827829
> > > COMPAL Electronics, Inc.
> > > 
> > > [2 flash_once.diff ]
> > > 
> > > ___
> > > Alsa-devel mailing list
> > > alsa-de...@alsa-project.org
> > > https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
> 
> 
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Add missing include file

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915: Add missing include file 
URL   : https://patchwork.freedesktop.org/series/71695/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7695 -> Patchwork_16013


Summary
---

  **SUCCESS**

  No regressions found.

  External URL: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/index.html

Known issues


  Here are the changes found in Patchwork_16013 that come from known issues:

### IGT changes ###

 Issues hit 

  * igt@i915_module_load@reload-with-fault-injection:
- fi-cfl-guc: [PASS][1] -> [INCOMPLETE][2] ([i915#505] / [i915#671])
   [1]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-cfl-guc/igt@i915_module_l...@reload-with-fault-injection.html
   [2]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/fi-cfl-guc/igt@i915_module_l...@reload-with-fault-injection.html
- fi-cfl-8700k:   [PASS][3] -> [INCOMPLETE][4] ([i915#505])
   [3]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-cfl-8700k/igt@i915_module_l...@reload-with-fault-injection.html
   [4]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/fi-cfl-8700k/igt@i915_module_l...@reload-with-fault-injection.html

  * igt@i915_selftest@live_blt:
- fi-hsw-4770:[PASS][5] -> [DMESG-FAIL][6] ([i915#725])
   [5]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-hsw-4770/igt@i915_selftest@live_blt.html
   [6]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/fi-hsw-4770/igt@i915_selftest@live_blt.html

  * igt@i915_selftest@live_execlists:
- fi-kbl-soraka:  [PASS][7] -> [DMESG-FAIL][8] ([i915#656])
   [7]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-kbl-soraka/igt@i915_selftest@live_execlists.html
   [8]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/fi-kbl-soraka/igt@i915_selftest@live_execlists.html

  * igt@i915_selftest@live_gem_contexts:
- fi-kbl-x1275:   [PASS][9] -> [DMESG-FAIL][10] ([i915#943])
   [9]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-kbl-x1275/igt@i915_selftest@live_gem_contexts.html
   [10]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/fi-kbl-x1275/igt@i915_selftest@live_gem_contexts.html

  * igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy:   [PASS][11] -> [DMESG-WARN][12] ([i915#44])
   [11]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-hsw-peppy/igt@kms_frontbuffer_track...@basic.html
   [12]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/fi-hsw-peppy/igt@kms_frontbuffer_track...@basic.html

  
 Possible fixes 

  * igt@gem_exec_suspend@basic-s0:
- fi-byt-n2820:   [FAIL][13] ([i915#694]) -> [PASS][14]
   [13]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-byt-n2820/igt@gem_exec_susp...@basic-s0.html
   [14]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/fi-byt-n2820/igt@gem_exec_susp...@basic-s0.html

  * igt@i915_module_load@reload-with-fault-injection:
- fi-skl-6770hq:  [INCOMPLETE][15] ([i915#671]) -> [PASS][16]
   [15]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-skl-6770hq/igt@i915_module_l...@reload-with-fault-injection.html
   [16]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/fi-skl-6770hq/igt@i915_module_l...@reload-with-fault-injection.html

  * igt@i915_selftest@live_blt:
- fi-bsw-nick:[DMESG-FAIL][17] ([i915#723]) -> [PASS][18]
   [17]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-bsw-nick/igt@i915_selftest@live_blt.html
   [18]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/fi-bsw-nick/igt@i915_selftest@live_blt.html

  
 Warnings 

  * igt@runner@aborted:
- fi-kbl-8809g:   [FAIL][19] ([i915#192] / [i915#193] / [i915#194]) -> 
[FAIL][20] ([i915#858])
   [19]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-kbl-8809g/igt@run...@aborted.html
   [20]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16013/fi-kbl-8809g/igt@run...@aborted.html

  
  [i915#192]: https://gitlab.freedesktop.org/drm/intel/issues/192
  [i915#193]: https://gitlab.freedesktop.org/drm/intel/issues/193
  [i915#194]: https://gitlab.freedesktop.org/drm/intel/issues/194
  [i915#44]: https://gitlab.freedesktop.org/drm/intel/issues/44
  [i915#505]: https://gitlab.freedesktop.org/drm/intel/issues/505
  [i915#656]: https://gitlab.freedesktop.org/drm/intel/issues/656
  [i915#671]: https://gitlab.freedesktop.org/drm/intel/issues/671
  [i915#694]: https://gitlab.freedesktop.org/drm/intel/issues/694
  [i915#723]: https://gitlab.freedesktop.org/drm/intel/issues/723
  [i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
  [i915#858]: https://gitlab.freedesktop.org/drm/intel/issues/858
  [i915#943]: https://gitlab.freedesktop.org/drm/intel/issues/943


Participating hosts (53 -> 46)
--

  Additional (1): fi-kbl-7560u 
  Missing(8): fi-ilk-m540 fi-hsw-4200u

Re: [Intel-gfx] [PATCH] drm/i915: Stop programming DDI_BUF_TRANS_SELECT on recent platforms

2020-01-07 Thread Ville Syrjälä

On Mon, Dec 30, 20`19 at 03:45:41PM -0800, Matt Roper wrote:
> The bits in DDI_BUF_CTL related to DP vswing emphasis were removed on
> GLK since the relevant programming has moved to the PHY registers.  The
> bits still exist on BXT, but have a programming note indicating that
> they're ignored.  Let's stop programming them on gen9lp and and gen10+.
> 
> Bspec: 7534
> Bspec: 49533
> Cc: Lucas De Marchi 
> Signed-off-by: Matt Roper 
> ---
>  drivers/gpu/drm/i915/display/intel_ddi.c | 17 +++--
>  1 file changed, 11 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c 
> b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 3a538789c585..c63a1712515c 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -1148,6 +1148,8 @@ void hsw_fdi_link_train(struct intel_encoder *encoder,
>   /* Start the training iterating through available voltages and emphasis,
>* testing each value twice. */
>   for (i = 0; i < ARRAY_SIZE(hsw_ddi_translations_fdi) * 2; i++) {
> + u32 tmp;
> +
>   /* Configure DP_TP_CTL with auto-training */
>   I915_WRITE(DP_TP_CTL(PORT_E),
>   DP_TP_CTL_FDI_AUTOTRAIN |
> @@ -1159,10 +1161,10 @@ void hsw_fdi_link_train(struct intel_encoder *encoder,
>* DDI E does not support port reversal, the functionality is
>* achieved on the PCH side in FDI_RX_CTL, so no need to set the
>* port reversal bit */
> - I915_WRITE(DDI_BUF_CTL(PORT_E),
> -DDI_BUF_CTL_ENABLE |
> -((crtc_state->fdi_lanes - 1) << 1) |
> -DDI_BUF_TRANS_SELECT(i / 2));
> + tmp = DDI_BUF_CTL_ENABLE | ((crtc_state->fdi_lanes - 1) << 1);
> + if (INTEL_GEN(dev_priv) <= 9 && !IS_GEN9_LP(dev_priv))

Only hsw/bdw have FDI so this part of the patch is pointless.

> + tmp |= DDI_BUF_TRANS_SELECT(i / 2);
> + I915_WRITE(DDI_BUF_CTL(PORT_E), tmp);
>   POSTING_READ(DDI_BUF_CTL(PORT_E));
>  
>   udelay(600);
> @@ -1238,13 +1240,16 @@ void hsw_fdi_link_train(struct intel_encoder *encoder,
>  
>  static void intel_ddi_init_dp_buf_reg(struct intel_encoder *encoder)
>  {
> + struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
>   struct intel_dp *intel_dp = enc_to_intel_dp(>base);
>   struct intel_digital_port *intel_dig_port =
>   enc_to_dig_port(>base);
>  
> - intel_dp->DP = intel_dig_port->saved_port_bits |
> - DDI_BUF_CTL_ENABLE | DDI_BUF_TRANS_SELECT(0);
> + intel_dp->DP = intel_dig_port->saved_port_bits | DDI_BUF_CTL_ENABLE;
>   intel_dp->DP |= DDI_PORT_WIDTH(intel_dp->lane_count);
> + if (INTEL_GEN(dev_priv) <= 9 && !IS_GEN9_LP(dev_priv))

gen < 9 || gen9_bc
would seem a bit easier on the brain.

> + intel_dp->DP |= DDI_BUF_TRANS_SELECT(0);

That's just '|= 0' so perhaps a bit pointless. But I guess it does serve
as some sort of documentation. Though the whole use of
intel_ddi_init_dp_buf_reg() seems like confusing nonsesne. Especially
the tgl part as it doesn't even do what the comment suggests it should
be doing.

Anyways, last hunk is
Reviewed-by: Ville Syrjälä 

> +
>  }
>  
>  static struct intel_encoder *
> -- 
> 2.23.0
> 
> ___
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v4 rebased 2/2] drm/i915/display: Fix warning about MST and DDI restrictions

2020-01-07 Thread Ville Syrjälä

On Tue, Jan 07, 2020 at 09:09:22AM -0800, José Roberto de Souza wrote:
> Capturing the restrictions of the BSpec pages bellow:
> 
> SKL and CNL do not support MST in DDI E, DDI E only support 2 lanes
> and it is mostly used to support a 4 lanes eDP panel together with
> DDI A.
> ICL's DDI E support MST just like other ports but DDI A is still eDP
> and MIPI only.
> TGL supports MST in any DDI, including DDI A but TGL has it's own
> ddi_pre_enable_dp function already without any warning.
> 
> [  215.579791] [ cut here ]
> [  215.579794] WARN_ON(is_mst && (port == PORT_A || port == PORT_E))
> [  215.579875] WARNING: CPU: 0 PID: 268 at 
> drivers/gpu/drm/i915/display/intel_ddi.c:3576 
> intel_ddi_pre_enable+0x124/0xea0 [i915]
> [  215.579878] Modules linked in: snd_hda_codec_hdmi snd_hda_codec_realtek 
> snd_hda_codec_generic i915 btusb btrtl btbcm btintel bluetooth prime_numbers 
> snd_hda_intel snd_intel_dspcfg snd_hda_codec e1000e snd_hwdep snd_hda_core 
> asix mei_hdcp cdc_ether x86_pkg_temp_thermal mei_me snd_pcm r8152 coretemp 
> usbnet mei crct10dif_pclmul mii ptp ecdh_generic crc32_pclmul i2c_i801 ecc 
> pps_core ghash_clmulni_intel thunderbolt
> [  215.579905] CPU: 0 PID: 268 Comm: kworker/0:2 Tainted: GW 
> 5.4.0-rc8-zeh+ #1307
> [  215.579907] Hardware name: Intel Corporation Ice Lake Client 
> Platform/IceLake U DDR4 SODIMM PD RVP TLC, BIOS 
> ICLSFWR1.R00.3201.A00.1905140358 05/14/2019
> [  215.579912] Workqueue: events_long drm_dp_mst_link_probe_work
> [  215.579975] RIP: 0010:intel_ddi_pre_enable+0x124/0xea0 [i915]
> [  215.579978] Code: ff 8b 7c 24 10 89 44 24 30 85 ff 74 1f f7 44 24 18 fb ff 
> ff ff 75 15 48 c7 c6 98 fa 48 a0 48 c7 c7 d3 df 4a a0 e8 cf d5 d0 e0 <0f> 0b 
> 0f b6 4c 24 2c 41 8b b5 04 06 00 00 4c 89 e7 41 0f b6 95 0c
> [  215.579980] RSP: 0018:c90001a5f990 EFLAGS: 00010286
> [  215.579984] RAX:  RBX: 88848356a000 RCX: 
> 
> [  215.579986] RDX: 1df1 RSI: 88849340c998 RDI: 
> 821489c5
> [  215.579989] RBP: 88848356a000 R08: c021a419 R09: 
> 
> [  215.579991] R10:  R11:  R12: 
> 88848356a118
> [  215.579994] R13: 88847f39c000 R14: 88847fe7 R15: 
> 88848356a000
> [  215.579996] FS:  () GS:88849f80() 
> knlGS:
> [  215.57] CS:  0010 DS:  ES:  CR0: 80050033
> [  215.580001] CR2: 55d3d5a26bc0 CR3: 000480ba6005 CR4: 
> 00760ef0
> [  215.580004] PKRU: 5554
> [  215.580006] Call Trace:
> [  215.580014]  ? drm_dp_mst_topology_put_port+0x6f/0x130
> [  215.580072]  intel_mst_pre_enable_dp+0x14b/0x170 [i915]
> [  215.580129]  intel_encoders_pre_enable+0x76/0x90 [i915]
> [  215.580191]  haswell_crtc_enable+0x84/0x880 [i915]
> [  215.580266]  intel_update_crtc+0x1e4/0x200 [i915]
> [  215.580333]  skl_commit_modeset_enables+0x287/0x420 [i915]
> [  215.580405]  intel_atomic_commit_tail+0x332/0x14e0 [i915]
> [  215.580410]  ? queue_work_on+0x41/0x70
> [  215.580489]  intel_atomic_commit+0x31e/0x350 [i915]
> [  215.580500]  drm_client_modeset_commit_atomic+0x18b/0x220
> [  215.580523]  drm_client_modeset_commit_force+0x4d/0x180
> [  215.580531]  drm_fb_helper_restore_fbdev_mode_unlocked+0x46/0xa0
> [  215.580538]  drm_fb_helper_set_par+0x27/0x50
> [  215.580543]  drm_fb_helper_hotplug_event.part.0+0xa7/0xc0
> [  215.580549]  drm_kms_helper_hotplug_event+0x21/0x30
> [  215.580553]  process_one_work+0x25b/0x5b0
> [  215.580566]  worker_thread+0x4b/0x3b0
> [  215.580578]  kthread+0x100/0x140
> [  215.580581]  ? process_one_work+0x5b0/0x5b0
> [  215.580585]  ? kthread_park+0x80/0x80
> [  215.580591]  ret_from_fork+0x24/0x50
> [  215.580603] irq event stamp: 1393930
> [  215.580606] hardirqs last  enabled at (1393929): [] 
> vprintk_emit+0x143/0x330
> [  215.580609] hardirqs last disabled at (1393930): [] 
> trace_hardirqs_off_thunk+0x1a/0x20
> [  215.580613] softirqs last  enabled at (1393434): [] 
> __do_softirq+0x389/0x47f
> [  215.580618] softirqs last disabled at (1393423): [] 
> irq_exit+0xa9/0xc0
> [  215.580621] ---[ end trace afd44ea9caa6373e ]---
> 
> BSpec: 4217
> BSpec: 14004
> BSpec: 20584
> BSpec: 50583
> Cc: Matt Roper 
> Cc: Ville Syrjälä 
> Cc: Lucas De Marchi 
> Signed-off-by: José Roberto de Souza 
> ---
>  drivers/gpu/drm/i915/display/intel_ddi.c | 5 -
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c 
> b/drivers/gpu/drm/i915/display/intel_ddi.c
> index 2e4e178f7ed4..cfea06ed50f2 100644
> --- a/drivers/gpu/drm/i915/display/intel_ddi.c
> +++ b/drivers/gpu/drm/i915/display/intel_ddi.c
> @@ -3533,7 +3533,10 @@ static void hsw_ddi_pre_enable_dp(struct intel_encoder 
> *encoder,
>   bool is_mst = intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST);
>   int level = intel_ddi_dp_level(intel_dp);
>  
> - WARN_ON(is_mst && (port == PORT_A || port

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Add missing include file

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915: Add missing include file 
URL   : https://patchwork.freedesktop.org/series/71695/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
be5873708dde drm/i915: Add missing include file 
-:9: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description 
(prefer a maximum 75 chars per line)
#9: 
 implicit declaration of function mul_u32_u32; did you mean mul_u64_u32_div? 
[-Werror=implicit-function-declaration]

total: 0 errors, 1 warnings, 0 checks, 7 lines checked

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915/gtt: split up i915_gem_gtt

2020-01-07 Thread Chris Wilson

Quoting Chris Wilson (2020-01-07 13:40:09)
> From: Matthew Auld 
> 
> Attempt to split i915_gem_gtt.[ch] into more manageable chunks.
> 
> Suggested-by: Chris Wilson 
> Signed-off-by: Matthew Auld 
> Cc: Chris Wilson 
> Reviewed-by: Chris Wilson 

Had one ack from Mika, the pain should be worth it in the end...
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH] drm/i915/gt: Always force restore freshly pinned contexts

2020-01-07 Thread Chris Wilson

It is highly unlikely, but still conceivable, that we submit a context
with the same GGTT address as last active on the HW. In this case, with
a matching LRCA, the HW would not restore the new context image causing
a potential violation of our context isolation.

Signed-off-by: Chris Wilson 
Cc: Mika Kuoppala 
---
 drivers/gpu/drm/i915/gt/intel_lrc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c 
b/drivers/gpu/drm/i915/gt/intel_lrc.c
index f6174e597dd3..5ccc8a3538ba 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -2583,7 +2583,7 @@ __execlists_context_pin(struct intel_context *ce,
goto unpin_active;
}
 
-   ce->lrc_desc = lrc_descriptor(ce, engine);
+   ce->lrc_desc = lrc_descriptor(ce, engine) | CTX_DESC_FORCE_RESTORE;
ce->lrc_reg_state = vaddr + LRC_STATE_PN * PAGE_SIZE;
__execlists_update_reg_state(ce, engine);
 
-- 
2.25.0.rc1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/gtt: split up i915_gem_gtt (rev2)

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915/gtt: split up i915_gem_gtt (rev2)
URL   : https://patchwork.freedesktop.org/series/71678/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_7695 -> Patchwork_16012


Summary
---

  **SUCCESS**

  No regressions found.

  External URL: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/index.html

Known issues


  Here are the changes found in Patchwork_16012 that come from known issues:

### IGT changes ###

 Issues hit 

  * igt@i915_pm_rpm@module-reload:
- fi-skl-lmem:[PASS][1] -> [DMESG-WARN][2] ([i915#889]) +1 similar 
issue
   [1]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-skl-lmem/igt@i915_pm_...@module-reload.html
   [2]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/fi-skl-lmem/igt@i915_pm_...@module-reload.html

  * igt@i915_selftest@live_active:
- fi-icl-y:   [PASS][3] -> [DMESG-FAIL][4] ([i915#765])
   [3]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-icl-y/igt@i915_selftest@live_active.html
   [4]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/fi-icl-y/igt@i915_selftest@live_active.html

  * igt@i915_selftest@live_blt:
- fi-ivb-3770:[PASS][5] -> [DMESG-FAIL][6] ([i915#725])
   [5]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-ivb-3770/igt@i915_selftest@live_blt.html
   [6]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/fi-ivb-3770/igt@i915_selftest@live_blt.html
- fi-hsw-4770:[PASS][7] -> [DMESG-FAIL][8] ([i915#770])
   [7]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-hsw-4770/igt@i915_selftest@live_blt.html
   [8]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/fi-hsw-4770/igt@i915_selftest@live_blt.html

  * igt@i915_selftest@live_gt_lrc:
- fi-skl-6600u:   [PASS][9] -> [DMESG-FAIL][10] ([i915#889]) +7 similar 
issues
   [9]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-skl-6600u/igt@i915_selftest@live_gt_lrc.html
   [10]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/fi-skl-6600u/igt@i915_selftest@live_gt_lrc.html

  * igt@i915_selftest@live_late_gt_pm:
- fi-skl-6600u:   [PASS][11] -> [DMESG-WARN][12] ([i915#889]) +23 
similar issues
   [11]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-skl-6600u/igt@i915_selftest@live_late_gt_pm.html
   [12]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/fi-skl-6600u/igt@i915_selftest@live_late_gt_pm.html

  * igt@i915_selftest@live_sanitycheck:
- fi-skl-lmem:[PASS][13] -> [INCOMPLETE][14] ([i915#198])
   [13]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-skl-lmem/igt@i915_selftest@live_sanitycheck.html
   [14]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/fi-skl-lmem/igt@i915_selftest@live_sanitycheck.html

  * igt@kms_chamelium@hdmi-hpd-fast:
- fi-kbl-7500u:   [PASS][15] -> [FAIL][16] ([fdo#111407])
   [15]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-kbl-7500u/igt@kms_chamel...@hdmi-hpd-fast.html
   [16]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/fi-kbl-7500u/igt@kms_chamel...@hdmi-hpd-fast.html

  
 Possible fixes 

  * igt@gem_exec_suspend@basic-s0:
- fi-byt-n2820:   [FAIL][17] ([i915#694]) -> [PASS][18]
   [17]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-byt-n2820/igt@gem_exec_susp...@basic-s0.html
   [18]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/fi-byt-n2820/igt@gem_exec_susp...@basic-s0.html

  * igt@i915_selftest@live_blt:
- fi-bsw-nick:[DMESG-FAIL][19] ([i915#723]) -> [PASS][20]
   [19]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-bsw-nick/igt@i915_selftest@live_blt.html
   [20]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/fi-bsw-nick/igt@i915_selftest@live_blt.html

  
 Warnings 

  * igt@runner@aborted:
- fi-kbl-8809g:   [FAIL][21] ([i915#192] / [i915#193] / [i915#194]) -> 
[FAIL][22] ([i915#858])
   [21]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7695/fi-kbl-8809g/igt@run...@aborted.html
   [22]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16012/fi-kbl-8809g/igt@run...@aborted.html

  
  [fdo#111407]: https://bugs.freedesktop.org/show_bug.cgi?id=111407
  [i915#192]: https://gitlab.freedesktop.org/drm/intel/issues/192
  [i915#193]: https://gitlab.freedesktop.org/drm/intel/issues/193
  [i915#194]: https://gitlab.freedesktop.org/drm/intel/issues/194
  [i915#198]: https://gitlab.freedesktop.org/drm/intel/issues/198
  [i915#694]: https://gitlab.freedesktop.org/drm/intel/issues/694
  [i915#723]: https://gitlab.freedesktop.org/drm/intel/issues/723
  [i915#725]: https://gitlab.freedesktop.org/drm/intel/issues/725
  [i915#765]: https://gitlab.freedesktop.org/drm/intel/issues/765
  [i915#770]: https://gitlab.freedesktop.org/drm/intel/issues/770
  [i915#858]: https://gitlab.freedesktop.org/drm/intel/issues/858
  [i915#889]:

Re: [Intel-gfx] [alsa-devel] USB Type-C monitor flashes once when play a video file after unplug and re-plug the monitor

2020-01-07 Thread Nathan Ciobanu

On Mon, Jan 06, 2020 at 08:08:04AM +, lucien_...@compal.com wrote:
> Hi Takashi
> 
> We verified on Ubuntu 19.10 with kernel 5.4.0.0-050400-generic (please refer 
> to attachment), the result is positive which symptom doesn't happen anymore 
> once I played music or video sound output through Dell S2718D Type-C monitor. 
> It seems had some fix in latest kernel.

Takashi, can you point to the patch series you suspect may have fixed this 
issue? 

Thanks,
Nathan
> 
> Thanks.
> 
> 
> -Original Message-
> From: Takashi Iwai  
> Sent: Friday, January 3, 2020 5:16 PM
> To: Cheng. AJ (TPE) 
> Cc: intel-gfx@lists.freedesktop.org; alsa-de...@alsa-project.org; 
> nathan.d.ciob...@linux.intel.com; Wang. CindyXT (TPE) 
> ; Ye. Nelson (TPE) ; Yap. 
> Shane (TPE) ; Kao. Lucien (TPE) 
> ; Tseng. Evan (TPE) 
> Subject: Re: [alsa-devel] USB Type-C monitor flashes once when play a video 
> file after unplug and re-plug the monitor
> 
> On Fri, 03 Jan 2020 02:57:03 +0100,
>  wrote:
> > 
> > Hi Sirs,
> > Here is chromebook SW team from Compal.
> > As the mail title, we hit issue that the external monitor will flash once 
> > when play video after hot pluging.
> > We can reproduce not only on chromebook but also ubuntu 16.04.
> > There has higher failure rate with Dell Solomon dock and Dell S2718D 
> > monitor.
> > 
> > We found adding the delay in "sound/pci/hda/patch_hdmi.c " can fix 
> > this issue.(as the attachment) May need your help to review and advice. 
> > Thanks.
> > 
> > Here is the issue number in gitlab for more detail.
> > https://gitlab.freedesktop.org/drm/intel/issues/318
> 
> Could you check whether it still happens with the latest upstream kernel, at 
> least 5.4.y, if it wasn't tested yet?
> 
> I don't want to put a long delay just because of random reason unless it's 
> really mandatory.  I'm wondering whether the recent write-sync change 
> improves the situation, so let's check the recent code.
> 
> 
> thanks,
> 
> Takashi
> 
> > 
> > 
> > 
> > AJ Cheng
> > NID/NID1
> > e-mail: aj_ch...@compal.com
> > Tel:  +886-2-8797-8599 ext. 17561
> > Mobile : +886-932827829
> > COMPAL Electronics, Inc.
> > 
> > [2 flash_once.diff ]
> > 
> > ___
> > Alsa-devel mailing list
> > alsa-de...@alsa-project.org
> > https://mailman.alsa-project.org/mailman/listinfo/alsa-devel


___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH v4 rebased 2/2] drm/i915/display: Fix warning about MST and DDI restrictions

2020-01-07 Thread José Roberto de Souza

Capturing the restrictions of the BSpec pages bellow:

SKL and CNL do not support MST in DDI E, DDI E only support 2 lanes
and it is mostly used to support a 4 lanes eDP panel together with
DDI A.
ICL's DDI E support MST just like other ports but DDI A is still eDP
and MIPI only.
TGL supports MST in any DDI, including DDI A but TGL has it's own
ddi_pre_enable_dp function already without any warning.

[  215.579791] [ cut here ]
[  215.579794] WARN_ON(is_mst && (port == PORT_A || port == PORT_E))
[  215.579875] WARNING: CPU: 0 PID: 268 at 
drivers/gpu/drm/i915/display/intel_ddi.c:3576 intel_ddi_pre_enable+0x124/0xea0 
[i915]
[  215.579878] Modules linked in: snd_hda_codec_hdmi snd_hda_codec_realtek 
snd_hda_codec_generic i915 btusb btrtl btbcm btintel bluetooth prime_numbers 
snd_hda_intel snd_intel_dspcfg snd_hda_codec e1000e snd_hwdep snd_hda_core asix 
mei_hdcp cdc_ether x86_pkg_temp_thermal mei_me snd_pcm r8152 coretemp usbnet 
mei crct10dif_pclmul mii ptp ecdh_generic crc32_pclmul i2c_i801 ecc pps_core 
ghash_clmulni_intel thunderbolt
[  215.579905] CPU: 0 PID: 268 Comm: kworker/0:2 Tainted: GW 
5.4.0-rc8-zeh+ #1307
[  215.579907] Hardware name: Intel Corporation Ice Lake Client 
Platform/IceLake U DDR4 SODIMM PD RVP TLC, BIOS 
ICLSFWR1.R00.3201.A00.1905140358 05/14/2019
[  215.579912] Workqueue: events_long drm_dp_mst_link_probe_work
[  215.579975] RIP: 0010:intel_ddi_pre_enable+0x124/0xea0 [i915]
[  215.579978] Code: ff 8b 7c 24 10 89 44 24 30 85 ff 74 1f f7 44 24 18 fb ff 
ff ff 75 15 48 c7 c6 98 fa 48 a0 48 c7 c7 d3 df 4a a0 e8 cf d5 d0 e0 <0f> 0b 0f 
b6 4c 24 2c 41 8b b5 04 06 00 00 4c 89 e7 41 0f b6 95 0c
[  215.579980] RSP: 0018:c90001a5f990 EFLAGS: 00010286
[  215.579984] RAX:  RBX: 88848356a000 RCX: 
[  215.579986] RDX: 1df1 RSI: 88849340c998 RDI: 821489c5
[  215.579989] RBP: 88848356a000 R08: c021a419 R09: 
[  215.579991] R10:  R11:  R12: 88848356a118
[  215.579994] R13: 88847f39c000 R14: 88847fe7 R15: 88848356a000
[  215.579996] FS:  () GS:88849f80() 
knlGS:
[  215.57] CS:  0010 DS:  ES:  CR0: 80050033
[  215.580001] CR2: 55d3d5a26bc0 CR3: 000480ba6005 CR4: 00760ef0
[  215.580004] PKRU: 5554
[  215.580006] Call Trace:
[  215.580014]  ? drm_dp_mst_topology_put_port+0x6f/0x130
[  215.580072]  intel_mst_pre_enable_dp+0x14b/0x170 [i915]
[  215.580129]  intel_encoders_pre_enable+0x76/0x90 [i915]
[  215.580191]  haswell_crtc_enable+0x84/0x880 [i915]
[  215.580266]  intel_update_crtc+0x1e4/0x200 [i915]
[  215.580333]  skl_commit_modeset_enables+0x287/0x420 [i915]
[  215.580405]  intel_atomic_commit_tail+0x332/0x14e0 [i915]
[  215.580410]  ? queue_work_on+0x41/0x70
[  215.580489]  intel_atomic_commit+0x31e/0x350 [i915]
[  215.580500]  drm_client_modeset_commit_atomic+0x18b/0x220
[  215.580523]  drm_client_modeset_commit_force+0x4d/0x180
[  215.580531]  drm_fb_helper_restore_fbdev_mode_unlocked+0x46/0xa0
[  215.580538]  drm_fb_helper_set_par+0x27/0x50
[  215.580543]  drm_fb_helper_hotplug_event.part.0+0xa7/0xc0
[  215.580549]  drm_kms_helper_hotplug_event+0x21/0x30
[  215.580553]  process_one_work+0x25b/0x5b0
[  215.580566]  worker_thread+0x4b/0x3b0
[  215.580578]  kthread+0x100/0x140
[  215.580581]  ? process_one_work+0x5b0/0x5b0
[  215.580585]  ? kthread_park+0x80/0x80
[  215.580591]  ret_from_fork+0x24/0x50
[  215.580603] irq event stamp: 1393930
[  215.580606] hardirqs last  enabled at (1393929): [] 
vprintk_emit+0x143/0x330
[  215.580609] hardirqs last disabled at (1393930): [] 
trace_hardirqs_off_thunk+0x1a/0x20
[  215.580613] softirqs last  enabled at (1393434): [] 
__do_softirq+0x389/0x47f
[  215.580618] softirqs last disabled at (1393423): [] 
irq_exit+0xa9/0xc0
[  215.580621] ---[ end trace afd44ea9caa6373e ]---

BSpec: 4217
BSpec: 14004
BSpec: 20584
BSpec: 50583
Cc: Matt Roper 
Cc: Ville Syrjälä 
Cc: Lucas De Marchi 
Signed-off-by: José Roberto de Souza 
---
 drivers/gpu/drm/i915/display/intel_ddi.c | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c 
b/drivers/gpu/drm/i915/display/intel_ddi.c
index 2e4e178f7ed4..cfea06ed50f2 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -3533,7 +3533,10 @@ static void hsw_ddi_pre_enable_dp(struct intel_encoder 
*encoder,
bool is_mst = intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST);
int level = intel_ddi_dp_level(intel_dp);
 
-   WARN_ON(is_mst && (port == PORT_A || port == PORT_E));
+   if (INTEL_GEN(dev_priv) < 11)
+   WARN_ON(is_mst && (port == PORT_A || port == PORT_E));
+   else
+   WARN_ON(is_mst && port == PORT_A);
 
intel_dp_set_link_params(intel_dp, crtc_state->port_clock,

[Intel-gfx] [PATCH v4 rebased 1/2] drm/i915/display/icl+: Do not program clockgating

2020-01-07 Thread José Roberto de Souza

Talked with HW team and this is a left over, driver should not
program clockgating, mg or dekel firmware is reponsible for any
clockgating programing.

Also removing the register and bits definition related to clockgating.

v2:
Added WARN_ON

v3:
Only calling icl_phy_set_clock_gating() on intel_ddi_pre_enable_hdmi
for GEN11

v4:
ICL should also not program clockgating (thanks Matt for catching
this)

BSpec issue: 20885
BSpec: 49292
BSpec: 21735
Cc: Lucas De Marchi 
Cc: Matt Roper 
Cc: Jani Nikula 
Reviewed-by: Matt Roper 
Signed-off-by: José Roberto de Souza 
---
 drivers/gpu/drm/i915/display/intel_ddi.c | 72 
 drivers/gpu/drm/i915/i915_reg.h  | 20 ---
 2 files changed, 92 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c 
b/drivers/gpu/drm/i915/display/intel_ddi.c
index 07acd0daca25..2e4e178f7ed4 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -3167,57 +3167,6 @@ static void intel_ddi_clk_disable(struct intel_encoder 
*encoder)
}
 }
 
-static void
-icl_phy_set_clock_gating(struct intel_digital_port *dig_port, bool enable)
-{
-   struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
-   enum tc_port tc_port = intel_port_to_tc(dev_priv, dig_port->base.port);
-   u32 val, bits;
-   int ln;
-
-   if (tc_port == PORT_TC_NONE)
-   return;
-
-   bits = MG_DP_MODE_CFG_TR2PWR_GATING | MG_DP_MODE_CFG_TRPWR_GATING |
-  MG_DP_MODE_CFG_CLNPWR_GATING | MG_DP_MODE_CFG_DIGPWR_GATING |
-  MG_DP_MODE_CFG_GAONPWR_GATING;
-
-   for (ln = 0; ln < 2; ln++) {
-   if (INTEL_GEN(dev_priv) >= 12) {
-   I915_WRITE(HIP_INDEX_REG(tc_port), 
HIP_INDEX_VAL(tc_port, ln));
-   val = I915_READ(DKL_DP_MODE(tc_port));
-   } else {
-   val = I915_READ(MG_DP_MODE(ln, tc_port));
-   }
-
-   if (enable)
-   val |= bits;
-   else
-   val &= ~bits;
-
-   if (INTEL_GEN(dev_priv) >= 12)
-   I915_WRITE(DKL_DP_MODE(tc_port), val);
-   else
-   I915_WRITE(MG_DP_MODE(ln, tc_port), val);
-   }
-
-   if (INTEL_GEN(dev_priv) == 11) {
-   bits = MG_MISC_SUS0_CFG_TR2PWR_GATING |
-  MG_MISC_SUS0_CFG_CL2PWR_GATING |
-  MG_MISC_SUS0_CFG_GAONPWR_GATING |
-  MG_MISC_SUS0_CFG_TRPWR_GATING |
-  MG_MISC_SUS0_CFG_CL1PWR_GATING |
-  MG_MISC_SUS0_CFG_DGPWR_GATING;
-
-   val = I915_READ(MG_MISC_SUS0(tc_port));
-   if (enable)
-   val |= (bits | MG_MISC_SUS0_SUSCLK_DYNCLKGATE_MODE(3));
-   else
-   val &= ~(bits | 
MG_MISC_SUS0_SUSCLK_DYNCLKGATE_MODE_MASK);
-   I915_WRITE(MG_MISC_SUS0(tc_port), val);
-   }
-}
-
 static void
 icl_program_mg_dp_mode(struct intel_digital_port *intel_dig_port,
   const struct intel_crtc_state *crtc_state)
@@ -3516,12 +3465,6 @@ static void tgl_ddi_pre_enable_dp(struct intel_encoder 
*encoder,
 * down this function.
 */
 
-   /*
-* 7.d Type C with DP alternate or fixed/legacy/static connection -
-* Disable PHY clock gating per Type-C DDI Buffer page
-*/
-   icl_phy_set_clock_gating(dig_port, false);
-
/* 7.e Configure voltage swing and related IO settings */
tgl_ddi_vswing_sequence(encoder, crtc_state->port_clock, level,
encoder->type);
@@ -3573,15 +3516,6 @@ static void tgl_ddi_pre_enable_dp(struct intel_encoder 
*encoder,
if (!is_trans_port_sync_mode(crtc_state))
intel_dp_stop_link_train(intel_dp);
 
-   /*
-* TODO: enable clock gating
-*
-* It is not written in DP enabling sequence but "PHY Clockgating
-* programming" states that clock gating should be enabled after the
-* link training but doing so causes all the following trainings to fail
-* so not enabling it for now.
-*/
-
/* 7.l Configure and enable FEC if needed */
intel_ddi_enable_fec(encoder, crtc_state);
intel_dsc_enable(encoder, crtc_state);
@@ -3617,7 +3551,6 @@ static void hsw_ddi_pre_enable_dp(struct intel_encoder 
*encoder,
dig_port->ddi_io_power_domain);
 
icl_program_mg_dp_mode(dig_port, crtc_state);
-   icl_phy_set_clock_gating(dig_port, false);
 
if (INTEL_GEN(dev_priv) >= 11)
icl_ddi_vswing_sequence(encoder, crtc_state->port_clock,
@@ -3651,8 +3584,6 @@ static void hsw_ddi_pre_enable_dp(struct intel_encoder 
*encoder,
 
intel_ddi_enable_fec(encoder, crtc_state);
 
-   icl_phy_set_clock_gating(dig_port, true);
-
if (!is_mst)

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915/gtt: split up i915_gem_gtt (rev2)

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915/gtt: split up i915_gem_gtt (rev2)
URL   : https://patchwork.freedesktop.org/series/71678/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
b50ab2add6b6 drm/i915/gtt: split up i915_gem_gtt
-:112: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does 
MAINTAINERS need updating?
#112: 
new file mode 100644

-:287: WARNING:MEMORY_BARRIER: memory barrier without comment
#287: FILE: drivers/gpu/drm/i915/gt/gen6_ppgtt.c:171:
+   mb();

-:290: WARNING:MEMORY_BARRIER: memory barrier without comment
#290: FILE: drivers/gpu/drm/i915/gt/gen6_ppgtt.c:174:
+   mb();

-:618: CHECK:UNCOMMENTED_DEFINITION: struct mutex definition without comment
#618: FILE: drivers/gpu/drm/i915/gt/gen6_ppgtt.h:14:
+   struct mutex flush;

-:623: CHECK:UNCOMMENTED_DEFINITION: struct mutex definition without comment
#623: FILE: drivers/gpu/drm/i915/gt/gen6_ppgtt.h:19:
+   struct mutex pin_mutex;

-:643: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'base' - possible 
side-effects?
#643: FILE: drivers/gpu/drm/i915/gt/gen6_ppgtt.h:39:
+#define __to_gen6_ppgtt(base) container_of(base, struct gen6_ppgtt, base)

-:659: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'start' - possible 
side-effects?
#659: FILE: drivers/gpu/drm/i915/gt/gen6_ppgtt.h:55:
+#define gen6_for_each_pde(pt, pd, start, length, iter) \
+   for (iter = gen6_pde_index(start);  \
+length > 0 && iter < I915_PDES &&  \
+(pt = i915_pt_entry(pd, iter), true);  \
+({ u32 temp = ALIGN(start+1, 1 << GEN6_PDE_SHIFT); \
+   temp = min(temp - start, length);   \
+   start += temp, length -= temp; }), ++iter)

-:659: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'length' - possible 
side-effects?
#659: FILE: drivers/gpu/drm/i915/gt/gen6_ppgtt.h:55:
+#define gen6_for_each_pde(pt, pd, start, length, iter) \
+   for (iter = gen6_pde_index(start);  \
+length > 0 && iter < I915_PDES &&  \
+(pt = i915_pt_entry(pd, iter), true);  \
+({ u32 temp = ALIGN(start+1, 1 << GEN6_PDE_SHIFT); \
+   temp = min(temp - start, length);   \
+   start += temp, length -= temp; }), ++iter)

-:659: CHECK:MACRO_ARG_PRECEDENCE: Macro argument 'length' may be better as 
'(length)' to avoid precedence issues
#659: FILE: drivers/gpu/drm/i915/gt/gen6_ppgtt.h:55:
+#define gen6_for_each_pde(pt, pd, start, length, iter) \
+   for (iter = gen6_pde_index(start);  \
+length > 0 && iter < I915_PDES &&  \
+(pt = i915_pt_entry(pd, iter), true);  \
+({ u32 temp = ALIGN(start+1, 1 << GEN6_PDE_SHIFT); \
+   temp = min(temp - start, length);   \
+   start += temp, length -= temp; }), ++iter)

-:659: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'iter' - possible 
side-effects?
#659: FILE: drivers/gpu/drm/i915/gt/gen6_ppgtt.h:55:
+#define gen6_for_each_pde(pt, pd, start, length, iter) \
+   for (iter = gen6_pde_index(start);  \
+length > 0 && iter < I915_PDES &&  \
+(pt = i915_pt_entry(pd, iter), true);  \
+({ u32 temp = ALIGN(start+1, 1 << GEN6_PDE_SHIFT); \
+   temp = min(temp - start, length);   \
+   start += temp, length -= temp; }), ++iter)

-:663: CHECK:SPACING: spaces preferred around that '+' (ctx:VxV)
#663: FILE: drivers/gpu/drm/i915/gt/gen6_ppgtt.h:59:
+({ u32 temp = ALIGN(start+1, 1 << GEN6_PDE_SHIFT); \
  ^

-:667: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'iter' - possible 
side-effects?
#667: FILE: drivers/gpu/drm/i915/gt/gen6_ppgtt.h:63:
+#define gen6_for_all_pdes(pt, pd, iter)
\
+   for (iter = 0;  \
+iter < I915_PDES &&\
+(pt = i915_pt_entry(pd, iter), true);  \
+++iter)

-:810: WARNING:LINE_SPACING: Missing a blank line after declarations
#810: FILE: drivers/gpu/drm/i915/gt/gen8_ppgtt.c:124:
+   unsigned int shift = __gen8_pte_shift(vm->top);
+   return (vm->total + (1ull << shift) - 1) >> shift;

-:1310: WARNING:MEMORY_BARRIER: memory barrier without comment
#1310: FILE: drivers/gpu/drm/i915/gt/gen8_ppgtt.c:624:
+   wmb();

-:1676: WARNING:LINE_SPACING: Missing a blank line after declarations
#1676: FILE: drivers/gpu/drm/i915/gt/intel_ggtt.c:243:
+   dma_addr_t

[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: fix an error code in intel_modeset_all_tiles()

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915: fix an error code in intel_modeset_all_tiles()
URL   : https://patchwork.freedesktop.org/series/71694/
State : failure

== Summary ==

Applying: drm/i915: fix an error code in intel_modeset_all_tiles()
Using index info to reconstruct a base tree...
M   drivers/gpu/drm/i915/display/intel_display.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_display.c
No changes -- Patch already applied.

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915/dsi: Parse the I2C element from the VBT MIPI sequence block

2020-01-07 Thread Ville Syrjälä

On Fri, Jan 03, 2020 at 04:00:54PM -0800, Vivek Kasireddy wrote:
> On Fri, 3 Jan 2020 12:05:11 +0100
> Hans de Goede  wrote:
> Hi Hans,
> 
> > Hi Vivek,
> > 
> > On 03-01-2020 01:00, Vivek Kasireddy wrote:
> > > Parsing the i2c element is mainly done to transfer the payload from
> > > the MIPI sequence block to the relevant slave device. In some
> > > cases, the commands that are part of the payload can be used to
> > > turn on the backlight.
> > > 
> > > This patch is actually a refactored version of this old patch:
> > > https://lists.freedesktop.org/archives/intel-gfx/2014-December/056897.html
> > > 
> > > In addition to the refactoring, the old patch is augmented by
> > > looking up the i2c bus from ACPI NS instead of relying on the bus
> > > number provided in the VBT.
> > > 
> > > Cc: Deepak M 
> > > Cc: Nabendu Maiti 
> > > Cc: Matt Roper 
> > > Cc: Bob Paauwe 
> > > Signed-off-by: Vivek Kasireddy   
> > 
> > Thank you for this patch, I have been doing a lot of work to make
> > DSI panels on Bay Trail and Cherry Trail devices work better, as such
> > I've done a lot of testing of DSI panels. But I have never seen any
> > MIPI sequences actually use the i2c commands. May I ask how you have
> > tested this? Do you have a device which actually uses the i2c
> > commands?
> Oh, they sure exist; we do have a device that uses i2c commands to turn
> on the backlight that we have tested this patch on. 

And what exactly is that device? That is valuable information that the
commit message should contain.

> 
> > 
> > I also have some small review comments inline:
> > 
> > > ---
> > >   drivers/gpu/drm/i915/display/intel_dsi.h |  3 +
> > >   drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 93
> > >  2 files changed, 96 insertions(+)
> > > 
> > > diff --git a/drivers/gpu/drm/i915/display/intel_dsi.h
> > > b/drivers/gpu/drm/i915/display/intel_dsi.h index
> > > b15be5814599..5651bc8aa5c2 100644 ---
> > > a/drivers/gpu/drm/i915/display/intel_dsi.h +++
> > > b/drivers/gpu/drm/i915/display/intel_dsi.h @@ -68,6 +68,9 @@ struct
> > > intel_dsi { /* number of DSI lanes */
> > >   unsigned int lane_count;
> > >   
> > > + /* i2c bus associated with the slave device */
> > > + int i2c_bus_num;
> > > +
> > >   /*
> > >* video mode pixel format
> > >*
> > > diff --git a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c
> > > b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c index
> > > f90946c912ee..60441a5a3dba 100644 ---
> > > a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++
> > > b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -83,6 +83,12 @@
> > > static struct gpio_map vlv_gpio_table[] = { {
> > > VLV_GPIO_NC_11_PANEL1_BKLTCTL }, };
> > >   
> > > +struct i2c_adapter_lookup {
> > > + u16 slave_addr;
> > > + struct intel_dsi *intel_dsi;
> > > + acpi_handle dev_handle;
> > > +};
> > > +
> > >   #define CHV_GPIO_IDX_START_N0
> > >   #define CHV_GPIO_IDX_START_E73
> > >   #define CHV_GPIO_IDX_START_SW   100
> > > @@ -375,8 +381,93 @@ static const u8 *mipi_exec_gpio(struct
> > > intel_dsi *intel_dsi, const u8 *data) return data;
> > >   }
> > >   
> > > +static int i2c_adapter_lookup(struct acpi_resource *ares, void
> > > *data) +{
> > > + struct i2c_adapter_lookup *lookup = data;
> > > + struct intel_dsi *intel_dsi = lookup->intel_dsi;
> > > + struct acpi_resource_i2c_serialbus *sb;
> > > + struct i2c_adapter *adapter;
> > > + acpi_handle adapter_handle;
> > > + acpi_status status;
> > > +
> > > + if (intel_dsi->i2c_bus_num >= 0 ||
> > > + !i2c_acpi_get_i2c_resource(ares, ))
> > > + return 1;
> > > +
> > > + if (lookup->slave_addr != sb->slave_address)
> > > + return 1;
> > > +
> > > + status = acpi_get_handle(lookup->dev_handle,
> > > +  sb->resource_source.string_ptr,
> > > +  _handle);
> > > + if (ACPI_FAILURE(status))
> > > + return 1;
> > > +
> > > + adapter = i2c_acpi_find_adapter_by_handle(adapter_handle);
> > > + if (adapter)
> > > + intel_dsi->i2c_bus_num = adapter->nr;
> > > +
> > > + return 1;
> > > +}
> > > +
> > >   static const u8 *mipi_exec_i2c(struct intel_dsi *intel_dsi, const
> > > u8 *data) {
> > > + struct drm_device *dev = intel_dsi->base.base.dev;
> > > + struct i2c_adapter *adapter;
> > > + struct acpi_device *acpi_dev;
> > > + struct list_head resource_list;
> > > + struct i2c_adapter_lookup lookup;
> > > + struct i2c_msg msg;
> > > + int ret;
> > > + u8 vbt_i2c_bus_num = *(data + 2);
> > > + u16 slave_addr = *(u16 *)(data + 3);
> > > + u8 reg_offset = *(data + 5);
> > > + u8 payload_size = *(data + 6);
> > > + u8 *payload_data;
> > > +
> > > + if (intel_dsi->i2c_bus_num < 0) {
> > > + intel_dsi->i2c_bus_num = vbt_i2c_bus_num;
> > > +
> > > + acpi_dev = ACPI_COMPANION(>pdev->dev);
> > > + if (acpi_dev) {
> > > + memset(, 0, sizeof(lookup));
> > > + lookup.slave_addr =

Re: [Intel-gfx] [PATCH] drm/i915/display: nuke skl workaround for pre-production hw

2020-01-07 Thread Ville Syrjälä

On Mon, Dec 23, 2019 at 12:59:55PM -0800, Lucas De Marchi wrote:
> On Fri, Dec 20, 2019 at 10:11:15PM +, Chris Wilson wrote:
> >Quoting Lucas De Marchi (2019-12-20 22:06:50)
> >> According to intel_detect_preproduction_hw(), the SKL steeping D0 is
> >> still pre-preproduction so we can nuke the additional workaround.
> >>
> >> While at it, nuke dangling new line.
> >>
> >> Signed-off-by: Lucas De Marchi 
> >
> >Ville and Jani are more likely to know if the pre-production comment is
> >telling porkies.
> 
> Bspec 7534 says "The DDIA port presence strap is not connected on the SKL A-C 
> steppings."
> 
> I would expect to catch a failure in CI if the spec was wrong. I can add
> the bspec # to the commit message while fixing up the typos there.

IIRC the w/a db has this listed as "forever". So not really sure what
the truth is on this one. But easy enough to revert if it doesn't work
out I supoose. Maybe toss in a note about the w/a db thing into the
commit message?

> 
> 
> Lucas De Marchi
> 
> >-Chris
> >
> >> ---
> >>  drivers/gpu/drm/i915/display/intel_display.c | 9 +
> >>  1 file changed, 1 insertion(+), 8 deletions(-)
> >>
> >> diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
> >> b/drivers/gpu/drm/i915/display/intel_display.c
> >> index e6702b9b9117..4aa7dfa88c7c 100644
> >> --- a/drivers/gpu/drm/i915/display/intel_display.c
> >> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> >> @@ -16018,14 +16018,8 @@ static void intel_setup_outputs(struct 
> >> drm_i915_private *dev_priv)
> >> if (intel_ddi_crt_present(dev_priv))
> >> intel_crt_init(dev_priv);
> >>
> >> -   /*
> >> -* Haswell uses DDI functions to detect digital outputs.
> >> -* On SKL pre-D0 the strap isn't connected, so we assume
> >> -* it's there.
> >> -*/
> >> found = I915_READ(DDI_BUF_CTL(PORT_A)) & 
> >> DDI_INIT_DISPLAY_DETECTED;
> >> -   /* WaIgnoreDDIAStrap: skl */
> >> -   if (found || IS_GEN9_BC(dev_priv))
> >> +   if (found)
> >> intel_ddi_init(dev_priv, PORT_A);
> >>
> >> /* DDI B, C, D, and F detection is indicated by the 
> >> SFUSE_STRAP
> >> @@ -16046,7 +16040,6 @@ static void intel_setup_outputs(struct 
> >> drm_i915_private *dev_priv)
> >> if (IS_GEN9_BC(dev_priv) &&
> >> intel_bios_is_port_present(dev_priv, PORT_E))
> >> intel_ddi_init(dev_priv, PORT_E);
> >> -
> >> } else if (HAS_PCH_SPLIT(dev_priv)) {
> >> int found;
> >>
> >> --
> >> 2.24.0
> >>

-- 
Ville Syrjälä
Intel
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: Pin the context as we work on it

2020-01-07 Thread Chris Wilson

Quoting Chris Wilson (2020-01-07 15:44:07)
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c 
> b/drivers/gpu/drm/i915/i915_debugfs.c
> index 0ac98e39eb75..db184536acef 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -321,16 +321,15 @@ static void print_context_stats(struct seq_file *m,
>  
> for_each_gem_engine(ce,
> i915_gem_context_lock_engines(ctx), it) {
> -   intel_context_lock_pinned(ce);
> -   if (intel_context_is_pinned(ce)) {
> +   if (intel_context_pin_if_active(ce)) {
> rcu_read_lock();

Yeah, we probably don't need the rcu lock here anymore :)
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH] drm/i915: Pin the context as we work on it

2020-01-07 Thread Chris Wilson

Since we now allow the intel_context_unpin() to run unserialised, we
risk our operations under the intel_context_lock_pinned() being run as
the context is unpinned (and thus invalidating our state). We can
atomically acquire the pin, testing to see if it is pinned in the
process, thus ensuring that the state remains consistent during the
course of the whole operation.

Fixes: 841350223816 ("drm/i915/gt: Drop mutex serialisation between context 
pin/unpin")
Signed-off-by: Chris Wilson 
Cc: Tvrtko Ursulin 
---
 drivers/gpu/drm/i915/gem/i915_gem_context.c | 10 +++---
 drivers/gpu/drm/i915/gt/intel_context.h |  7 ++-
 drivers/gpu/drm/i915/i915_debugfs.c | 10 --
 drivers/gpu/drm/i915/i915_perf.c| 13 +
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c 
b/drivers/gpu/drm/i915/gem/i915_gem_context.c
index f746bb53f18e..f124b43400ce 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_context.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c
@@ -1235,12 +1235,14 @@ gen8_modify_rpcs(struct intel_context *ce, struct 
intel_sseu sseu)
 * image, or into the registers directory, does not stick). Pristine
 * and idle contexts will be configured on pinning.
 */
-   if (!intel_context_is_pinned(ce))
+   if (!intel_context_pin_if_active(ce))
return 0;
 
rq = intel_engine_create_kernel_request(ce->engine);
-   if (IS_ERR(rq))
-   return PTR_ERR(rq);
+   if (IS_ERR(rq)) {
+   ret = PTR_ERR(rq);
+   goto out_unpin;
+   }
 
/* Serialise with the remote context */
ret = intel_context_prepare_remote_request(ce, rq);
@@ -1248,6 +1250,8 @@ gen8_modify_rpcs(struct intel_context *ce, struct 
intel_sseu sseu)
ret = gen8_emit_rpcs_config(rq, ce, sseu);
 
i915_request_add(rq);
+out_unpin:
+   intel_context_unpin(ce);
return ret;
 }
 
diff --git a/drivers/gpu/drm/i915/gt/intel_context.h 
b/drivers/gpu/drm/i915/gt/intel_context.h
index 0f5ae4ff3b10..63073ebc6cf1 100644
--- a/drivers/gpu/drm/i915/gt/intel_context.h
+++ b/drivers/gpu/drm/i915/gt/intel_context.h
@@ -76,9 +76,14 @@ static inline void intel_context_unlock_pinned(struct 
intel_context *ce)
 
 int __intel_context_do_pin(struct intel_context *ce);
 
+static inline bool intel_context_pin_if_active(struct intel_context *ce)
+{
+   return atomic_inc_not_zero(>pin_count);
+}
+
 static inline int intel_context_pin(struct intel_context *ce)
 {
-   if (likely(atomic_inc_not_zero(>pin_count)))
+   if (likely(intel_context_pin_if_active(ce)))
return 0;
 
return __intel_context_do_pin(ce);
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c 
b/drivers/gpu/drm/i915/i915_debugfs.c
index 0ac98e39eb75..db184536acef 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -321,16 +321,15 @@ static void print_context_stats(struct seq_file *m,
 
for_each_gem_engine(ce,
i915_gem_context_lock_engines(ctx), it) {
-   intel_context_lock_pinned(ce);
-   if (intel_context_is_pinned(ce)) {
+   if (intel_context_pin_if_active(ce)) {
rcu_read_lock();
if (ce->state)
per_file_stats(0,
   ce->state->obj, );
per_file_stats(0, ce->ring->vma->obj, );
rcu_read_unlock();
+   intel_context_unpin(ce);
}
-   intel_context_unlock_pinned(ce);
}
i915_gem_context_unlock_engines(ctx);
 
@@ -1513,15 +1512,14 @@ static int i915_context_status(struct seq_file *m, void 
*unused)
 
for_each_gem_engine(ce,
i915_gem_context_lock_engines(ctx), it) {
-   intel_context_lock_pinned(ce);
-   if (intel_context_is_pinned(ce)) {
+   if (intel_context_pin_if_active(ce)) {
seq_printf(m, "%s: ", ce->engine->name);
if (ce->state)
describe_obj(m, ce->state->obj);
describe_ctx_ring(m, ce->ring);
seq_putc(m, '\n');
+   intel_context_unpin(ce);
}
-   intel_context_unlock_pinned(ce);
}
i915_gem_context_unlock_engines(ctx);
 
diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 84350c7bc711..c7a7b676f079 100644
--- a/drivers/gpu/drm/i915/i915_perf.c
+++

Re: [Intel-gfx] [PULL] drm-misc-next

2020-01-07 Thread Daniel Vetter

On Tue, Jan 7, 2020 at 12:50 PM Maarten Lankhorst
 wrote:
>
> drm-misc-next-2020-01-07:
> drm-misc-next for v5.6:
>
> UAPI Changes:
> - Allow overriding number of bootup penguins in fbcon using 
> fbcon=logo-count:n.
>
> Cross-subsystem Changes:
> - fbdev fixes for mmp, and make it work with CONFIG_COMPILE_TEST.
> - Use devm_platform_ioremap_resource in fbdev drivers.
> - Various small fbdev fixes.
>
> Core Changes:
> - Support scanline alignment for dumb buffers.
> - Add atomic_check() hook to bridge ops, to support bus format negotiation.

This breaks depmod because of the classic dependency loop between
drm.ko and drm-kms-helpers.ko. Compile-testing alone wont catch it,
you need make modules_install 

Boris is working on a fix, but yea I guess we need to respin this pull :-/
-Daniel

> - Add gem_create_object() to vram helpers.
>
> Driver Changes:
> - Rockchip: Add support for PX30.
> - Use generic fbdev code and dumb helpers in hisilicon/hibmc.
> - Add support for Leadtek LTK500HD1829 panel, and xinpeng XPP055C272.
> - Clock fixes for atmel-hlcdc.
> - Various smaller fixes to all drivers.
> The following changes since commit f5c547efa16c0ea5abff0596e829f502be11902e:
>
>   Merge tag 'drm-misc-next-2020-01-02' of 
> git://anongit.freedesktop.org/drm/drm-misc into drm-next (2020-01-03 11:43:44 
> +1000)
>
> are available in the Git repository at:
>
>   git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2020-01-07
>
> for you to fetch changes up to 3cacb2086e41bbdf4a43e494d47d05db356992b9:
>
>   drm/mgag200: Add module parameter to pin all buffers at offset 0 
> (2020-01-07 11:53:19 +0100)
>
> 
> drm-misc-next for v5.6:
>
> UAPI Changes:
> - Allow overriding number of bootup penguins in fbcon using 
> fbcon=logo-count:n.
>
> Cross-subsystem Changes:
> - fbdev fixes for mmp, and make it work with CONFIG_COMPILE_TEST.
> - Use devm_platform_ioremap_resource in fbdev drivers.
> - Various small fbdev fixes.
>
> Core Changes:
> - Support scanline alignment for dumb buffers.
> - Add atomic_check() hook to bridge ops, to support bus format negotiation.
> - Add gem_create_object() to vram helpers.
>
> Driver Changes:
> - Rockchip: Add support for PX30.
> - Use generic fbdev code and dumb helpers in hisilicon/hibmc.
> - Add support for Leadtek LTK500HD1829 panel, and xinpeng XPP055C272.
> - Clock fixes for atmel-hlcdc.
> - Various smaller fixes to all drivers.
>
> 
> Andrew F. Davis (1):
>   omapfb/dss: remove unneeded conversions to bool
>
> Bartlomiej Zolnierkiewicz (3):
>   video: fbdev: mmp: remove duplicated MMP_DISP dependency
>   video: fbdev: mmp: add COMPILE_TEST support
>   video: fbdev: mmp: fix sparse warnings about using incorrect types
>
> Boris Brezillon (4):
>   drm/bridge: Add a drm_bridge_state object
>   drm/bridge: Patch atomic hooks to take a drm_bridge_state
>   drm/bridge: Add an ->atomic_check() hook
>   drm/bridge: Add the necessary bits to support bus format negotiation
>
> Christophe JAILLET (1):
>   pxa168fb: Fix the function used to release some memory in an error 
> handling path
>
> Claudiu Beznea (3):
>   drm: atmel-hlcdc: use double rate for pixel clock only if supported
>   drm: atmel-hlcdc: enable clock before configuring timing engine
>   Revert "drm: atmel-hlcdc: enable sys_clk during initalization."
>
> Colin Ian King (1):
>   fbdev: matrox: make array wtst_xlat static const, makes object smaller
>
> Geert Uytterhoeven (1):
>   drm/mipi_dbi: Fix off-by-one bugs in mipi_dbi_blank()
>
> Gustavo A. R. Silva (1):
>   video: fbdev: fsl-diu-fb: mark expected switch fall-throughs
>
> Heiko Stuebner (6):
>   dt-bindings: Add vendor prefix for Xinpeng Technology
>   dt-bindings: display: panel: Add binding document for Xinpeng XPP055C272
>   drm/panel: add panel driver for Xinpeng XPP055C272 panels
>   dt-bindings: Add vendor prefix for Leadtek Technology
>   dt-bindings: display: panel: Add binding document for Leadtek 
> LTK500HD1829
>   drm/panel: add panel driver for Leadtek LTK500HD1829
>
> Julia Lawall (1):
>   drm: bridge: dw-hdmi: constify copied structure
>
> Maarten Lankhorst (1):
>   Merge drm/drm-next into drm-misc-next
>
> Markus Elfring (2):
>   video: ocfb: Use devm_platform_ioremap_resource() in ocfb_probe()
>   video: pxafb: Use devm_platform_ioremap_resource() in pxafb_probe()
>
> Miquel Raynal (9):
>   dt-bindings: display: rockchip-lvds: Declare PX30 compatible
>   dt-bindings: display: rockchip-lvds: Document PX30 PHY
>   drm/rockchip: lvds: Fix indentation of a #define
>   drm/rockchip: lvds: Harmonize function names
>   drm/rockchip: lvds: Change platform data to hold helper_funcs pointer
>   drm/rockchip: lvds: Create an RK3288 specific probe function
>   drm/rockchip: lvds: improve error handling

[Intel-gfx] [PATCH 1/5] drm/i915: convert to using the drm_dbg_kms() macro.

2020-01-07 Thread Wambui Karuga

Convert the use of the DRM_DEBUG_KMS() logging macro to the new struct
drm_device based drm_dbg_kms() logging macro in i915/intel_pch.c.

Signed-off-by: Wambui Karuga 
---
 drivers/gpu/drm/i915/intel_pch.c | 46 +---
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pch.c b/drivers/gpu/drm/i915/intel_pch.c
index 43b68b5fc562..4ed60e1f01db 100644
--- a/drivers/gpu/drm/i915/intel_pch.c
+++ b/drivers/gpu/drm/i915/intel_pch.c
@@ -12,90 +12,91 @@ intel_pch_type(const struct drm_i915_private *dev_priv, 
unsigned short id)
 {
switch (id) {
case INTEL_PCH_IBX_DEVICE_ID_TYPE:
-   DRM_DEBUG_KMS("Found Ibex Peak PCH\n");
+   drm_dbg_kms(_priv->drm, "Found Ibex Peak PCH\n");
WARN_ON(!IS_GEN(dev_priv, 5));
return PCH_IBX;
case INTEL_PCH_CPT_DEVICE_ID_TYPE:
-   DRM_DEBUG_KMS("Found CougarPoint PCH\n");
+   drm_dbg_kms(_priv->drm, "Found CougarPoint PCH\n");
WARN_ON(!IS_GEN(dev_priv, 6) && !IS_IVYBRIDGE(dev_priv));
return PCH_CPT;
case INTEL_PCH_PPT_DEVICE_ID_TYPE:
-   DRM_DEBUG_KMS("Found PantherPoint PCH\n");
+   drm_dbg_kms(_priv->drm, "Found PantherPoint PCH\n");
WARN_ON(!IS_GEN(dev_priv, 6) && !IS_IVYBRIDGE(dev_priv));
/* PantherPoint is CPT compatible */
return PCH_CPT;
case INTEL_PCH_LPT_DEVICE_ID_TYPE:
-   DRM_DEBUG_KMS("Found LynxPoint PCH\n");
+   drm_dbg_kms(_priv->drm, "Found LynxPoint PCH\n");
WARN_ON(!IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));
WARN_ON(IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv));
return PCH_LPT;
case INTEL_PCH_LPT_LP_DEVICE_ID_TYPE:
-   DRM_DEBUG_KMS("Found LynxPoint LP PCH\n");
+   drm_dbg_kms(_priv->drm, "Found LynxPoint LP PCH\n");
WARN_ON(!IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));
WARN_ON(!IS_HSW_ULT(dev_priv) && !IS_BDW_ULT(dev_priv));
return PCH_LPT;
case INTEL_PCH_WPT_DEVICE_ID_TYPE:
-   DRM_DEBUG_KMS("Found WildcatPoint PCH\n");
+   drm_dbg_kms(_priv->drm, "Found WildcatPoint PCH\n");
WARN_ON(!IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));
WARN_ON(IS_HSW_ULT(dev_priv) || IS_BDW_ULT(dev_priv));
/* WildcatPoint is LPT compatible */
return PCH_LPT;
case INTEL_PCH_WPT_LP_DEVICE_ID_TYPE:
-   DRM_DEBUG_KMS("Found WildcatPoint LP PCH\n");
+   drm_dbg_kms(_priv->drm, "Found WildcatPoint LP PCH\n");
WARN_ON(!IS_HASWELL(dev_priv) && !IS_BROADWELL(dev_priv));
WARN_ON(!IS_HSW_ULT(dev_priv) && !IS_BDW_ULT(dev_priv));
/* WildcatPoint is LPT compatible */
return PCH_LPT;
case INTEL_PCH_SPT_DEVICE_ID_TYPE:
-   DRM_DEBUG_KMS("Found SunrisePoint PCH\n");
+   drm_dbg_kms(_priv->drm, "Found SunrisePoint PCH\n");
WARN_ON(!IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv));
return PCH_SPT;
case INTEL_PCH_SPT_LP_DEVICE_ID_TYPE:
-   DRM_DEBUG_KMS("Found SunrisePoint LP PCH\n");
+   drm_dbg_kms(_priv->drm, "Found SunrisePoint LP PCH\n");
WARN_ON(!IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv) &&
!IS_COFFEELAKE(dev_priv));
return PCH_SPT;
case INTEL_PCH_KBP_DEVICE_ID_TYPE:
-   DRM_DEBUG_KMS("Found Kaby Lake PCH (KBP)\n");
+   drm_dbg_kms(_priv->drm, "Found Kaby Lake PCH (KBP)\n");
WARN_ON(!IS_SKYLAKE(dev_priv) && !IS_KABYLAKE(dev_priv) &&
!IS_COFFEELAKE(dev_priv));
/* KBP is SPT compatible */
return PCH_SPT;
case INTEL_PCH_CNP_DEVICE_ID_TYPE:
-   DRM_DEBUG_KMS("Found Cannon Lake PCH (CNP)\n");
+   drm_dbg_kms(_priv->drm, "Found Cannon Lake PCH (CNP)\n");
WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));
return PCH_CNP;
case INTEL_PCH_CNP_LP_DEVICE_ID_TYPE:
-   DRM_DEBUG_KMS("Found Cannon Lake LP PCH (CNP-LP)\n");
+   drm_dbg_kms(_priv->drm,
+   "Found Cannon Lake LP PCH (CNP-LP)\n");
WARN_ON(!IS_CANNONLAKE(dev_priv) && !IS_COFFEELAKE(dev_priv));
return PCH_CNP;
case INTEL_PCH_CMP_DEVICE_ID_TYPE:
case INTEL_PCH_CMP2_DEVICE_ID_TYPE:
-   DRM_DEBUG_KMS("Found Comet Lake PCH (CMP)\n");
+   drm_dbg_kms(_priv->drm, "Found Comet Lake PCH (CMP)\n");
WARN_ON(!IS_COFFEELAKE(dev_priv));
/* CometPoint is CNP Compatible */
return PCH_CNP;
case

[Intel-gfx] [PATCH 4/5] drm/i915: convert to using new struct drm_device logging macros

2020-01-07 Thread Wambui Karuga

Replace the use of printk based debugging macros with the struct
drm_device based logging macros in i915/intel_sideband.c.

Signed-off-by: Wambui Karuga 
---
 drivers/gpu/drm/i915/intel_sideband.c | 29 ---
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_sideband.c 
b/drivers/gpu/drm/i915/intel_sideband.c
index e06b35b844a0..cbfb7171d62d 100644
--- a/drivers/gpu/drm/i915/intel_sideband.c
+++ b/drivers/gpu/drm/i915/intel_sideband.c
@@ -105,8 +105,8 @@ static int vlv_sideband_rw(struct drm_i915_private *i915,
if (intel_wait_for_register(uncore,
VLV_IOSF_DOORBELL_REQ, IOSF_SB_BUSY, 0,
5)) {
-   DRM_DEBUG_DRIVER("IOSF sideband idle wait (%s) timed out\n",
-is_read ? "read" : "write");
+   drm_dbg(>drm, "IOSF sideband idle wait (%s) timed out\n",
+   is_read ? "read" : "write");
return -EAGAIN;
}
 
@@ -129,8 +129,8 @@ static int vlv_sideband_rw(struct drm_i915_private *i915,
*val = intel_uncore_read_fw(uncore, VLV_IOSF_DATA);
err = 0;
} else {
-   DRM_DEBUG_DRIVER("IOSF sideband finish wait (%s) timed out\n",
-is_read ? "read" : "write");
+   drm_dbg(>drm, "IOSF sideband finish wait (%s) timed 
out\n",
+   is_read ? "read" : "write");
err = -ETIMEDOUT;
}
 
@@ -283,7 +283,8 @@ static int intel_sbi_rw(struct drm_i915_private *i915, u16 
reg,
if (intel_wait_for_register_fw(uncore,
   SBI_CTL_STAT, SBI_BUSY, 0,
   100)) {
-   DRM_ERROR("timeout waiting for SBI to become ready\n");
+   drm_err(>drm,
+   "timeout waiting for SBI to become ready\n");
return -EBUSY;
}
 
@@ -301,12 +302,13 @@ static int intel_sbi_rw(struct drm_i915_private *i915, 
u16 reg,
if (__intel_wait_for_register_fw(uncore,
 SBI_CTL_STAT, SBI_BUSY, 0,
 100, 100, )) {
-   DRM_ERROR("timeout waiting for SBI to complete read\n");
+   drm_err(>drm,
+   "timeout waiting for SBI to complete read\n");
return -ETIMEDOUT;
}
 
if (cmd & SBI_RESPONSE_FAIL) {
-   DRM_ERROR("error during SBI read of reg %x\n", reg);
+   drm_err(>drm, "error during SBI read of reg %x\n", reg);
return -ENXIO;
}
 
@@ -426,8 +428,9 @@ int sandybridge_pcode_read(struct drm_i915_private *i915, 
u32 mbox,
mutex_unlock(>sb_lock);
 
if (err) {
-   DRM_DEBUG_DRIVER("warning: pcode (read from mbox %x) mailbox 
access failed for %ps: %d\n",
-mbox, __builtin_return_address(0), err);
+   drm_dbg(>drm,
+   "warning: pcode (read from mbox %x) mailbox access 
failed for %ps: %d\n",
+   mbox, __builtin_return_address(0), err);
}
 
return err;
@@ -447,8 +450,9 @@ int sandybridge_pcode_write_timeout(struct drm_i915_private 
*i915,
mutex_unlock(>sb_lock);
 
if (err) {
-   DRM_DEBUG_DRIVER("warning: pcode (write of 0x%08x to mbox %x) 
mailbox access failed for %ps: %d\n",
-val, mbox, __builtin_return_address(0), err);
+   drm_dbg(>drm,
+   "warning: pcode (write of 0x%08x to mbox %x) mailbox 
access failed for %ps: %d\n",
+   val, mbox, __builtin_return_address(0), err);
}
 
return err;
@@ -519,7 +523,8 @@ int skl_pcode_request(struct drm_i915_private *i915, u32 
mbox, u32 request,
 * requests, and for any quirks of the PCODE firmware that delays
 * the request completion.
 */
-   DRM_DEBUG_KMS("PCODE timeout, retrying with preemption disabled\n");
+   drm_dbg_kms(>drm,
+   "PCODE timeout, retrying with preemption disabled\n");
WARN_ON_ONCE(timeout_base_ms > 3);
preempt_disable();
ret = wait_for_atomic(COND, 50);
-- 
2.24.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 2/5] drm/i915: use new struct drm_device logging macros.

2020-01-07 Thread Wambui Karuga

This converts various instances of the struct device and printk based
logging macros with the new struct drm_device based logging macros in
i915/intel_pm.c

Signed-off-by: Wambui Karuga 
---
 drivers/gpu/drm/i915/intel_pm.c | 351 ++--
 1 file changed, 194 insertions(+), 157 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 148ac455dfa7..bd2d30ecc030 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -199,8 +199,8 @@ static void ilk_get_mem_freq(struct drm_i915_private 
*dev_priv)
dev_priv->mem_freq = 1600;
break;
default:
-   DRM_DEBUG_DRIVER("unknown memory frequency 0x%02x\n",
-ddrpll & 0xff);
+   drm_dbg(_priv->drm, "unknown memory frequency 0x%02x\n",
+   ddrpll & 0xff);
dev_priv->mem_freq = 0;
break;
}
@@ -228,8 +228,8 @@ static void ilk_get_mem_freq(struct drm_i915_private 
*dev_priv)
dev_priv->fsb_freq = 6400;
break;
default:
-   DRM_DEBUG_DRIVER("unknown fsb frequency 0x%04x\n",
-csipll & 0x3ff);
+   drm_dbg(_priv->drm, "unknown fsb frequency 0x%04x\n",
+   csipll & 0x3ff);
dev_priv->fsb_freq = 0;
break;
}
@@ -314,7 +314,8 @@ static void chv_set_memory_dvfs(struct drm_i915_private 
*dev_priv, bool enable)
 
if (wait_for((vlv_punit_read(dev_priv, PUNIT_REG_DDR_SETUP2) &
  FORCE_DDR_FREQ_REQ_ACK) == 0, 3))
-   DRM_ERROR("timed out waiting for Punit DDR DVFS request\n");
+   drm_err(_priv->drm,
+   "timed out waiting for Punit DDR DVFS request\n");
 
vlv_punit_put(dev_priv);
 }
@@ -383,9 +384,9 @@ static bool _intel_set_memory_cxsr(struct drm_i915_private 
*dev_priv, bool enabl
 
trace_intel_memory_cxsr(dev_priv, was_enabled, enable);
 
-   DRM_DEBUG_KMS("memory self-refresh is %s (was %s)\n",
- enableddisabled(enable),
- enableddisabled(was_enabled));
+   drm_dbg_kms(_priv->drm, "memory self-refresh is %s (was %s)\n",
+   enableddisabled(enable),
+   enableddisabled(was_enabled));
 
return was_enabled;
 }
@@ -510,8 +511,8 @@ static int i9xx_get_fifo_size(struct drm_i915_private 
*dev_priv,
if (i9xx_plane == PLANE_B)
size = ((dsparb >> DSPARB_CSTART_SHIFT) & 0x7f) - size;
 
-   DRM_DEBUG_KMS("FIFO size - (0x%08x) %c: %d\n",
- dsparb, plane_name(i9xx_plane), size);
+   drm_dbg_kms(_priv->drm, "FIFO size - (0x%08x) %c: %d\n",
+   dsparb, plane_name(i9xx_plane), size);
 
return size;
 }
@@ -527,8 +528,8 @@ static int i830_get_fifo_size(struct drm_i915_private 
*dev_priv,
size = ((dsparb >> DSPARB_BEND_SHIFT) & 0x1ff) - size;
size >>= 1; /* Convert to cachelines */
 
-   DRM_DEBUG_KMS("FIFO size - (0x%08x) %c: %d\n",
- dsparb, plane_name(i9xx_plane), size);
+   drm_dbg_kms(_priv->drm, "FIFO size - (0x%08x) %c: %d\n",
+   dsparb, plane_name(i9xx_plane), size);
 
return size;
 }
@@ -542,8 +543,8 @@ static int i845_get_fifo_size(struct drm_i915_private 
*dev_priv,
size = dsparb & 0x7f;
size >>= 2; /* Convert to cachelines */
 
-   DRM_DEBUG_KMS("FIFO size - (0x%08x) %c: %d\n",
- dsparb, plane_name(i9xx_plane), size);
+   drm_dbg_kms(_priv->drm, "FIFO size - (0x%08x) %c: %d\n",
+   dsparb, plane_name(i9xx_plane), size);
 
return size;
 }
@@ -870,7 +871,8 @@ static void pnv_update_wm(struct intel_crtc *unused_crtc)
 dev_priv->fsb_freq,
 dev_priv->mem_freq);
if (!latency) {
-   DRM_DEBUG_KMS("Unknown FSB/MEM found, disable CxSR\n");
+   drm_dbg_kms(_priv->drm,
+   "Unknown FSB/MEM found, disable CxSR\n");
intel_set_memory_cxsr(dev_priv, false);
return;
}
@@ -892,7 +894,7 @@ static void pnv_update_wm(struct intel_crtc *unused_crtc)
reg &= ~DSPFW_SR_MASK;
reg |= FW_WM(wm, SR);
I915_WRITE(DSPFW1, reg);
-   DRM_DEBUG_KMS("DSPFW1 register is %x\n", reg);
+   drm_dbg_kms(_priv->drm, "DSPFW1 register is %x\n", reg);
 
/* cursor SR */
wm = intel_calculate_wm(clock, _cursor_wm,
@@ -920,7 +922,7 @@ static void pnv_update_wm(struct intel_crtc *unused_crtc)
reg &= ~DSPFW_HPLL_CURSOR_MASK;
reg |= FW_WM(wm, HPLL_CURSOR);
I915_WRITE(DSPFW3, reg);
-   DRM_DEBUG_KMS("DSPFW3 register is

[Intel-gfx] [PATCH 0/5] drm/i915: conversion to new drm logging macros.

2020-01-07 Thread Wambui Karuga

This series begins the conversion to using the new struct drm_device
based logging macros in drm/i915.

Wambui Karuga (5):
  drm/i915: convert to using the drm_dbg_kms() macro.
  drm/i915: use new struct drm_device logging macros.
  drm/i915: use new struct drm_device based logging macros.
  drm/i915: convert to using new struct drm_device logging macros
  drm/i915: use new struct drm_device based macros.

 drivers/gpu/drm/i915/intel_pch.c |  46 +--
 drivers/gpu/drm/i915/intel_pm.c  | 351 +--
 drivers/gpu/drm/i915/intel_region_lmem.c |  10 +-
 drivers/gpu/drm/i915/intel_sideband.c|  29 +-
 drivers/gpu/drm/i915/intel_uncore.c  |  25 +-
 5 files changed, 254 insertions(+), 207 deletions(-)

-- 
2.24.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 5/5] drm/i915: use new struct drm_device based macros.

2020-01-07 Thread Wambui Karuga

Convert to the use of new struct drm_device based logging macros to
replace the use of the printk based macros in i915/intel_uncore.c

Signed-off-by: Wambui Karuga 
---
 drivers/gpu/drm/i915/intel_uncore.c | 25 +
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_uncore.c 
b/drivers/gpu/drm/i915/intel_uncore.c
index 94a97bf8c021..5f2cf6f43b8b 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -359,7 +359,8 @@ static void __gen6_gt_wait_for_fifo(struct intel_uncore 
*uncore)
if (wait_for_atomic((n = fifo_free_entries(uncore)) >
GT_FIFO_NUM_RESERVED_ENTRIES,
GT_FIFO_TIMEOUT_MS)) {
-   DRM_DEBUG("GT_FIFO timeout, entries: %u\n", n);
+   drm_dbg(>i915->drm,
+   "GT_FIFO timeout, entries: %u\n", n);
return;
}
}
@@ -432,7 +433,7 @@ intel_uncore_forcewake_reset(struct intel_uncore *uncore)
break;
 
if (--retry_count == 0) {
-   DRM_ERROR("Timed out waiting for forcewake timers to 
finish\n");
+   drm_err(>i915->drm, "Timed out waiting for 
forcewake timers to finish\n");
break;
}
 
@@ -490,7 +491,7 @@ gen6_check_for_fifo_debug(struct intel_uncore *uncore)
fifodbg = __raw_uncore_read32(uncore, GTFIFODBG);
 
if (unlikely(fifodbg)) {
-   DRM_DEBUG_DRIVER("GTFIFODBG = 0x08%x\n", fifodbg);
+   drm_dbg(>i915->drm, "GTFIFODBG = 0x08%x\n", fifodbg);
__raw_uncore_write32(uncore, GTFIFODBG, fifodbg);
}
 
@@ -562,7 +563,7 @@ void intel_uncore_resume_early(struct intel_uncore *uncore)
unsigned int restore_forcewake;
 
if (intel_uncore_unclaimed_mmio(uncore))
-   DRM_DEBUG("unclaimed mmio detected on resume, clearing\n");
+   drm_dbg(>i915->drm, "unclaimed mmio detected on resume, 
clearing\n");
 
if (!intel_uncore_has_forcewake(uncore))
return;
@@ -1595,8 +1596,8 @@ static int intel_uncore_fw_domains_init(struct 
intel_uncore *uncore)
spin_unlock_irq(>lock);
 
if (!(ecobus & FORCEWAKE_MT_ENABLE)) {
-   DRM_INFO("No MT forcewake available on Ivybridge, this 
can result in issues\n");
-   DRM_INFO("when using vblank-synced partial screen 
updates.\n");
+   drm_info(>drm, "No MT forcewake available on 
Ivybridge, this can result in issues\n");
+   drm_info(>drm, "when using vblank-synced partial 
screen updates.\n");
fw_domain_fini(uncore, FW_DOMAIN_ID_RENDER);
fw_domain_init(uncore, FW_DOMAIN_ID_RENDER,
   FORCEWAKE, FORCEWAKE_ACK);
@@ -1683,8 +1684,7 @@ static int uncore_mmio_setup(struct intel_uncore *uncore)
mmio_size = 2 * 1024 * 1024;
uncore->regs = pci_iomap(pdev, mmio_bar, mmio_size);
if (uncore->regs == NULL) {
-   DRM_ERROR("failed to map registers\n");
-
+   drm_err(>drm, "failed to map registers\n");
return -EIO;
}
 
@@ -1807,7 +1807,7 @@ int intel_uncore_init_mmio(struct intel_uncore *uncore)
 
/* clear out unclaimed reg detection bit */
if (intel_uncore_unclaimed_mmio(uncore))
-   DRM_DEBUG("unclaimed mmio detected on uncore init, clearing\n");
+   drm_dbg(>drm, "unclaimed mmio detected on uncore init, 
clearing\n");
 
return 0;
 
@@ -2072,9 +2072,10 @@ intel_uncore_arm_unclaimed_mmio_detection(struct 
intel_uncore *uncore)
 
if (unlikely(check_for_unclaimed_mmio(uncore))) {
if (!i915_modparams.mmio_debug) {
-   DRM_DEBUG("Unclaimed register detected, "
- "enabling oneshot unclaimed register 
reporting. "
- "Please use i915.mmio_debug=N for more 
information.\n");
+   drm_dbg(>i915->drm,
+   "Unclaimed register detected, "
+   "enabling oneshot unclaimed register reporting. 
"
+   "Please use i915.mmio_debug=N for more 
information.\n");
i915_modparams.mmio_debug++;
}
uncore->debug->unclaimed_mmio_check--;
-- 
2.24.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 3/5] drm/i915: use new struct drm_device based logging macros.

2020-01-07 Thread Wambui Karuga

Replace instances of printk based logging macros with the new
struct drm_device logging macros in i915/intel_region_lmem.c.

Signed-off-by: Wambui Karuga 
---
 drivers/gpu/drm/i915/intel_region_lmem.c | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_region_lmem.c 
b/drivers/gpu/drm/i915/intel_region_lmem.c
index e6a6b571dad4..14b59b899c9b 100644
--- a/drivers/gpu/drm/i915/intel_region_lmem.c
+++ b/drivers/gpu/drm/i915/intel_region_lmem.c
@@ -125,10 +125,12 @@ intel_setup_fake_lmem(struct drm_i915_private *i915)
 io_start,
 _region_lmem_ops);
if (!IS_ERR(mem)) {
-   DRM_INFO("Intel graphics fake LMEM: %pR\n", >region);
-   DRM_INFO("Intel graphics fake LMEM IO start: %llx\n",
-(u64)mem->io_start);
-   DRM_INFO("Intel graphics fake LMEM size: %llx\n",
+   drm_info(>drm, "Intel graphics fake LMEM: %pR\n",
+>region);
+   drm_info(>drm,
+"Intel graphics fake LMEM IO start: %llx\n",
+   (u64)mem->io_start);
+   drm_info(>drm, "Intel graphics fake LMEM size: %llx\n",
 (u64)resource_size(>region));
}
 
-- 
2.24.1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915/gt: Take responsibility for engine->release as the last step

2020-01-07 Thread Mika Kuoppala

Chris Wilson  writes:

> In order to avoid a double cleanup on error, take ownership of
> engine->release past the point of no [error] return.
>
> Reported-by: Mika Kuoppala 
> Fixes: e26b6d434147 ("drm/i915/gt: Pull GT initialisation under 
> intel_gt_init()")
> Signed-off-by: Chris Wilson 
> Cc: Mika Kuoppala 

fwiw, in the context of avoiding refcount underflow in error path,
Tested-by: Mika Kuoppala 

Reviewed-by: Mika Kuoppala 

> ---
>  drivers/gpu/drm/i915/gt/intel_lrc.c | 4 +++-
>  drivers/gpu/drm/i915/gt/intel_ring_submission.c | 5 +++--
>  2 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c 
> b/drivers/gpu/drm/i915/gt/intel_lrc.c
> index f6174e597dd3..5f171e43f79c 100644
> --- a/drivers/gpu/drm/i915/gt/intel_lrc.c
> +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
> @@ -3925,7 +3925,6 @@ logical_ring_default_vfuncs(struct intel_engine_cs 
> *engine)
>  {
>   /* Default vfuncs which can be overriden by each engine. */
>  
> - engine->release = execlists_release;
>   engine->resume = execlists_resume;
>  
>   engine->cops = _context_ops;
> @@ -4040,6 +4039,9 @@ int intel_execlists_submission_setup(struct 
> intel_engine_cs *engine)
>  
>   reset_csb_pointers(engine);
>  
> + /* Finally, take ownership and responsibility for cleanup! */
> + engine->release = execlists_release;
> +
>   return 0;
>  }
>  
> diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c 
> b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
> index 2e1478a48a4b..0525d67c6fc3 100644
> --- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
> +++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
> @@ -1840,8 +1840,6 @@ static void setup_common(struct intel_engine_cs *engine)
>  
>   setup_irq(engine);
>  
> - engine->release = ring_release;
> -
>   engine->resume = xcs_resume;
>   engine->reset.prepare = reset_prepare;
>   engine->reset.rewind = reset_rewind;
> @@ -2007,6 +2005,9 @@ int intel_ring_submission_setup(struct intel_engine_cs 
> *engine)
>  
>   GEM_BUG_ON(timeline->hwsp_ggtt != engine->status_page.vma);
>  
> + /* Finally, take ownership and responsibility for cleanup! */
> + engine->release = ring_release;
> +
>   return 0;
>  
>  err_ring:
> -- 
> 2.25.0.rc1
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/display: Use external dependency loop for port sync

2020-01-07 Thread Souza, Jose

On Tue, 2020-01-07 at 06:03 +, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915/display: Use external dependency loop for port sync
> URL   : https://patchwork.freedesktop.org/series/71660/
> State : failure
> 
> == Summary ==
> 
> CI Bug Log - changes from CI_DRM_7688_full -> Patchwork_16005_full
> 
> 
> Summary
> ---
> 
>   **FAILURE**
> 
>   Serious unknown changes coming with Patchwork_16005_full absolutely
> need to be
>   verified manually.
>   
>   If you think the reported changes have nothing to do with the
> changes
>   introduced in Patchwork_16005_full, please notify your bug team to
> allow them
>   to document this new failure mode, which will reduce false
> positives in CI.
> 
>   
> 
> Possible new issues
> ---
> 
>   Here are the unknown changes that may have been introduced in
> Patchwork_16005_full:
> 
> ### IGT changes ###
> 
>  Possible regressions 
> 
>   * igt@gem_exec_create@forked:
> - shard-glk:  [PASS][1] -> [TIMEOUT][2] +1 similar issue
>[1]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7688/shard-glk7/igt@gem_exec_cre...@forked.html
>[2]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16005/shard-glk3/igt@gem_exec_cre...@forked.html
> 

Not related to the changes in this patch so pushed to dinq, thanks for
the review Manasi.


>   
> New tests
> -
> 
>   New tests have been introduced between CI_DRM_7688_full and
> Patchwork_16005_full:
> 
> ### New Piglit tests (39) ###
> 
>   * shaders@glsl-fs-textureenvcolor-statechange:
> - Statuses : 1 fail(s)
> - Exec time: [0.09] s
> 
>   * spec@!opengl 1.1@depthstencil-default_fb-blit samples=4:
> - Statuses : 1 fail(s)
> - Exec time: [0.13] s
> 
>   * spec@!opengl 2.0@gl-2.0-shader-materials:
> - Statuses : 1 fail(s)
> - Exec time: [0.09] s
> 
>   * spec@!opengl 2.0@vertex-program-two-side enabled back front2
> back2:
> - Statuses : 1 fail(s)
> - Exec time: [0.13] s
> 
>   * spec@arb_copy_image@arb_copy_image-targets gl_texture_1d 32 1 1
> gl_texture_rectangle 32 32 1 11 0 0 5 13 0 14 1 1:
> - Statuses : 1 fail(s)
> - Exec time: [0.12] s
> 
>   * spec@arb_depth_texture@fbo-clear-formats:
> - Statuses : 1 fail(s)
> - Exec time: [0.17] s
> 
>   * spec@arb_framebuffer_object@framebuffer-blit-levels draw rgba:
> - Statuses : 1 fail(s)
> - Exec time: [0.11] s
> 
>   * spec@arb_gpu_shader_fp64@execution@
> built-in-functions@gs-equal-dvec2-dvec2:
> - Statuses : 1 fail(s)
> - Exec time: [0.10] s
> 
>   * spec@arb_gpu_shader_fp64@execution@
> built-in-functions@vs-notequal-dvec2-dvec2:
> - Statuses : 1 fail(s)
> - Exec time: [0.12] s
> 
>   * spec@arb_texture_barrier@arb_texture_barrier-blending-in-shader
> 32 1 8 64 2:
> - Statuses : 1 fail(s)
> - Exec time: [0.12] s
> 
>   * spec@arb_texture_cube_map_array@texturesize@fs-texturesize-
> samplercubearray:
> - Statuses : 1 fail(s)
> - Exec time: [0.08] s
> 
>   * spec@arb_texture_rg@fbo-rg-gl_rg:
> - Statuses : 1 fail(s)
> - Exec time: [0.12] s
> 
>   * spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-double_dmat
> 2x3-position-uint_uint:
> - Statuses : 1 fail(s)
> - Exec time: [5.89] s
> 
>   * spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-double_dmat
> 2x4-float_mat2x4-position:
> - Statuses : 1 fail(s)
> - Exec time: [5.98] s
> 
>   * spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-int_ivec4-
> position-double_dvec2:
> - Statuses : 1 fail(s)
> - Exec time: [5.97] s
> 
>   * spec@arb_vertex_attrib_64bit@execution@
> vs_in@vs-input-position-float_mat2-double_dmat2:
> - Statuses : 1 fail(s)
> - Exec time: [5.91] s
> 
>   * spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-ushort_uvec
> 3-position-double_dmat2x3:
> - Statuses : 1 fail(s)
> - Exec time: [5.96] s
> 
>   * spec@ext_framebuffer_multisample@interpolation 2 centroid-deriv-
> disabled:
> - Statuses : 1 fail(s)
> - Exec time: [0.10] s
> 
>   * spec@ext_framebuffer_multisample@polygon-smooth 8:
> - Statuses : 1 fail(s)
> - Exec time: [0.14] s
> 
>   * spec@ext_texture_compression_s3tc@s3tc-targeted:
> - Statuses : 1 fail(s)
> - Exec time: [0.09] s
> 
>   * spec@glsl-1.10@execution@interpolation@interpolation-none-
> gl_backcolor-flat-fixed:
> - Statuses : 1 fail(s)
> - Exec time: [0.11] s
> 
>   * spec@glsl-1.10@execution@interpolation@interpolation-none-
> gl_frontsecondarycolor-smooth-vertex:
> - Statuses : 1 fail(s)
> - Exec time: [0.11] s
> 
>   * spec@glsl-1.30@execution@interpolation@interpolation-flat-
> gl_backcolor-flat-vertex:
> - Statuses : 1 fail(s)
> - Exec time: [0.12] s
> 
>   * spec@glsl-1.30@execution@interpolation@interpolation-flat-
> gl_backsecondarycolor-smooth-fixed:
> - Statuses : 1 fail(s)
> - Exec time: [0.12] s
> 
>   *

[Intel-gfx] [PATCH] drm/i915/gt: Drop a defunct timeline assertion

2020-01-07 Thread Chris Wilson

intel_timeline_enter() has been decoupled from intel_timeline_pin() and
both enter/exit & pin/unpin are allowed [read expected] to run
concurrently with one another. The assertion that they had better not is
stale.

Closes: https://gitlab.freedesktop.org/drm/intel/issues/940
Signed-off-by: Chris Wilson 
---
 drivers/gpu/drm/i915/gt/intel_timeline.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_timeline.c 
b/drivers/gpu/drm/i915/gt/intel_timeline.c
index ee5dc4fbdeb9..87716529cd2f 100644
--- a/drivers/gpu/drm/i915/gt/intel_timeline.c
+++ b/drivers/gpu/drm/i915/gt/intel_timeline.c
@@ -348,7 +348,6 @@ void intel_timeline_enter(struct intel_timeline *tl)
 * use atomic to manipulate tl->active_count.
 */
lockdep_assert_held(>mutex);
-   GEM_BUG_ON(!atomic_read(>pin_count));
 
if (atomic_add_unless(>active_count, 1, 0))
return;
-- 
2.25.0.rc1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH] drm/i915/gt: Take responsibility for engine->release as the last step

2020-01-07 Thread Chris Wilson

In order to avoid a double cleanup on error, take ownership of
engine->release past the point of no [error] return.

Reported-by: Mika Kuoppala 
Fixes: e26b6d434147 ("drm/i915/gt: Pull GT initialisation under 
intel_gt_init()")
Signed-off-by: Chris Wilson 
Cc: Mika Kuoppala 
---
 drivers/gpu/drm/i915/gt/intel_lrc.c | 4 +++-
 drivers/gpu/drm/i915/gt/intel_ring_submission.c | 5 +++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c 
b/drivers/gpu/drm/i915/gt/intel_lrc.c
index f6174e597dd3..5f171e43f79c 100644
--- a/drivers/gpu/drm/i915/gt/intel_lrc.c
+++ b/drivers/gpu/drm/i915/gt/intel_lrc.c
@@ -3925,7 +3925,6 @@ logical_ring_default_vfuncs(struct intel_engine_cs 
*engine)
 {
/* Default vfuncs which can be overriden by each engine. */
 
-   engine->release = execlists_release;
engine->resume = execlists_resume;
 
engine->cops = _context_ops;
@@ -4040,6 +4039,9 @@ int intel_execlists_submission_setup(struct 
intel_engine_cs *engine)
 
reset_csb_pointers(engine);
 
+   /* Finally, take ownership and responsibility for cleanup! */
+   engine->release = execlists_release;
+
return 0;
 }
 
diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c 
b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
index 2e1478a48a4b..0525d67c6fc3 100644
--- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c
+++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c
@@ -1840,8 +1840,6 @@ static void setup_common(struct intel_engine_cs *engine)
 
setup_irq(engine);
 
-   engine->release = ring_release;
-
engine->resume = xcs_resume;
engine->reset.prepare = reset_prepare;
engine->reset.rewind = reset_rewind;
@@ -2007,6 +2005,9 @@ int intel_ring_submission_setup(struct intel_engine_cs 
*engine)
 
GEM_BUG_ON(timeline->hwsp_ggtt != engine->status_page.vma);
 
+   /* Finally, take ownership and responsibility for cleanup! */
+   engine->release = ring_release;
+
return 0;
 
 err_ring:
-- 
2.25.0.rc1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH v2] drm/i915: remove ICP_PP_CONTROL

2020-01-07 Thread Ville Syrjälä

On Thu, Jan 02, 2020 at 03:44:38PM -0800, Lucas De Marchi wrote:
> Today I saw this register and had a vague memory of having already
> removed it in the past.
> It seems this patch has never been reviewed/applied.
> 
> Ping

Reviewed-by: Ville Syrjälä 

> 
> Lucas De Marchi
> 
> On Fri, Mar 8, 2019 at 3:23 PM Lucas De Marchi  
> wrote:
> >
> > This register was placed in the middle of the PP_STATUS definition
> > instead of together with the PP_CONTROL where it should. Since it's not
> > used and there are no current plans to use it, just remove the
> > definition.
> >
> > v2: remove the define rather than moving it.
> >
> > Signed-off-by: Lucas De Marchi 
> > ---
> >  drivers/gpu/drm/i915/i915_reg.h | 11 ---
> >  1 file changed, 11 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/i915/i915_reg.h 
> > b/drivers/gpu/drm/i915/i915_reg.h
> > index c0cd7a836799..4a855befa838 100644
> > --- a/drivers/gpu/drm/i915/i915_reg.h
> > +++ b/drivers/gpu/drm/i915/i915_reg.h
> > @@ -4692,17 +4692,6 @@ enum {
> >  #define _PP_STATUS 0x61200
> >  #define PP_STATUS(pps_idx) _MMIO_PPS(pps_idx, _PP_STATUS)
> >  #define   PP_ON(1 << 31)
> > -
> > -#define _PP_CONTROL_1  0xc7204
> > -#define _PP_CONTROL_2  0xc7304
> > -#define ICP_PP_CONTROL(x)  _MMIO(((x) == 1) ? _PP_CONTROL_1 : \
> > - _PP_CONTROL_2)
> > -#define  POWER_CYCLE_DELAY_MASK(0x1f << 4)
> > -#define  POWER_CYCLE_DELAY_SHIFT   4
> > -#define  VDD_OVERRIDE_FORCE(1 << 3)
> > -#define  BACKLIGHT_ENABLE  (1 << 2)
> > -#define  PWR_DOWN_ON_RESET (1 << 1)
> > -#define  PWR_STATE_TARGET  (1 << 0)
> >  /*
> >   * Indicates that all dependencies of the panel are on:
> >   *
> > --
> > 2.20.1
> >
> > ___
> > Intel-gfx mailing list
> > Intel-gfx@lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> 
> 
> -- 
> Lucas De Marchi

-- 
Ville Syrjälä
Intel
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915/gtt: split up i915_gem_gtt

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915/gtt: split up i915_gem_gtt
URL   : https://patchwork.freedesktop.org/series/71678/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_7690_full -> Patchwork_16010_full


Summary
---

  **FAILURE**

  Serious unknown changes coming with Patchwork_16010_full absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_16010_full, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  

Possible new issues
---

  Here are the unknown changes that may have been introduced in 
Patchwork_16010_full:

### IGT changes ###

 Possible regressions 

  * igt@gem_busy@close-race:
- shard-hsw:  NOTRUN -> [TIMEOUT][1]
   [1]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16010/shard-hsw7/igt@gem_b...@close-race.html

  * igt@i915_hangman@error-state-capture-vcs1:
- shard-tglb: [PASS][2] -> [INCOMPLETE][3]
   [2]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-tglb3/igt@i915_hang...@error-state-capture-vcs1.html
   [3]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16010/shard-tglb4/igt@i915_hang...@error-state-capture-vcs1.html

  
Known issues


  Here are the changes found in Patchwork_16010_full that come from known 
issues:

### IGT changes ###

 Issues hit 

  * igt@gem_ctx_isolation@rcs0-s3:
- shard-iclb: [PASS][4] -> [DMESG-WARN][5] ([fdo#111764])
   [4]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-iclb5/igt@gem_ctx_isolat...@rcs0-s3.html
   [5]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16010/shard-iclb4/igt@gem_ctx_isolat...@rcs0-s3.html

  * igt@gem_ctx_isolation@vecs0-s3:
- shard-skl:  [PASS][6] -> [INCOMPLETE][7] ([i915#69])
   [6]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-skl6/igt@gem_ctx_isolat...@vecs0-s3.html
   [7]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16010/shard-skl6/igt@gem_ctx_isolat...@vecs0-s3.html

  * igt@gem_ctx_persistence@vcs1-queued:
- shard-iclb: [PASS][8] -> [SKIP][9] ([fdo#109276] / [fdo#112080]) 
+2 similar issues
   [8]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-iclb4/igt@gem_ctx_persiste...@vcs1-queued.html
   [9]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16010/shard-iclb5/igt@gem_ctx_persiste...@vcs1-queued.html

  * igt@gem_ctx_shared@q-smoketest-bsd1:
- shard-tglb: [PASS][10] -> [INCOMPLETE][11] ([fdo#111735])
   [10]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-tglb8/igt@gem_ctx_sha...@q-smoketest-bsd1.html
   [11]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16010/shard-tglb6/igt@gem_ctx_sha...@q-smoketest-bsd1.html

  * igt@gem_exec_async@concurrent-writes-bsd:
- shard-iclb: [PASS][12] -> [SKIP][13] ([fdo#112146]) +3 similar 
issues
   [12]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-iclb6/igt@gem_exec_as...@concurrent-writes-bsd.html
   [13]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16010/shard-iclb1/igt@gem_exec_as...@concurrent-writes-bsd.html

  * igt@gem_exec_parallel@vcs1-fds:
- shard-iclb: [PASS][14] -> [SKIP][15] ([fdo#112080]) +13 similar 
issues
   [14]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-iclb2/igt@gem_exec_paral...@vcs1-fds.html
   [15]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16010/shard-iclb8/igt@gem_exec_paral...@vcs1-fds.html

  * igt@gem_exec_schedule@pi-userfault-bsd:
- shard-iclb: [PASS][16] -> [SKIP][17] ([i915#677])
   [16]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-iclb5/igt@gem_exec_sched...@pi-userfault-bsd.html
   [17]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16010/shard-iclb4/igt@gem_exec_sched...@pi-userfault-bsd.html

  * igt@gem_exec_schedule@preempt-queue-chain-render:
- shard-tglb: [PASS][18] -> [INCOMPLETE][19] ([fdo#111606] / 
[fdo#111677] / [i915#472])
   [18]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-tglb7/igt@gem_exec_sched...@preempt-queue-chain-render.html
   [19]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16010/shard-tglb6/igt@gem_exec_sched...@preempt-queue-chain-render.html

  * igt@gem_sync@basic-store-each:
- shard-tglb: [PASS][20] -> [INCOMPLETE][21] ([i915#435] / 
[i915#472]) +1 similar issue
   [20]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-tglb2/igt@gem_s...@basic-store-each.html
   [21]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16010/shard-tglb7/igt@gem_s...@basic-store-each.html

  * igt@gem_workarounds@suspend-resume-context:
- shard-apl:  [PASS][22] -> [DMESG-WARN][23] ([i915#180]) +1 
similar issue
   [22]:

Re: [Intel-gfx] [PATCH] drm/i915: fix an error code in intel_modeset_all_tiles()

2020-01-07 Thread Chris Wilson

Quoting Souza, Jose (2020-01-07 14:01:40)
> On Tue, 2020-01-07 at 16:03 +0300, Dan Carpenter wrote:
> > There is a cut and paste bug so we return the wrong error code.
> > 
> > Fixes: a603f5bd1691 ("drm/i915/dp: Make sure all tiled connectors get
> > added to the state with full modeset")
> 
> Reviewed-by: José Roberto de Souza 
> 
> > Signed-off-by: Dan Carpenter 

Pushed. Thanks for the patch,
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: fix an error code in intel_modeset_all_tiles()

2020-01-07 Thread Souza, Jose

On Tue, 2020-01-07 at 16:03 +0300, Dan Carpenter wrote:
> There is a cut and paste bug so we return the wrong error code.
> 
> Fixes: a603f5bd1691 ("drm/i915/dp: Make sure all tiled connectors get
> added to the state with full modeset")

Reviewed-by: José Roberto de Souza 

> Signed-off-by: Dan Carpenter 
> ---
>  drivers/gpu/drm/i915/display/intel_display.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c
> b/drivers/gpu/drm/i915/display/intel_display.c
> index da5266e76738..a96bee699a5e 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -14424,7 +14424,7 @@ intel_modeset_all_tiles(struct
> intel_atomic_state *state, int tile_grp_id)
>   crtc_state = drm_atomic_get_crtc_state(>base,
>  conn_state-
> >crtc);
>   if (IS_ERR(crtc_state)) {
> - ret = PTR_ERR(conn_state);
> + ret = PTR_ERR(crtc_state);
>   break;
>   }
>   crtc_state->mode_changed = true;
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH -next] drm/i915: Add missing include file

2020-01-07 Thread Chris Wilson

Quoting YueHaibing (2020-01-07 13:50:14)
> Fix build error:
> ./drivers/gpu/drm/i915/selftests/i915_random.h: In function 
> i915_prandom_u32_max_state:
> ./drivers/gpu/drm/i915/selftests/i915_random.h:48:23: error:
>  implicit declaration of function mul_u32_u32; did you mean mul_u64_u32_div? 
> [-Werror=implicit-function-declaration]
>   return upper_32_bits(mul_u32_u32(prandom_u32_state(state), ep_ro));
> 
> Reported-by: Hulk Robot 
> Fixes: 7ce5b6850b47 ("drm/i915/selftests: Use mul_u32_u32() for 32b x 32b -> 
> 64b result")
> Signed-off-by: YueHaibing 
Reviewed-by: Chris Wilson 
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH -next] drm/i915: Add missing include file

2020-01-07 Thread Chris Wilson

Quoting YueHaibing (2020-01-07 13:50:14)
> Fix build error:
> ./drivers/gpu/drm/i915/selftests/i915_random.h: In function 
> i915_prandom_u32_max_state:
> ./drivers/gpu/drm/i915/selftests/i915_random.h:48:23: error:
>  implicit declaration of function mul_u32_u32; did you mean mul_u64_u32_div? 
> [-Werror=implicit-function-declaration]
>   return upper_32_bits(mul_u32_u32(prandom_u32_state(state), ep_ro));
> 
> Reported-by: Hulk Robot 
> Fixes: 7ce5b6850b47 ("drm/i915/selftests: Use mul_u32_u32() for 32b x 32b -> 
> 64b result")

While technically true, that doesn't explain why it only just started
appearing on -next.
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915/gtt: split up i915_gem_gtt

2020-01-07 Thread kbuild test robot

Hi Matthew,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on drm-intel/for-linux-next]
[also build test WARNING on drm-tip/drm-tip]
[cannot apply to v5.5-rc5 next-20200106]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]

url:
https://github.com/0day-ci/linux/commits/Matthew-Auld/drm-i915-gtt-split-up-i915_gem_gtt/20200107-074805
base:   git://anongit.freedesktop.org/drm-intel for-linux-next
reproduce: make htmldocs

If you fix the issue, kindly add following tag
Reported-by: kbuild test robot 

All warnings (new ones prefixed by >>):

   include/linux/lsm_hooks.h:1830: warning: Function parameter or member 
'perf_event_free' not described in 'security_list_options'
   include/linux/lsm_hooks.h:1830: warning: Function parameter or member 
'perf_event_read' not described in 'security_list_options'
   include/linux/lsm_hooks.h:1830: warning: Function parameter or member 
'perf_event_write' not described in 'security_list_options'
   fs/posix_acl.c:647: warning: Function parameter or member 'inode' not 
described in 'posix_acl_update_mode'
   fs/posix_acl.c:647: warning: Function parameter or member 'mode_p' not 
described in 'posix_acl_update_mode'
   fs/posix_acl.c:647: warning: Function parameter or member 'acl' not 
described in 'posix_acl_update_mode'
   include/linux/regulator/machine.h:196: warning: Function parameter or member 
'max_uV_step' not described in 'regulation_constraints'
   include/linux/regulator/driver.h:223: warning: Function parameter or member 
'resume' not described in 'regulator_ops'
   sound/soc/soc-core.c:2509: warning: Function parameter or member 
'legacy_dai_naming' not described in 'snd_soc_register_dai'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'dev_scratch' not described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 'list' not 
described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'ip_defrag_offset' not described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'skb_mstamp_ns' not described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'__cloned_offset' not described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'head_frag' not described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'__pkt_type_offset' not described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'encapsulation' not described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'encap_hdr_csum' not described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'csum_valid' not described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'__pkt_vlan_present_offset' not described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'vlan_present' not described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'csum_complete_sw' not described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'csum_level' not described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'inner_protocol_type' not described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'remcsum_offload' not described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'sender_cpu' not described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'reserved_tailroom' not described in 'sk_buff'
   include/linux/skbuff.h:888: warning: Function parameter or member 
'inner_ipproto' not described in 'sk_buff'
   include/net/sock.h:232: warning: Function parameter or member 'skc_addrpair' 
not described in 'sock_common'
   include/net/sock.h:232: warning: Function parameter or member 'skc_portpair' 
not described in 'sock_common'
   include/net/sock.h:232: warning: Function parameter or member 'skc_ipv6only' 
not described in 'sock_common'
   include/net/sock.h:232: warning: Function parameter or member 
'skc_net_refcnt' not described in 'sock_common'
   include/net/sock.h:232: warning: Function parameter or member 'skc_v6_daddr' 
not described in 'sock_common'
   include/net/sock.h:232: warning: Function parameter or member 
'skc_v6_rcv_saddr' not described in 'sock_common'
   include/net/sock.h:232: warning: Function parameter or member 'skc_cookie' 
not described in 'sock_common'
   include/net/sock.h:232: warning: Function parameter or member 'skc_listener' 
not described in 'sock_common'
   include/net/sock.h:232: warning: Fu

[Intel-gfx] [PATCH -next] drm/i915: Add missing include file

2020-01-07 Thread YueHaibing

Fix build error:
./drivers/gpu/drm/i915/selftests/i915_random.h: In function 
i915_prandom_u32_max_state:
./drivers/gpu/drm/i915/selftests/i915_random.h:48:23: error:
 implicit declaration of function mul_u32_u32; did you mean mul_u64_u32_div? 
[-Werror=implicit-function-declaration]
  return upper_32_bits(mul_u32_u32(prandom_u32_state(state), ep_ro));

Reported-by: Hulk Robot 
Fixes: 7ce5b6850b47 ("drm/i915/selftests: Use mul_u32_u32() for 32b x 32b -> 
64b result")
Signed-off-by: YueHaibing 
---
 drivers/gpu/drm/i915/selftests/i915_random.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/i915/selftests/i915_random.h 
b/drivers/gpu/drm/i915/selftests/i915_random.h
index 35cc69a..f650cfb 100644
--- a/drivers/gpu/drm/i915/selftests/i915_random.h
+++ b/drivers/gpu/drm/i915/selftests/i915_random.h
@@ -26,6 +26,7 @@
 #define __I915_SELFTESTS_RANDOM_H__
 
 #include 
+#include 
 
 #include "../i915_selftest.h"
 
-- 
2.7.4


___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915: Replace vma parking with a clock aging algorithm

2020-01-07 Thread Patchwork

== Series Details ==

Series: drm/i915: Replace vma parking with a clock aging algorithm
URL   : https://patchwork.freedesktop.org/series/71677/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_7690_full -> Patchwork_16009_full


Summary
---

  **FAILURE**

  Serious unknown changes coming with Patchwork_16009_full absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_16009_full, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  

Possible new issues
---

  Here are the unknown changes that may have been introduced in 
Patchwork_16009_full:

### IGT changes ###

 Possible regressions 

  * igt@kms_cursor_edge_walk@pipe-d-128x128-bottom-edge:
- shard-tglb: [PASS][1] -> [INCOMPLETE][2]
   [1]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-tglb7/igt@kms_cursor_edge_w...@pipe-d-128x128-bottom-edge.html
   [2]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16009/shard-tglb7/igt@kms_cursor_edge_w...@pipe-d-128x128-bottom-edge.html

  
Known issues


  Here are the changes found in Patchwork_16009_full that come from known 
issues:

### IGT changes ###

 Issues hit 

  * igt@gem_ctx_isolation@rcs0-s3:
- shard-iclb: [PASS][3] -> [DMESG-WARN][4] ([fdo#111764])
   [3]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-iclb5/igt@gem_ctx_isolat...@rcs0-s3.html
   [4]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16009/shard-iclb7/igt@gem_ctx_isolat...@rcs0-s3.html

  * igt@gem_ctx_persistence@vcs1-queued:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#109276] / [fdo#112080]) 
+2 similar issues
   [5]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-iclb4/igt@gem_ctx_persiste...@vcs1-queued.html
   [6]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16009/shard-iclb6/igt@gem_ctx_persiste...@vcs1-queued.html

  * igt@gem_ctx_shared@q-smoketest-bsd1:
- shard-tglb: [PASS][7] -> [INCOMPLETE][8] ([fdo#111735])
   [7]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-tglb8/igt@gem_ctx_sha...@q-smoketest-bsd1.html
   [8]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16009/shard-tglb6/igt@gem_ctx_sha...@q-smoketest-bsd1.html

  * igt@gem_eio@in-flight-suspend:
- shard-kbl:  [PASS][9] -> [DMESG-WARN][10] ([i915#56])
   [9]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-kbl3/igt@gem_...@in-flight-suspend.html
   [10]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16009/shard-kbl1/igt@gem_...@in-flight-suspend.html

  * igt@gem_exec_balancer@nop:
- shard-tglb: [PASS][11] -> [INCOMPLETE][12] ([fdo#111736] / 
[i915#472])
   [11]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-tglb8/igt@gem_exec_balan...@nop.html
   [12]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16009/shard-tglb2/igt@gem_exec_balan...@nop.html

  * igt@gem_exec_balancer@smoke:
- shard-tglb: [PASS][13] -> [INCOMPLETE][14] ([fdo#111593] / 
[i915#472])
   [13]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-tglb2/igt@gem_exec_balan...@smoke.html
   [14]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16009/shard-tglb3/igt@gem_exec_balan...@smoke.html

  * igt@gem_exec_parallel@vcs1-fds:
- shard-iclb: [PASS][15] -> [SKIP][16] ([fdo#112080]) +9 similar 
issues
   [15]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-iclb2/igt@gem_exec_paral...@vcs1-fds.html
   [16]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16009/shard-iclb3/igt@gem_exec_paral...@vcs1-fds.html

  * igt@gem_exec_schedule@deep-bsd2:
- shard-tglb: [PASS][17] -> [INCOMPLETE][18] ([fdo#111671] / 
[i915#472])
   [17]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-tglb3/igt@gem_exec_sched...@deep-bsd2.html
   [18]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16009/shard-tglb4/igt@gem_exec_sched...@deep-bsd2.html

  * igt@gem_exec_schedule@out-order-bsd2:
- shard-iclb: [PASS][19] -> [SKIP][20] ([fdo#109276]) +13 similar 
issues
   [19]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-iclb4/igt@gem_exec_sched...@out-order-bsd2.html
   [20]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16009/shard-iclb6/igt@gem_exec_sched...@out-order-bsd2.html

  * igt@gem_exec_schedule@preempt-queue-bsd:
- shard-iclb: [PASS][21] -> [SKIP][22] ([fdo#112146]) +2 similar 
issues
   [21]: 
https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7690/shard-iclb8/igt@gem_exec_sched...@preempt-queue-bsd.html
   [22]: 
https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_16009/shard-iclb4/igt@gem_exec_sched...@preempt-queue-bsd.html

  * igt@gem_exec_schedule@preempt-queue-chain-bsd1:
- shard-tglb: [PASS][23] -> [INCOMPLETE][24]

[Intel-gfx] [PATCH] drm/i915: fix an error code in intel_modeset_all_tiles()

2020-01-07 Thread Dan Carpenter

There is a cut and paste bug so we return the wrong error code.

Fixes: a603f5bd1691 ("drm/i915/dp: Make sure all tiled connectors get added to 
the state with full modeset")
Signed-off-by: Dan Carpenter 
---
 drivers/gpu/drm/i915/display/intel_display.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index da5266e76738..a96bee699a5e 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -14424,7 +14424,7 @@ intel_modeset_all_tiles(struct intel_atomic_state 
*state, int tile_grp_id)
crtc_state = drm_atomic_get_crtc_state(>base,
   conn_state->crtc);
if (IS_ERR(crtc_state)) {
-   ret = PTR_ERR(conn_state);
+   ret = PTR_ERR(crtc_state);
break;
}
crtc_state->mode_changed = true;
-- 
2.11.0

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/tgl: Media decompression support

2020-01-07 Thread Imre Deak

On Wed, Jan 01, 2020 at 07:34:13AM +, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915/tgl: Media decompression support
> URL   : https://patchwork.freedesktop.org/series/71535/
> State : success

Thanks for the reviews, pushed to -dinq.

> 
> == Summary ==
> 
> CI Bug Log - changes from CI_DRM_7660_full -> Patchwork_15961_full
> 
> 
> Summary
> ---
> 
>   **SUCCESS**
> 
>   No regressions found.
> 
>   
> 
> New tests
> -
> 
>   New tests have been introduced between CI_DRM_7660_full and 
> Patchwork_15961_full:
> 
> ### New Piglit tests (7) ###
> 
>   * 
> spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-float_float-position-double_dvec4_array2:
> - Statuses : 1 fail(s)
> - Exec time: [0.13] s
> 
>   * 
> spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-float_mat4x3_array3-position-double_dvec2:
> - Statuses : 1 fail(s)
> - Exec time: [0.14] s
> 
>   * 
> spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-int_int_array3-position-double_dmat3x2:
> - Statuses : 1 fail(s)
> - Exec time: [0.14] s
> 
>   * 
> spec@arb_vertex_attrib_64bit@execution@vs_in@vs-input-position-double_dvec4_array5-uint_uvec2:
> - Statuses : 1 fail(s)
> - Exec time: [0.16] s
> 
>   * 
> spec@glsl-4.20@execution@vs_in@vs-input-double_dmat2_array5-uint_uint-position:
> - Statuses : 1 fail(s)
> - Exec time: [0.13] s
> 
>   * 
> spec@glsl-4.20@execution@vs_in@vs-input-float_mat3_array3-double_dmat2-position:
> - Statuses : 1 fail(s)
> - Exec time: [0.13] s
> 
>   * spec@glsl-4.20@execution@vs_in@vs-input-int_ivec3-double_dmat3x2-position:
> - Statuses : 1 fail(s)
> - Exec time: [0.13] s
> 
>   
> 
> Known issues
> 
> 
>   Here are the changes found in Patchwork_15961_full that come from known 
> issues:
> 
> ### IGT changes ###
> 
>  Issues hit 
> 
>   * igt@gem_busy@busy-vcs1:
> - shard-iclb: [PASS][1] -> [SKIP][2] ([fdo#112080]) +8 similar 
> issues
>[1]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7660/shard-iclb2/igt@gem_b...@busy-vcs1.html
>[2]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15961/shard-iclb6/igt@gem_b...@busy-vcs1.html
> 
>   * igt@gem_busy@close-race:
> - shard-tglb: [PASS][3] -> [INCOMPLETE][4] ([i915#435])
>[3]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7660/shard-tglb5/igt@gem_b...@close-race.html
>[4]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15961/shard-tglb6/igt@gem_b...@close-race.html
> 
>   * igt@gem_ctx_isolation@vcs1-clean:
> - shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#109276] / 
> [fdo#112080]) +1 similar issue
>[5]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7660/shard-iclb4/igt@gem_ctx_isolat...@vcs1-clean.html
>[6]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15961/shard-iclb6/igt@gem_ctx_isolat...@vcs1-clean.html
> 
>   * igt@gem_eio@reset-stress:
> - shard-tglb: [PASS][7] -> [INCOMPLETE][8] ([i915#470])
>[7]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7660/shard-tglb8/igt@gem_...@reset-stress.html
>[8]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15961/shard-tglb5/igt@gem_...@reset-stress.html
> 
>   * igt@gem_eio@unwedge-stress:
> - shard-snb:  [PASS][9] -> [FAIL][10] ([i915#232])
>[9]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7660/shard-snb1/igt@gem_...@unwedge-stress.html
>[10]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15961/shard-snb5/igt@gem_...@unwedge-stress.html
> 
>   * igt@gem_exec_balancer@smoke:
> - shard-iclb: [PASS][11] -> [SKIP][12] ([fdo#110854])
>[11]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7660/shard-iclb1/igt@gem_exec_balan...@smoke.html
>[12]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15961/shard-iclb8/igt@gem_exec_balan...@smoke.html
> 
>   * igt@gem_exec_gttfill@basic:
> - shard-tglb: [PASS][13] -> [INCOMPLETE][14] ([fdo#111593])
>[13]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7660/shard-tglb2/igt@gem_exec_gttf...@basic.html
>[14]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15961/shard-tglb6/igt@gem_exec_gttf...@basic.html
> 
>   * igt@gem_exec_schedule@preempt-queue-blt:
> - shard-tglb: [PASS][15] -> [INCOMPLETE][16] ([fdo#111677])
>[15]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7660/shard-tglb2/igt@gem_exec_sched...@preempt-queue-blt.html
>[16]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_15961/shard-tglb8/igt@gem_exec_sched...@preempt-queue-blt.html
> 
>   * igt@gem_exec_schedule@preempt-queue-contexts-render:
> - shard-tglb: [PASS][17] -> [INCOMPLETE][18] ([fdo#111606] / 
> [fdo#111677]) +1 similar issue
>[17]: 
> https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_7660/shard-tglb6/igt@gem_exec_sched...@preempt-queue-contexts-render.html
>[18]: 
>

[Intel-gfx] [PULL] drm-misc-next

2020-01-07 Thread Maarten Lankhorst

drm-misc-next-2020-01-07:
drm-misc-next for v5.6:

UAPI Changes:
- Allow overriding number of bootup penguins in fbcon using fbcon=logo-count:n.

Cross-subsystem Changes:
- fbdev fixes for mmp, and make it work with CONFIG_COMPILE_TEST.
- Use devm_platform_ioremap_resource in fbdev drivers.
- Various small fbdev fixes.

Core Changes:
- Support scanline alignment for dumb buffers.
- Add atomic_check() hook to bridge ops, to support bus format negotiation.
- Add gem_create_object() to vram helpers.

Driver Changes:
- Rockchip: Add support for PX30.
- Use generic fbdev code and dumb helpers in hisilicon/hibmc.
- Add support for Leadtek LTK500HD1829 panel, and xinpeng XPP055C272.
- Clock fixes for atmel-hlcdc.
- Various smaller fixes to all drivers.
The following changes since commit f5c547efa16c0ea5abff0596e829f502be11902e:

  Merge tag 'drm-misc-next-2020-01-02' of 
git://anongit.freedesktop.org/drm/drm-misc into drm-next (2020-01-03 11:43:44 
+1000)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm-misc tags/drm-misc-next-2020-01-07

for you to fetch changes up to 3cacb2086e41bbdf4a43e494d47d05db356992b9:

  drm/mgag200: Add module parameter to pin all buffers at offset 0 (2020-01-07 
11:53:19 +0100)


drm-misc-next for v5.6:

UAPI Changes:
- Allow overriding number of bootup penguins in fbcon using fbcon=logo-count:n.

Cross-subsystem Changes:
- fbdev fixes for mmp, and make it work with CONFIG_COMPILE_TEST.
- Use devm_platform_ioremap_resource in fbdev drivers.
- Various small fbdev fixes.

Core Changes:
- Support scanline alignment for dumb buffers.
- Add atomic_check() hook to bridge ops, to support bus format negotiation.
- Add gem_create_object() to vram helpers.

Driver Changes:
- Rockchip: Add support for PX30.
- Use generic fbdev code and dumb helpers in hisilicon/hibmc.
- Add support for Leadtek LTK500HD1829 panel, and xinpeng XPP055C272.
- Clock fixes for atmel-hlcdc.
- Various smaller fixes to all drivers.


Andrew F. Davis (1):
  omapfb/dss: remove unneeded conversions to bool

Bartlomiej Zolnierkiewicz (3):
  video: fbdev: mmp: remove duplicated MMP_DISP dependency
  video: fbdev: mmp: add COMPILE_TEST support
  video: fbdev: mmp: fix sparse warnings about using incorrect types

Boris Brezillon (4):
  drm/bridge: Add a drm_bridge_state object
  drm/bridge: Patch atomic hooks to take a drm_bridge_state
  drm/bridge: Add an ->atomic_check() hook
  drm/bridge: Add the necessary bits to support bus format negotiation

Christophe JAILLET (1):
  pxa168fb: Fix the function used to release some memory in an error 
handling path

Claudiu Beznea (3):
  drm: atmel-hlcdc: use double rate for pixel clock only if supported
  drm: atmel-hlcdc: enable clock before configuring timing engine
  Revert "drm: atmel-hlcdc: enable sys_clk during initalization."

Colin Ian King (1):
  fbdev: matrox: make array wtst_xlat static const, makes object smaller

Geert Uytterhoeven (1):
  drm/mipi_dbi: Fix off-by-one bugs in mipi_dbi_blank()

Gustavo A. R. Silva (1):
  video: fbdev: fsl-diu-fb: mark expected switch fall-throughs

Heiko Stuebner (6):
  dt-bindings: Add vendor prefix for Xinpeng Technology
  dt-bindings: display: panel: Add binding document for Xinpeng XPP055C272
  drm/panel: add panel driver for Xinpeng XPP055C272 panels
  dt-bindings: Add vendor prefix for Leadtek Technology
  dt-bindings: display: panel: Add binding document for Leadtek LTK500HD1829
  drm/panel: add panel driver for Leadtek LTK500HD1829

Julia Lawall (1):
  drm: bridge: dw-hdmi: constify copied structure

Maarten Lankhorst (1):
  Merge drm/drm-next into drm-misc-next

Markus Elfring (2):
  video: ocfb: Use devm_platform_ioremap_resource() in ocfb_probe()
  video: pxafb: Use devm_platform_ioremap_resource() in pxafb_probe()

Miquel Raynal (9):
  dt-bindings: display: rockchip-lvds: Declare PX30 compatible
  dt-bindings: display: rockchip-lvds: Document PX30 PHY
  drm/rockchip: lvds: Fix indentation of a #define
  drm/rockchip: lvds: Harmonize function names
  drm/rockchip: lvds: Change platform data to hold helper_funcs pointer
  drm/rockchip: lvds: Create an RK3288 specific probe function
  drm/rockchip: lvds: improve error handling in helper functions
  drm/rockchip: lvds: move hardware-specific functions together
  drm/rockchip: lvds: Add PX30 support

Nickey Yang (1):
  drm: rockchip: rk3066_hdmi: set edid fifo address

Peter Rosin (4):
  fbdev: fix numbering of fbcon options
  fbdev: fbmem: allow overriding the number of bootup logos
  fbdev: fbmem: avoid exporting fb_center_logo
  drm: atmel-hlcdc: prefer a lower pixel-clock than requested

Sam Ravnborg (1):
  dt-bindings: fix warnings in xinpeng,xpp055c272.yaml

[Intel-gfx] [PATCH i-g-t] i915/gem_ctx_engine: Skip redundant clear of a fresh buffer

2020-01-07 Thread Chris Wilson

No need to memset(0) the mapping of a fresh buffer, as we expect it to
be 0 already.

Signed-off-by: Chris Wilson 
---
 tests/i915/gem_ctx_engines.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/i915/gem_ctx_engines.c b/tests/i915/gem_ctx_engines.c
index 55794a438..86c4bea5a 100644
--- a/tests/i915/gem_ctx_engines.c
+++ b/tests/i915/gem_ctx_engines.c
@@ -454,7 +454,6 @@ static void independent(int i915)
map = gem_mmap__cpu(i915, results.handle, 0, 4096, PROT_READ);
gem_set_domain(i915, results.handle,
   I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU);
-   memset(map, 0, 4096);
 
for (int i = 0; i < I915_EXEC_RING_MASK + 1; i++) {
struct drm_i915_gem_exec_object2 obj[2] = {
-- 
2.25.0.rc1

___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915/gtt: split up i915_gem_gtt

2020-01-07 Thread Chris Wilson

Quoting Matthew Auld (2020-01-06 23:47:02)
> Attempt to split i915_gem_gtt.[ch] into more manageable chunks.
> 
> Suggested-by: Chris Wilson 
> Signed-off-by: Matthew Auld 
> Cc: Chris Wilson 

A few more exports than I was expecting (possibly suggesting some of
those should be common functions), but it looks like what I had in
mind. I'll take a closer look to see if we can use those exports to
define a saner interface.

After this, the next big job is splitting i915_vma into HW facing and
GEM facing.
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: Mark the GEM context link as RCU protected

2020-01-07 Thread Tvrtko Ursulin



On 07/01/2020 11:15, Tvrtko Ursulin wrote:


On 22/12/2019 23:35, Chris Wilson wrote:

The only protection for intel_context.gem_cotext is granted by RCU, so
annotate it as a rcu protected pointer and carefully dereference it in
the few occasions we need to use it.

Fixes: 9f3ccd40acf4 ("drm/i915: Drop GEM context as a direct link from 
i915_request")

Signed-off-by: Chris Wilson 
Cc: Andi Shyti 
---
  drivers/gpu/drm/i915/gem/i915_gem_context.c   |  5 ++-
  drivers/gpu/drm/i915/gt/intel_context_types.h |  2 +-
  drivers/gpu/drm/i915/gt/intel_reset.c | 26 +---
  .../gpu/drm/i915/gt/intel_ring_submission.c   |  2 +-
  drivers/gpu/drm/i915/i915_gpu_error.c | 40 ---
  drivers/gpu/drm/i915/i915_request.c   |  6 +--
  drivers/gpu/drm/i915/i915_request.h   |  8 
  7 files changed, 62 insertions(+), 27 deletions(-)



[snip]


  static void engine_record_requests(struct intel_engine_cs *engine,
@@ -1298,28 +1304,34 @@ static void 
error_record_engine_execlists(const struct intel_engine_cs *engine,

  static bool record_context(struct drm_i915_error_context *e,
 const struct i915_request *rq)
  {
-    const struct i915_gem_context *ctx = rq->context->gem_context;
+    struct i915_gem_context *ctx;
+    struct task_struct *task;
+    bool capture;
+    rcu_read_lock();
+    ctx = rcu_dereference(rq->context->gem_context);
+    if (ctx && !kref_get_unless_zero(>ref))
+    ctx = NULL;
+    rcu_read_unlock();
  if (!ctx)
  return false;
-    if (ctx->pid) {
-    struct task_struct *task;
-
-    rcu_read_lock();
-    task = pid_task(ctx->pid, PIDTYPE_PID);
-    if (task) {
-    strcpy(e->comm, task->comm);
-    e->pid = task->pid;
-    }
-    rcu_read_unlock();
+    rcu_read_lock();
+    task = pid_task(ctx->pid, PIDTYPE_PID);
+    if (task) {
+    strcpy(e->comm, task->comm);
+    e->pid = task->pid;
  }
+    rcu_read_unlock();


Why is this rcu_read_lock section needed? The first one obtained the 
reference to the context so should be good.


Hmm pid_task() does:

...
first = 
rcu_dereference_check(hlist_first_rcu(>tasks[type]),


lockdep_tasklist_lock_is_held());

...

Note, tasklist_lock_is_held.

Regards,

Tvrtko
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: Mark the GEM context link as RCU protected

2020-01-07 Thread Chris Wilson

Quoting Tvrtko Ursulin (2020-01-07 11:15:39)
> 
> On 22/12/2019 23:35, Chris Wilson wrote:
> > The only protection for intel_context.gem_cotext is granted by RCU, so
> > annotate it as a rcu protected pointer and carefully dereference it in
> > the few occasions we need to use it.
> > 
> > Fixes: 9f3ccd40acf4 ("drm/i915: Drop GEM context as a direct link from 
> > i915_request")
> > Signed-off-by: Chris Wilson 
> > Cc: Andi Shyti 
> > ---
> >   drivers/gpu/drm/i915/gem/i915_gem_context.c   |  5 ++-
> >   drivers/gpu/drm/i915/gt/intel_context_types.h |  2 +-
> >   drivers/gpu/drm/i915/gt/intel_reset.c | 26 +---
> >   .../gpu/drm/i915/gt/intel_ring_submission.c   |  2 +-
> >   drivers/gpu/drm/i915/i915_gpu_error.c | 40 ---
> >   drivers/gpu/drm/i915/i915_request.c   |  6 +--
> >   drivers/gpu/drm/i915/i915_request.h   |  8 
> >   7 files changed, 62 insertions(+), 27 deletions(-)
> > 
> 
> [snip]
> 
> >   
> >   static void engine_record_requests(struct intel_engine_cs *engine,
> > @@ -1298,28 +1304,34 @@ static void error_record_engine_execlists(const 
> > struct intel_engine_cs *engine,
> >   static bool record_context(struct drm_i915_error_context *e,
> >  const struct i915_request *rq)
> >   {
> > - const struct i915_gem_context *ctx = rq->context->gem_context;
> > + struct i915_gem_context *ctx;
> > + struct task_struct *task;
> > + bool capture;
> >   
> > + rcu_read_lock();
> > + ctx = rcu_dereference(rq->context->gem_context);
> > + if (ctx && !kref_get_unless_zero(>ref))
> > + ctx = NULL;
> > + rcu_read_unlock();
> >   if (!ctx)
> >   return false;
> >   
> > - if (ctx->pid) {
> > - struct task_struct *task;
> > -
> > - rcu_read_lock();
> > - task = pid_task(ctx->pid, PIDTYPE_PID);
> > - if (task) {
> > - strcpy(e->comm, task->comm);
> > - e->pid = task->pid;
> > - }
> > - rcu_read_unlock();
> > + rcu_read_lock();
> > + task = pid_task(ctx->pid, PIDTYPE_PID);
> > + if (task) {
> > + strcpy(e->comm, task->comm);
> > + e->pid = task->pid;
> >   }
> > + rcu_read_unlock();
> 
> Why is this rcu_read_lock section needed? The first one obtained the 
> reference to the context so should be good.

The task returned by ctx->pid is not protected by that reference, and
pid_task() doesn't increment the reference on the task. That's what I
remember of the pid_task() interface, that requires rcu to be held while
you look inside, where get_pid_task() does not.
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: Mark the GEM context link as RCU protected

2020-01-07 Thread Tvrtko Ursulin




On 22/12/2019 23:35, Chris Wilson wrote:

The only protection for intel_context.gem_cotext is granted by RCU, so
annotate it as a rcu protected pointer and carefully dereference it in
the few occasions we need to use it.

Fixes: 9f3ccd40acf4 ("drm/i915: Drop GEM context as a direct link from 
i915_request")
Signed-off-by: Chris Wilson 
Cc: Andi Shyti 
---
  drivers/gpu/drm/i915/gem/i915_gem_context.c   |  5 ++-
  drivers/gpu/drm/i915/gt/intel_context_types.h |  2 +-
  drivers/gpu/drm/i915/gt/intel_reset.c | 26 +---
  .../gpu/drm/i915/gt/intel_ring_submission.c   |  2 +-
  drivers/gpu/drm/i915/i915_gpu_error.c | 40 ---
  drivers/gpu/drm/i915/i915_request.c   |  6 +--
  drivers/gpu/drm/i915/i915_request.h   |  8 
  7 files changed, 62 insertions(+), 27 deletions(-)



[snip]

  
  static void engine_record_requests(struct intel_engine_cs *engine,

@@ -1298,28 +1304,34 @@ static void error_record_engine_execlists(const struct 
intel_engine_cs *engine,
  static bool record_context(struct drm_i915_error_context *e,
   const struct i915_request *rq)
  {
-   const struct i915_gem_context *ctx = rq->context->gem_context;
+   struct i915_gem_context *ctx;
+   struct task_struct *task;
+   bool capture;
  
+	rcu_read_lock();

+   ctx = rcu_dereference(rq->context->gem_context);
+   if (ctx && !kref_get_unless_zero(>ref))
+   ctx = NULL;
+   rcu_read_unlock();
if (!ctx)
return false;
  
-	if (ctx->pid) {

-   struct task_struct *task;
-
-   rcu_read_lock();
-   task = pid_task(ctx->pid, PIDTYPE_PID);
-   if (task) {
-   strcpy(e->comm, task->comm);
-   e->pid = task->pid;
-   }
-   rcu_read_unlock();
+   rcu_read_lock();
+   task = pid_task(ctx->pid, PIDTYPE_PID);
+   if (task) {
+   strcpy(e->comm, task->comm);
+   e->pid = task->pid;
}
+   rcu_read_unlock();


Why is this rcu_read_lock section needed? The first one obtained the 
reference to the context so should be good.


Regards,

Tvrtko
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [igt-dev] [PATCH i-g-t] i915/perf: Find the associated perf-type for a particular device

2020-01-07 Thread Chris Wilson

Quoting Tvrtko Ursulin (2020-01-07 09:53:39)
> 
> +Arek, Saurabhg
> 
> On 05/01/2020 01:06, Chris Wilson wrote:
> > Since with multiple devices, we may have multiple different perf_pmu
> > each with their own type, we want to find the right one for the job.
> > 
> > The tests are run with a specific fd, from which we can extract the
> > appropriate bus-id and find the associated perf-type. The performance
> > monitoring tools are a little more general and not yet ready to probe
> > all device or bind to one in particular, so we just assume the default
> > igfx for the time being.
> > 
> > v2: Extract the bus address from out of sysfs
> > 
> > Signed-off-by: Chris Wilson 
> > Cc: "Robert M. Fosha" 
> > Cc: Tvrtko Ursulin 
> > Cc: Michal Wajdeczko 
> > ---
> >   benchmarks/gem_wsim.c  |  4 +-
> >   lib/igt_perf.c | 84 +++---
> >   lib/igt_perf.h | 13 --
> >   overlay/gem-interrupts.c   |  2 +-
> >   overlay/gpu-freq.c |  4 +-
> >   overlay/gpu-top.c  | 12 ++---
> >   overlay/rc6.c  |  2 +-
> >   tests/i915/gem_ctx_freq.c  |  2 +-
> >   tests/i915/gem_ctx_sseu.c  |  2 +-
> >   tests/i915/gem_exec_balancer.c | 18 +---
> >   tests/perf_pmu.c   | 84 ++
> >   tools/intel_gpu_top.c  |  2 +-
> >   12 files changed, 159 insertions(+), 70 deletions(-)
> > 
> > diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c
> > index 6305e0d7a..9156fdc90 100644
> > --- a/benchmarks/gem_wsim.c
> > +++ b/benchmarks/gem_wsim.c
> > @@ -2268,8 +2268,8 @@ busy_init(const struct workload_balancer *balancer, 
> > struct workload *wrk)
> >   for (d = [0]; d->id != VCS; d++) {
> >   int pfd;
> >   
> > - pfd = perf_i915_open_group(I915_PMU_ENGINE_BUSY(d->class,
> > - d->inst),
> > + pfd = perf_igfx_open_group(I915_PMU_ENGINE_BUSY(d->class,
> > + d->inst),
> >  bb->fd);
> >   if (pfd < 0) {
> >   if (d->id != VCS2)
> > diff --git a/lib/igt_perf.c b/lib/igt_perf.c
> > index e3dec2cc2..840add043 100644
> > --- a/lib/igt_perf.c
> > +++ b/lib/igt_perf.c
> > @@ -4,17 +4,77 @@
> >   #include 
> >   #include 
> >   #include 
> > +#include 
> >   #include 
> > +#include 
> >   
> >   #include "igt_perf.h"
> >   
> > -uint64_t i915_type_id(void)
> > +static char *bus_address(int i915, char *path, int pathlen)
> > +{
> > + struct stat st;
> > + int len = -1;
> > + int dir;
> > + char *s;
> > +
> > + if (fstat(i915, ) || !S_ISCHR(st.st_mode))
> > + return NULL;
> > +
> > + snprintf(path, pathlen, "/sys/dev/char/%d:%d",
> > +  major(st.st_rdev), minor(st.st_rdev));
> > +
> > + dir = open(path, O_RDONLY);
> > + if (dir != -1) {
> > + len = readlinkat(dir, "device", path, pathlen - 1);
> > + close(dir);
> > + }
> > + if (len < 0)
> > + return NULL;
> > +
> > + path[len] = '\0';
> > +
> > + /* strip off the relative path */
> > + s = strrchr(path, '/');
> > + if (s)
> > + memmove(path, s + 1, len - (s - path) + 1);
> > +
> > + return path;
> > +}
> > +
> > +const char *i915_perf_device(int i915, char *buf, int buflen)
> > +{
> > +#define prefix "i915-"
> > +#define plen strlen(prefix)
> > +
> > + if (!buf || buflen < plen)
> > + return "i915";
> > +
> > + memcpy(buf, prefix, plen);
> > +
> > + if (!bus_address(i915, buf + plen, buflen - plen) ||
> > + strcmp(buf + plen, ":00:02.0") == 0) /* legacy name for igfx 
> > */
> > + buf[plen - 1] = '\0';
> > +
> > + return buf;
> > +}
> 
> So DRM fd -> PCI string conversion, yes? On a glance it looks okay. 
> However Arek probably has this data as part of "[PATCH i-g-t 0/4] device 
> selection && lsgpu" (https://patchwork.freedesktop.org/series/70285/).

If the string is known, we can use it. This simple routine is *simple*
yet effective :)
 
> Also:
> 
> https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/52
> https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/51

How lightweight are they aiming to be?
 
> And VLK-5588.
> 
> This patch is overlap with #52 and then #51/VLK-5588 is about allowing 
> card selection for tools.
> 
> How to meld the two with minimum effort? We could put this in and then 
> later replace the PCI name resolve with a library routine and re-adjust 
> tools to allow card selection via some mechanism.

Exactly. All we need here is a name to lookup the perf type id. One
routine to provide an introspection method for a given fd and assumption
of i915, does not prevent better methods :)

I do wonder though if we should have perf_name in our sysfs.
-Chris

Re: [Intel-gfx] [igt-dev] [PATCH i-g-t] i915/perf: Find the associated perf-type for a particular device

2020-01-07 Thread Tvrtko Ursulin




+Arek, Saurabhg

On 05/01/2020 01:06, Chris Wilson wrote:

Since with multiple devices, we may have multiple different perf_pmu
each with their own type, we want to find the right one for the job.

The tests are run with a specific fd, from which we can extract the
appropriate bus-id and find the associated perf-type. The performance
monitoring tools are a little more general and not yet ready to probe
all device or bind to one in particular, so we just assume the default
igfx for the time being.

v2: Extract the bus address from out of sysfs

Signed-off-by: Chris Wilson 
Cc: "Robert M. Fosha" 
Cc: Tvrtko Ursulin 
Cc: Michal Wajdeczko 
---
  benchmarks/gem_wsim.c  |  4 +-
  lib/igt_perf.c | 84 +++---
  lib/igt_perf.h | 13 --
  overlay/gem-interrupts.c   |  2 +-
  overlay/gpu-freq.c |  4 +-
  overlay/gpu-top.c  | 12 ++---
  overlay/rc6.c  |  2 +-
  tests/i915/gem_ctx_freq.c  |  2 +-
  tests/i915/gem_ctx_sseu.c  |  2 +-
  tests/i915/gem_exec_balancer.c | 18 +---
  tests/perf_pmu.c   | 84 ++
  tools/intel_gpu_top.c  |  2 +-
  12 files changed, 159 insertions(+), 70 deletions(-)

diff --git a/benchmarks/gem_wsim.c b/benchmarks/gem_wsim.c
index 6305e0d7a..9156fdc90 100644
--- a/benchmarks/gem_wsim.c
+++ b/benchmarks/gem_wsim.c
@@ -2268,8 +2268,8 @@ busy_init(const struct workload_balancer *balancer, 
struct workload *wrk)
for (d = [0]; d->id != VCS; d++) {
int pfd;
  
-		pfd = perf_i915_open_group(I915_PMU_ENGINE_BUSY(d->class,

-   d->inst),
+   pfd = perf_igfx_open_group(I915_PMU_ENGINE_BUSY(d->class,
+   d->inst),
   bb->fd);
if (pfd < 0) {
if (d->id != VCS2)
diff --git a/lib/igt_perf.c b/lib/igt_perf.c
index e3dec2cc2..840add043 100644
--- a/lib/igt_perf.c
+++ b/lib/igt_perf.c
@@ -4,17 +4,77 @@
  #include 
  #include 
  #include 
+#include 
  #include 
+#include 
  
  #include "igt_perf.h"
  
-uint64_t i915_type_id(void)

+static char *bus_address(int i915, char *path, int pathlen)
+{
+   struct stat st;
+   int len = -1;
+   int dir;
+   char *s;
+
+   if (fstat(i915, ) || !S_ISCHR(st.st_mode))
+   return NULL;
+
+   snprintf(path, pathlen, "/sys/dev/char/%d:%d",
+major(st.st_rdev), minor(st.st_rdev));
+
+   dir = open(path, O_RDONLY);
+   if (dir != -1) {
+   len = readlinkat(dir, "device", path, pathlen - 1);
+   close(dir);
+   }
+   if (len < 0)
+   return NULL;
+
+   path[len] = '\0';
+
+   /* strip off the relative path */
+   s = strrchr(path, '/');
+   if (s)
+   memmove(path, s + 1, len - (s - path) + 1);
+
+   return path;
+}
+
+const char *i915_perf_device(int i915, char *buf, int buflen)
+{
+#define prefix "i915-"
+#define plen strlen(prefix)
+
+   if (!buf || buflen < plen)
+   return "i915";
+
+   memcpy(buf, prefix, plen);
+
+   if (!bus_address(i915, buf + plen, buflen - plen) ||
+   strcmp(buf + plen, ":00:02.0") == 0) /* legacy name for igfx */
+   buf[plen - 1] = '\0';
+
+   return buf;
+}


So DRM fd -> PCI string conversion, yes? On a glance it looks okay. 
However Arek probably has this data as part of "[PATCH i-g-t 0/4] device 
selection && lsgpu" (https://patchwork.freedesktop.org/series/70285/).


Also:

https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/52
https://gitlab.freedesktop.org/drm/igt-gpu-tools/issues/51

And VLK-5588.

This patch is overlap with #52 and then #51/VLK-5588 is about allowing 
card selection for tools.


How to meld the two with minimum effort? We could put this in and then 
later replace the PCI name resolve with a library routine and re-adjust 
tools to allow card selection via some mechanism.


Regards,

Tvrtko


+
+uint64_t i915_perf_type_id(int i915)
+{
+   char buf[80];
+
+   return igt_perf_type_id(i915_perf_device(i915, buf, sizeof(buf)));
+}
+
+uint64_t igt_perf_type_id(const char *device)
  {
char buf[64];
ssize_t ret;
int fd;
  
-	fd = open("/sys/bus/event_source/devices/i915/type", O_RDONLY);

+   snprintf(buf, sizeof(buf),
+"/sys/bus/event_source/devices/%s/type", device);
+
+   fd = open(buf, O_RDONLY);
if (fd < 0)
return 0;
  
@@ -52,15 +112,27 @@ _perf_open(uint64_t type, uint64_t config, int group, uint64_t format)

return ret;
  }
  
-int perf_i915_open(uint64_t config)

+int perf_igfx_open(uint64_t config)
+{
+   return _perf_open(igt_perf_type_id("i915"), config, -1,
+ PERF_FORMAT_TOTAL_TIME_ENABLED);
+}
+
+int

70 matches

Mail list logo