* [PATCH] drm/i915: Move EDRAM capability bits to intel_driver_caps
@ 2018-02-09 11:29 Chris Wilson
2018-02-09 11:31 ` Chris Wilson
2018-02-09 15:12 ` ✗ Fi.CI.BAT: failure for " Patchwork
0 siblings, 2 replies; 4+ messages in thread
From: Chris Wilson @ 2018-02-09 11:29 UTC (permalink / raw)
To: intel-gfx
Move the storage of the runtime discovery of EDRAM to intel_driver_caps
so that we include it in all the relevant error state dumping and
debugging.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
Or do we want to keep driver_caps only for driver related info, and move
this sort of runtime discovery to intel_runtime_info? With the intention
of killing off all remaining mkwrite_intel_info()
-Chris
---
drivers/gpu/drm/i915/i915_drv.h | 5 +----
drivers/gpu/drm/i915/intel_device_info.c | 1 +
drivers/gpu/drm/i915/intel_device_info.h | 1 +
drivers/gpu/drm/i915/intel_uncore.c | 8 +++-----
4 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 7db3557b945c..b70803c3e4cf 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -2040,9 +2040,6 @@ struct drm_i915_private {
struct intel_l3_parity l3_parity;
- /* Cannot be determined by PCIID. You must always read a register. */
- u32 edram_cap;
-
/*
* Protects RPS/RC6 register access and PCU communication.
* Must be taken after struct_mutex if nested. Note that
@@ -2746,7 +2743,7 @@ intel_info(const struct drm_i915_private *dev_priv)
#define HAS_LLC(dev_priv) ((dev_priv)->info.has_llc)
#define HAS_SNOOP(dev_priv) ((dev_priv)->info.has_snoop)
-#define HAS_EDRAM(dev_priv) (!!((dev_priv)->edram_cap & EDRAM_ENABLED))
+#define HAS_EDRAM(dev_priv) (!!((dev_priv)->caps.edram & EDRAM_ENABLED))
#define HAS_WT(dev_priv) ((IS_HASWELL(dev_priv) || \
IS_BROADWELL(dev_priv)) && HAS_EDRAM(dev_priv))
diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
index 298f8996cc54..dd1ade7479ce 100644
--- a/drivers/gpu/drm/i915/intel_device_info.c
+++ b/drivers/gpu/drm/i915/intel_device_info.c
@@ -590,5 +590,6 @@ void intel_device_info_runtime_init(struct intel_device_info *info)
void intel_driver_caps_print(const struct intel_driver_caps *caps,
struct drm_printer *p)
{
+ drm_printf(p, "EDRAM: %x\n", caps->edram);
drm_printf(p, "scheduler: %x\n", caps->scheduler);
}
diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index 71fdfb0451ef..f5d09e5c5fb3 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -168,6 +168,7 @@ struct intel_device_info {
};
struct intel_driver_caps {
+ u32 edram; /* Cannot be determined by PCIID, only from a register. */
unsigned int scheduler;
};
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
index e09981a3113c..d3e642800bc3 100644
--- a/drivers/gpu/drm/i915/intel_uncore.c
+++ b/drivers/gpu/drm/i915/intel_uncore.c
@@ -419,7 +419,7 @@ static u64 gen9_edram_size(struct drm_i915_private *dev_priv)
{
const unsigned int ways[8] = { 4, 8, 12, 16, 16, 16, 16, 16 };
const unsigned int sets[4] = { 1, 1, 2, 2 };
- const u32 cap = dev_priv->edram_cap;
+ const u32 cap = dev_priv->caps.edram;
return EDRAM_NUM_BANKS(cap) *
ways[EDRAM_WAYS_IDX(cap)] *
@@ -446,13 +446,11 @@ static void intel_uncore_edram_detect(struct drm_i915_private *dev_priv)
if (IS_HASWELL(dev_priv) ||
IS_BROADWELL(dev_priv) ||
INTEL_GEN(dev_priv) >= 9) {
- dev_priv->edram_cap = __raw_i915_read32(dev_priv,
- HSW_EDRAM_CAP);
+ dev_priv->caps.edram =
+ __raw_i915_read32(dev_priv, HSW_EDRAM_CAP);
/* NB: We can't write IDICR yet because we do not have gt funcs
* set up */
- } else {
- dev_priv->edram_cap = 0;
}
if (HAS_EDRAM(dev_priv))
--
2.16.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Move EDRAM capability bits to intel_driver_caps
2018-02-09 11:29 [PATCH] drm/i915: Move EDRAM capability bits to intel_driver_caps Chris Wilson
@ 2018-02-09 11:31 ` Chris Wilson
2018-02-09 12:09 ` Jani Nikula
2018-02-09 15:12 ` ✗ Fi.CI.BAT: failure for " Patchwork
1 sibling, 1 reply; 4+ messages in thread
From: Chris Wilson @ 2018-02-09 11:31 UTC (permalink / raw)
To: intel-gfx
Quoting Chris Wilson (2018-02-09 11:29:08)
> Move the storage of the runtime discovery of EDRAM to intel_driver_caps
> so that we include it in all the relevant error state dumping and
> debugging.
>
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>
> Or do we want to keep driver_caps only for driver related info, and move
> this sort of runtime discovery to intel_runtime_info? With the intention
> of killing off all remaining mkwrite_intel_info()
I think I prefer a new intel_runtime_info, then we have
static intel_device_info,
write-once (hopefully!) intel_runtime_info,
mutable intel_driver_caps
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/i915: Move EDRAM capability bits to intel_driver_caps
2018-02-09 11:31 ` Chris Wilson
@ 2018-02-09 12:09 ` Jani Nikula
0 siblings, 0 replies; 4+ messages in thread
From: Jani Nikula @ 2018-02-09 12:09 UTC (permalink / raw)
To: Chris Wilson, intel-gfx
On Fri, 09 Feb 2018, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> Quoting Chris Wilson (2018-02-09 11:29:08)
>> Move the storage of the runtime discovery of EDRAM to intel_driver_caps
>> so that we include it in all the relevant error state dumping and
>> debugging.
>>
>> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>> ---
>>
>> Or do we want to keep driver_caps only for driver related info, and move
>> this sort of runtime discovery to intel_runtime_info? With the intention
>> of killing off all remaining mkwrite_intel_info()
>
> I think I prefer a new intel_runtime_info, then we have
>
> static intel_device_info,
> write-once (hopefully!) intel_runtime_info,
> mutable intel_driver_caps
Yeah, I'd like to see mkwrite_intel_info() go.
I suppose struct drm_i915_private would then have a const pointer field
to device info? That's one painful change. I think better to go with
changing everything to use INTEL_INFO() (or intel_info()?) first. Auch.
BR,
Jani.
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: Move EDRAM capability bits to intel_driver_caps
2018-02-09 11:29 [PATCH] drm/i915: Move EDRAM capability bits to intel_driver_caps Chris Wilson
2018-02-09 11:31 ` Chris Wilson
@ 2018-02-09 15:12 ` Patchwork
1 sibling, 0 replies; 4+ messages in thread
From: Patchwork @ 2018-02-09 15:12 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Move EDRAM capability bits to intel_driver_caps
URL : https://patchwork.freedesktop.org/series/37996/
State : failure
== Summary ==
Series 37996v1 drm/i915: Move EDRAM capability bits to intel_driver_caps
https://patchwork.freedesktop.org/api/1.0/series/37996/revisions/1/mbox/
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledx:
fail -> PASS (fi-gdg-551) fdo#102575
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
pass -> DMESG-FAIL (fi-kbl-7567u)
Subgroup suspend-read-crc-pipe-b:
incomplete -> PASS (fi-snb-2520m) fdo#103713
pass -> SKIP (fi-kbl-7567u)
Subgroup suspend-read-crc-pipe-c:
pass -> SKIP (fi-kbl-7567u)
Test pm_rpm:
Subgroup basic-pci-d3-state:
pass -> SKIP (fi-kbl-7567u)
Subgroup basic-rte:
pass -> SKIP (fi-kbl-7567u)
Test prime_vgem:
Subgroup basic-fence-flip:
pass -> SKIP (fi-kbl-7567u)
Test drv_module_reload:
Subgroup basic-reload:
pass -> DMESG-WARN (fi-kbl-7567u)
Subgroup basic-no-display:
pass -> DMESG-WARN (fi-kbl-7567u)
Subgroup basic-reload-inject:
pass -> DMESG-WARN (fi-kbl-7567u)
fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:419s
fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:426s
fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:375s
fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:488s
fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:287s
fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:481s
fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:484s
fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:466s
fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:464s
fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:571s
fi-cnl-y3 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:576s
fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:416s
fi-gdg-551 total:288 pass:180 dwarn:0 dfail:0 fail:0 skip:108 time:282s
fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:511s
fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:391s
fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:410s
fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:458s
fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:413s
fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:460s
fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:503s
fi-kbl-7567u total:288 pass:259 dwarn:3 dfail:1 fail:0 skip:25 time:407s
fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:497s
fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:603s
fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:427s
fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:504s
fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:524s
fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:487s
fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:480s
fi-skl-guc total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:412s
fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:429s
fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:528s
fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:393s
Blacklisted hosts:
fi-glk-dsi total:230 pass:202 dwarn:0 dfail:1 fail:0 skip:26
6c10ba221576c523e2574d83e75a87cdc7b0bc1e drm-tip: 2018y-02m-08d-19h-13m-44s UTC integration manifest
2c46b7f42302 drm/i915: Move EDRAM capability bits to intel_driver_caps
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_7966/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-02-09 15:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-09 11:29 [PATCH] drm/i915: Move EDRAM capability bits to intel_driver_caps Chris Wilson
2018-02-09 11:31 ` Chris Wilson
2018-02-09 12:09 ` Jani Nikula
2018-02-09 15:12 ` ✗ Fi.CI.BAT: failure for " Patchwork
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.