drm/i915: Factor out setup_private_pat()
Subsystems (2)
RFC v4 1/2 drm/i915: Factor out setup_private_pat()
Factor out setup_private_pat() for introducing the following patches.
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +12 -8
@@ -2915,6 +2915,16 @@ static void gen6_gmch_remove(struct i915_address_space *vm)cleanup_scratch_page (vm); } +static void setup_private_pat (struct drm_i915_private *dev_priv) +{ +if (INTEL_GEN (dev_priv) >=10 ) +cnl_setup_private_ppat (dev_priv); +else if (IS_CHERRYVIEW (dev_priv) ||IS_GEN9_LP (dev_priv)) +chv_setup_private_ppat (dev_priv); +else +bdw_setup_private_ppat (dev_priv); +} +static int gen8_gmch_probe (struct i915_ggtt *ggtt) {struct drm_i915_private *dev_priv = ggtt->base.i915;
@@ -2947,14 +2957,6 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt) } ggtt->base.total = (size /sizeof (gen8_pte_t)) <<PAGE_SHIFT ; - -if (INTEL_GEN (dev_priv) >=10 ) -cnl_setup_private_ppat (dev_priv); -else if (IS_CHERRYVIEW (dev_priv) ||IS_GEN9_LP (dev_priv)) -chv_setup_private_ppat (dev_priv); -else -bdw_setup_private_ppat (dev_priv); - ggtt->base.cleanup = gen6_gmch_remove; ggtt->base.bind_vma = ggtt_bind_vma; ggtt->base.unbind_vma = ggtt_unbind_vma;
@@ -2975,6 +2977,8 @@ static int gen8_gmch_probe(struct i915_ggtt *ggtt) ggtt->invalidate = gen6_ggtt_invalidate; +setup_private_pat (dev_priv); +return ggtt_probe_common (ggtt, size); }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [RFCv4,1/2] drm/i915: Factor out setup_private_pat()
== Series Details ==
== Series Details ==
Series: series starting with [RFCv4,1/2] drm/i915: Factor out setup_private_pat()
URL : https://patchwork.freedesktop.org/series/29401/
State : success
== Summary ==
Series 29401v1 series starting with [RFCv4,1/2] drm/i915: Factor out setup_private_pat()
https://patchwork.freedesktop.org/api/1.0/series/29401/revisions/1/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
pass -> FAIL (fi-snb-2600) fdo#100007
Test kms_flip:
Subgroup basic-flip-vs-modeset:
skip -> PASS (fi-skl-x1585l) fdo#101781fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#101781 https://bugs.freedesktop.org/show_bug.cgi?id=101781
fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:454s fi-bdw-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:0 skip:14 time:442s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:361s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:554s fi-bwr-2160 total:279 pass:184 dwarn:0 dfail:0 fail:0 skip:95 time:254s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:519s fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:523s fi-byt-n2820 total:279 pass:250 dwarn:1 dfail:0 fail:0 skip:28 time:523s fi-elk-e7500 total:279 pass:230 dwarn:0 dfail:0 fail:0 skip:49 time:440s fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:615s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:456s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:427s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:427s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:507s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:470s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:477s fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:595s fi-kbl-r total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:592s fi-pnv-d510 total:279 pass:223 dwarn:1 dfail:0 fail:0 skip:55 time:527s fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:467s fi-skl-6700k total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:477s fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:495s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:451s fi-skl-x1585l total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:513s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:548s fi-snb-2600 total:279 pass:247 dwarn:0 dfail:0 fail:3 skip:29 time:403s
c52f5322612a688655751c4dd44baa43e39d4dec drm-tip: 2017y-08m-26d-11h-41m-06s UTC integration manifest 937e5866133d drm/i915: Introduce private PAT managementba727d4ed15f drm/i915: Factor out setup_private_pat()
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5502/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [RFCv4,1/2] drm/i915: Factor out setup_private_pat()
In reply to Zhi Wang== Series Details ==
== Series Details ==
Series: series starting with [RFCv4,1/2] drm/i915: Factor out setup_private_pat()
URL : https://patchwork.freedesktop.org/series/29401/
State : success
== Summary ==
Test perf:
Subgroup polling:
pass -> FAIL (shard-hsw) fdo#102252
Test kms_setmode:
Subgroup basic:
pass -> FAIL (shard-hsw) fdo#99912fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
shard-hsw total:2230 pass:1231 dwarn:0 dfail:0 fail:18 skip:981 time:9659s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5502/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
RFC v4 2/2 drm/i915: Introduce private PAT management
In reply to Zhi WangThe private PAT management is to support PPAT entry manipulation. Two APIs are introduced for dynamically managing PPAT entries: intel_ppat_get and intel_ppat_put.
intel_ppat_get will search for an existing PPAT entry which perfectly matches the required PPAT value. If not, it will try to allocate or return a partially matched PPAT entry if there is any available PPAT indexes or not.
intel_ppat_put will put back the PPAT entry which comes from intel_ppat_get. If it's dynamically allocated, the reference count will be decreased. If the reference count turns into zero, the PPAT index is freed again.
Besides, another two callbacks are introduced to support the private PAT management framework. One is ppat->update(), which writes the PPAT configurations in ppat->entries into HW. Another one is ppat->match, which will return a score to show how two PPAT values match with each other.
v3:
- Introduce dirty bitmap for PPAT registers. (Chris)
- Change the name of the pointer "dev_priv" to "i915". (Chris)
- intel_ppat_{get, put} returns/takes a const intel_ppat_entry *. (Chris)
v2:
- API re-design. (Chris)
--- drivers/gpu/drm/i915/i915_drv.h | 2 + drivers/gpu/drm/i915/i915_gem_gtt.c | 280 +++++++++++++++++++++++++++++------- drivers/gpu/drm/i915/i915_gem_gtt.h | 34 +++++ 3 files changed, 267 insertions(+), 49 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +2 -0
@@ -2312,6 +2312,8 @@ struct drm_i915_private {DECLARE_HASHTABLE (mm_structs,7 );struct mutex mm_lock; +struct intel_ppat ppat; +/* Kernel Modesetting */ struct intel_crtc *plane_to_crtc_mapping[I915_MAX_PIPES ];
drivers/gpu/drm/i915/i915_gem_gtt.c +231 -49
331 lines not on this page · raw message
drivers/gpu/drm/i915/i915_gem_gtt.h +34 -0
@@ -536,6 +536,40 @@ i915_vm_to_ggtt(struct i915_address_space *vm) return container_of(vm, struct i915_ggtt, base); } +#define INTEL_MAX_PPAT_ENTRIES 8 +#define INTEL_PPAT_PERFECT_MATCH (~0U) + +struct intel_ppat ; + +struct intel_ppat_entry { +struct intel_ppat *ppat; +struct kref ref_count; +u8 value; +}; + +struct intel_ppat { +struct intel_ppat_entry entries[INTEL_MAX_PPAT_ENTRIES ]; + DECLARE_BITMAP(used, INTEL_MAX_PPAT_ENTRIES); + DECLARE_BITMAP(dirty, INTEL_MAX_PPAT_ENTRIES); + +unsigned int max_entries; + +u8 dummy_value; +/* +* Return a score to show how two PPAT values match, +* a INTEL_PPAT_PERFECT_MATCH indicates a perfect match +*/ +unsigned int (*match)(u8 src,u8 dst); +/* Write the PPAT configuration into HW. */ +void (*update)(struct drm_i915_private *i915); + +struct drm_i915_private *i915; +}; + +const struct intel_ppat_entry *intel_ppat_get (struct drm_i915_private *i915, +u8 value); +void intel_ppat_put (const struct intel_ppat_entry *entry); +int i915_gem_init_aliasing_ppgtt (struct drm_i915_private *i915);void i915_gem_fini_aliasing_ppgtt (struct drm_i915_private *i915);
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx