* [PATCH] drm/i915: Respect ring_mask when initializing forcewake domains
@ 2016-12-05 13:16 Wang Elaine
2016-12-05 18:57 ` ✓ Fi.CI.BAT: success for " Patchwork
2016-12-07 13:54 ` [PATCH] " Joonas Lahtinen
0 siblings, 2 replies; 3+ messages in thread
From: Wang Elaine @ 2016-12-05 13:16 UTC (permalink / raw)
To: intel-gfx
From: Elaine Wang <elaine.wang@intel.com>
Some platforms don't have render or blitter. So no need to call
render domain or blitter domain forcewake init function.
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Elaine Wang <elaine.wang@intel.com>
---
drivers/gpu/drm/i915/intel_uncore.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index 07779d0..6ab3b43 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -1288,14 +1288,20 @@ static void intel_uncore_fw_domains_init(struct drm_i915_private *dev_priv)
if (IS_GEN9(dev_priv)) {
dev_priv->uncore.funcs.force_wake_get = fw_domains_get;
dev_priv->uncore.funcs.force_wake_put = fw_domains_put;
- fw_domain_init(dev_priv, FW_DOMAIN_ID_RENDER,
- FORCEWAKE_RENDER_GEN9,
- FORCEWAKE_ACK_RENDER_GEN9);
- fw_domain_init(dev_priv, FW_DOMAIN_ID_BLITTER,
- FORCEWAKE_BLITTER_GEN9,
- FORCEWAKE_ACK_BLITTER_GEN9);
- fw_domain_init(dev_priv, FW_DOMAIN_ID_MEDIA,
- FORCEWAKE_MEDIA_GEN9, FORCEWAKE_ACK_MEDIA_GEN9);
+ if (HAS_ENGINE(dev_priv, RCS))
+ fw_domain_init(dev_priv, FW_DOMAIN_ID_RENDER,
+ FORCEWAKE_RENDER_GEN9,
+ FORCEWAKE_ACK_RENDER_GEN9);
+
+ if (HAS_ENGINE(dev_priv, BCS))
+ fw_domain_init(dev_priv, FW_DOMAIN_ID_BLITTER,
+ FORCEWAKE_BLITTER_GEN9,
+ FORCEWAKE_ACK_BLITTER_GEN9);
+
+ if (HAS_ENGINE(dev_priv, VCS))
+ fw_domain_init(dev_priv, FW_DOMAIN_ID_MEDIA,
+ FORCEWAKE_MEDIA_GEN9,
+ FORCEWAKE_ACK_MEDIA_GEN9);
} else if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
dev_priv->uncore.funcs.force_wake_get = fw_domains_get;
if (!IS_CHERRYVIEW(dev_priv))
--
1.9.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread
* ✓ Fi.CI.BAT: success for drm/i915: Respect ring_mask when initializing forcewake domains
2016-12-05 13:16 [PATCH] drm/i915: Respect ring_mask when initializing forcewake domains Wang Elaine
@ 2016-12-05 18:57 ` Patchwork
2016-12-07 13:54 ` [PATCH] " Joonas Lahtinen
1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2016-12-05 18:57 UTC (permalink / raw)
To: Wang Elaine; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Respect ring_mask when initializing forcewake domains
URL : https://patchwork.freedesktop.org/series/16362/
State : success
== Summary ==
Series 16362v1 drm/i915: Respect ring_mask when initializing forcewake domains
https://patchwork.freedesktop.org/api/1.0/series/16362/revisions/1/mbox/
Test gem_busy:
Subgroup basic-hang-default:
fail -> PASS (fi-hsw-4770r)
fi-bdw-5557u total:247 pass:232 dwarn:0 dfail:0 fail:0 skip:15
fi-bsw-n3050 total:247 pass:207 dwarn:0 dfail:0 fail:0 skip:40
fi-byt-j1900 total:247 pass:219 dwarn:0 dfail:0 fail:0 skip:28
fi-byt-n2820 total:247 pass:215 dwarn:0 dfail:0 fail:0 skip:32
fi-hsw-4770 total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20
fi-hsw-4770r total:247 pass:227 dwarn:0 dfail:0 fail:0 skip:20
fi-ilk-650 total:247 pass:194 dwarn:0 dfail:0 fail:0 skip:53
fi-ivb-3520m total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22
fi-ivb-3770 total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22
fi-kbl-7500u total:247 pass:225 dwarn:0 dfail:0 fail:0 skip:22
fi-skl-6260u total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14
fi-skl-6700hq total:247 pass:226 dwarn:0 dfail:0 fail:0 skip:21
fi-skl-6770hq total:247 pass:233 dwarn:0 dfail:0 fail:0 skip:14
fi-snb-2520m total:247 pass:215 dwarn:0 dfail:0 fail:0 skip:32
fi-snb-2600 total:247 pass:214 dwarn:0 dfail:0 fail:0 skip:33
a947529bb652fdcf50e8c0e8ee5102b737bae23e drm-tip: 2016y-12m-05d-14h-27m-06s UTC integration manifest
7497642 drm/i915: Respect ring_mask when initializing forcewake domains
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3192/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: Respect ring_mask when initializing forcewake domains
2016-12-05 13:16 [PATCH] drm/i915: Respect ring_mask when initializing forcewake domains Wang Elaine
2016-12-05 18:57 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2016-12-07 13:54 ` Joonas Lahtinen
1 sibling, 0 replies; 3+ messages in thread
From: Joonas Lahtinen @ 2016-12-07 13:54 UTC (permalink / raw)
To: Wang Elaine, intel-gfx
On ma, 2016-12-05 at 21:16 +0800, Wang Elaine wrote:
> From: Elaine Wang <elaine.wang@intel.com>
>
> Some platforms don't have render or blitter. So no need to call
> render domain or blitter domain forcewake init function.
>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Signed-off-by: Elaine Wang <elaine.wang@intel.com>
I sent an additional patch to the mailing list that would catch any
rogue accesses. If you could test with it in combination to this
change, I would be ready to merge this patch if no problems arise.
The patch is;
Author: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Date: Wed Dec 7 15:40:13 2016 +0200
drm/i915: Catch non-existent registers in find_fw_domain
Regards, Joonas
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-12-07 13:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-05 13:16 [PATCH] drm/i915: Respect ring_mask when initializing forcewake domains Wang Elaine
2016-12-05 18:57 ` ✓ Fi.CI.BAT: success for " Patchwork
2016-12-07 13:54 ` [PATCH] " Joonas Lahtinen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.