Skip to contentSkip to conversation

drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen

PATCH RESEND In review Jani Nikula 3 participants 5 messages Apr 26, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND v2 1/1 drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen

Prefer INTEL_GEN() over INTEL_INFO()->gen except in special circumstances.

v2: don't change device info dump (Chris)

Cc Tvrtko Ursulin <[email protected]>
Cc Mika Kuoppala <[email protected]>
---
 drivers/gpu/drm/i915/intel_device_info.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_device_info.c +1 -1
index a32ba72c514e..0fd13df424cf 100644
@@ -848,7 +848,7 @@ void intel_device_info_runtime_init(struct intel_device_info *info)
 		gen9_sseu_info_init(dev_priv);
 	else if (INTEL_GEN(dev_priv) == 10)
 		gen10_sseu_info_init(dev_priv);
-	else if (INTEL_INFO(dev_priv)->gen >= 11)
+	else if (INTEL_GEN(dev_priv) >= 11)
 		gen11_sseu_info_init(dev_priv);
 
 	/* Initialize command stream timestamp frequency */
Signature · 6 lines
2.11.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v2 1/1
#1 lore raw
Quoted 18 lines · Jani Nikula

Prefer INTEL_GEN() over INTEL_INFO()->gen except in special circumstances.

v2: don't change device info dump (Chris)

Cc Tvrtko Ursulin <[email protected]>
Cc Mika Kuoppala <[email protected]>
---
  drivers/gpu/drm/i915/intel_device_info.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_device_info.c +0 -0
index a32ba72c514e..0fd13df424cf 100644

drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_runtime_init(struct intel_device_info *info) · line 854

Quoted 8 lines
drivers/gpu/drm/i915/intel_device_info.c +1 -1
@@ -848,7 +848,7 @@ void intel_device_info_runtime_init(struct intel_device_info *info)
  		gen9_sseu_info_init(dev_priv);
  	else if (INTEL_GEN(dev_priv) == 10)
  		gen10_sseu_info_init(dev_priv);
-	else if (INTEL_INFO(dev_priv)->gen >= 11)
+	else if (INTEL_GEN(dev_priv) >= 11)
  		gen11_sseu_info_init(dev_priv);
 
  	/* Initialize command stream timestamp frequency */

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
Quoted 25 lines · Tvrtko Ursulin
Quoted 24 lines · Jani Nikula

Prefer INTEL_GEN() over INTEL_INFO()->gen except in special circumstances.

v2: don't change device info dump (Chris)

Cc Tvrtko Ursulin <[email protected]>
Cc Mika Kuoppala <[email protected]>
---
  drivers/gpu/drm/i915/intel_device_info.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_device_info.c +1 -1
index a32ba72c514e..0fd13df424cf 100644
@@ -848,7 +848,7 @@ void intel_device_info_runtime_init(struct intel_device_info *info)
  		gen9_sseu_info_init(dev_priv);
  	else if (INTEL_GEN(dev_priv) == 10)
  		gen10_sseu_info_init(dev_priv);
-	else if (INTEL_INFO(dev_priv)->gen >= 11)
+	else if (INTEL_GEN(dev_priv) >= 11)
  		gen11_sseu_info_init(dev_priv);
 
Quoted 4 lines

drivers/gpu/drm/i915/intel_device_info.c void intel_device_info_runtime_init(struct intel_device_info *info) · line 854

Quoted 2 lines
drivers/gpu/drm/i915/intel_device_info.c +0 -0
  	/* Initialize command stream timestamp frequency */

Thanks, pushed to dinq.

I'm having second thoughts on the ->gen to ->__gen change. There were after all some legit users of it.

BR,
Jani.

Quoted 8 lines

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

✓ Fi.CI.BAT: success for drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen
URL : https://patchwork.freedesktop.org/series/42331/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4103 -> Patchwork_8813 =

== Summary - SUCCESS ==

No regressions found.

External URL: https://patchwork.freedesktop.org/api/1.0/series/42331/revisions/1/mbox/

== Known issues ==

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

=== IGT changes ===

    ==== Issues hit ====

    igt@gem_mmap_gtt@basic-small-bo-tiledx:
      fi-gdg-551:         PASS -> FAIL (fdo#102575)

    igt@gem_ringfill@basic-default-hang:
      fi-pnv-d510:        NOTRUN -> DMESG-WARN (fdo#101600)

    igt@kms_frontbuffer_tracking@basic:
      fi-cnl-y3:          PASS -> FAIL (fdo#103167)

    
    ==== Possible fixes ====

    igt@gem_exec_suspend@basic-s4-devices:
      fi-kbl-7500u:       DMESG-WARN (fdo#105128) -> PASS

    igt@kms_flip@basic-flip-vs-wf_vblank:
      fi-elk-e7500:       DMESG-WARN (fdo#103989, fdo#105225) -> PASS

    igt@kms_flip@basic-plain-flip:
      fi-elk-e7500:       DMESG-WARN (fdo#105225) -> PASS

fdo#101600 https://bugs.freedesktop.org/show_bug.cgi?id=101600
fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
fdo#105128 https://bugs.freedesktop.org/show_bug.cgi?id=105128
fdo#105225 https://bugs.freedesktop.org/show_bug.cgi?id=105225

== Participating hosts (38 -> 35) ==

Additional (1): fi-pnv-d510
Missing (4): fi-byt-j1900 fi-ctg-p8600 fi-ilk-m540 fi-skl-6700hq

== Build changes ==

* Linux: CI_DRM_4103 -> Patchwork_8813

CI_DRM_4103: 96d389ab8f2f1e05b9ba5feacef7185f59a129db @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4449: 0350f0e7f6a0e07281445fc3082aa70419f4aac7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8813: d58b3639fa7c187535960d42372463103a13d409 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4449: ad8992d3fb27fd604b9ab15e7963c42421ced85c @ git://anongit.freedesktop.org/piglit

== Linux commits ==

d58b3639fa7c drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8813/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#4 lore raw

✓ Fi.CI.IGT: success for drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: prefer INTEL_GEN() over INTEL_INFO()->gen
URL : https://patchwork.freedesktop.org/series/42331/
State : success

== Summary ==

= CI Bug Log - changes from CI_DRM_4103_full -> Patchwork_8813_full =

== Summary - WARNING ==

Minor unknown changes coming with Patchwork_8813_full need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_8813_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://patchwork.freedesktop.org/api/1.0/series/42331/revisions/1/mbox/

== Possible new issues ==

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

=== IGT changes ===

    ==== Warnings ====

    igt@gem_exec_schedule@deep-bsd2:
      shard-kbl:          PASS -> SKIP

    igt@gem_mocs_settings@mocs-rc6-bsd1:
      shard-kbl:          SKIP -> PASS +1

== Known issues ==

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

=== IGT changes ===

    ==== Issues hit ====

    igt@gem_cs_tlb@basic-default:
      shard-snb:          PASS -> INCOMPLETE (fdo#105411)

    igt@gem_ppgtt@blt-vs-render-ctxn:
      shard-kbl:          PASS -> INCOMPLETE (fdo#106023, fdo#103665)

    igt@kms_flip@absolute-wf_vblank-interruptible:
      shard-glk:          PASS -> FAIL (fdo#106087)

    igt@kms_flip@flip-vs-absolute-wf_vblank-interruptible:
      shard-glk:          PASS -> FAIL (fdo#100368)

    igt@kms_flip@flip-vs-expired-vblank-interruptible:
      shard-glk:          PASS -> FAIL (fdo#105363, fdo#102887)

    
    ==== Possible fixes ====

    igt@kms_flip@2x-wf_vblank-ts-check:
      shard-hsw:          FAIL (fdo#103928) -> PASS

    igt@kms_sysfs_edid_timing:
      shard-apl:          WARN (fdo#100047) -> PASS

fdo#100047 https://bugs.freedesktop.org/show_bug.cgi?id=100047
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
fdo#103665 https://bugs.freedesktop.org/show_bug.cgi?id=103665
fdo#103928 https://bugs.freedesktop.org/show_bug.cgi?id=103928
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
fdo#106023 https://bugs.freedesktop.org/show_bug.cgi?id=106023
fdo#106087 https://bugs.freedesktop.org/show_bug.cgi?id=106087

== Participating hosts (6 -> 5) ==

Missing (1): shard-glkb

== Build changes ==

* Linux: CI_DRM_4103 -> Patchwork_8813

CI_DRM_4103: 96d389ab8f2f1e05b9ba5feacef7185f59a129db @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4449: 0350f0e7f6a0e07281445fc3082aa70419f4aac7 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_8813: d58b3639fa7c187535960d42372463103a13d409 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4449: ad8992d3fb27fd604b9ab15e7963c42421ced85c @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8813/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx