drm/i915: Store number of active engines in device info
Subsystems (2)
PATCH 1/1 drm/i915: Store number of active engines in device info
From: Tvrtko Ursulin <[email protected]>
Until now code was calling hweight32 to figure out the number from device_info->ring_mask at runtime. Instead we can cache it at engine init time and use directly.
--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem_context.c | 2 +- drivers/gpu/drm/i915/intel_engine_cs.c | 10 +++++----- drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +++--- 5 files changed, 11 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_debugfs.c +1 -1
@@ -3226,7 +3226,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_engine_cs *engine; -int num_rings =hweight32 (INTEL_INFO (dev)->ring_mask); +int num_rings =INTEL_INFO (dev)->num_rings;enum intel_engine_id id;int j, ret;
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -793,6 +793,7 @@ struct intel_device_info {u8 gen;u16 gen_mask;u8 ring_mask;/* Rings supported by the HW */ +u8 num_rings;DEV_INFO_FOR_EACH_FLAG (DEFINE_FLAG ,SEP_SEMICOLON );/* Register offsets for the various display pipes and transcoders */ int pipe_offsets[I915_MAX_TRANSCODERS ];
drivers/gpu/drm/i915/i915_gem_context.c +1 -1
@@ -568,7 +568,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)const int num_rings =/* Use an extended w/a on ivb+ if signalling from other rings */ i915.semaphores ? -hweight32 (INTEL_INFO (dev_priv)->ring_mask) -1 : +INTEL_INFO (dev_priv)->num_rings -1 :0 ;int len, ret;
drivers/gpu/drm/i915/intel_engine_cs.c +5 -5
@@ -109,6 +109,7 @@ intel_engine_setup(struct drm_i915_private *dev_priv,int intel_engines_init (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_device_info *device_info =mkwrite_device_info (dev_priv);unsigned int mask =0 ;int (*init)(struct intel_engine_cs *engine);unsigned int i;
@@ -142,11 +143,10 @@ int intel_engines_init(struct drm_device *dev)* are added to the driver by a warning and disabling the forgotten * engines. */ -if (WARN_ON (mask !=INTEL_INFO (dev_priv)->ring_mask)) { -struct intel_device_info *info = - (struct intel_device_info *)&dev_priv->info; - info->ring_mask = mask; - } +if (WARN_ON (mask !=INTEL_INFO (dev_priv)->ring_mask)) + device_info->ring_mask = mask; + + device_info->num_rings =hweight32 (mask);return 0 ;
drivers/gpu/drm/i915/intel_ringbuffer.c +3 -3
@@ -1317,7 +1317,7 @@ static int gen8_rcs_signal(struct drm_i915_gem_request *req)enum intel_engine_id id;int ret, num_rings; - num_rings =hweight32 (INTEL_INFO (dev_priv)->ring_mask); + num_rings =INTEL_INFO (dev_priv)->num_rings; ret =intel_ring_begin (req, (num_rings-1 ) *8 );if (ret)return ret;
@@ -1354,7 +1354,7 @@ static int gen8_xcs_signal(struct drm_i915_gem_request *req)enum intel_engine_id id;int ret, num_rings; - num_rings =hweight32 (INTEL_INFO (dev_priv)->ring_mask); + num_rings =INTEL_INFO (dev_priv)->num_rings; ret =intel_ring_begin (req, (num_rings-1 ) *6 );if (ret)return ret;
@@ -1389,7 +1389,7 @@ static int gen6_signal(struct drm_i915_gem_request *req)enum intel_engine_id id;int ret, num_rings; - num_rings =hweight32 (INTEL_INFO (dev_priv)->ring_mask); + num_rings =INTEL_INFO (dev_priv)->num_rings; ret =intel_ring_begin (req,round_up ((num_rings-1 ) *3 ,2 ));if (ret)return ret;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 6 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Until now code was calling hweight32 to figure out the number from
device_info->ring_maskat runtime. Instead we can cache it at engine init time and use directly.
Quoted 8 lines
Signed-off-by Tvrtko Ursulin <[email protected]>--- drivers/gpu/drm/i915/i915_debugfs.c | 2 +- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem_context.c | 2 +- drivers/gpu/drm/i915/intel_engine_cs.c | 10 +++++----- drivers/gpu/drm/i915/intel_ringbuffer.c | 6 +++--- 5 files changed, 11 insertions(+), 10 deletions(-)
LGTM.
Quoted 90 lines
drivers/gpu/drm/i915/i915_debugfs.c +1
-1@@ -3226,7 +3226,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)struct drm_device *dev = node->minor->dev;struct drm_i915_private *dev_priv =to_i915 (dev);struct intel_engine_cs *engine; -int num_rings =hweight32 (INTEL_INFO (dev)->ring_mask); +int num_rings =INTEL_INFO (dev)->num_rings;enum intel_engine_id id;int j, ret;drivers/gpu/drm/i915/i915_drv.h +1
-0@@ -793,6 +793,7 @@ struct intel_device_info {u8 gen;u16 gen_mask;u8 ring_mask;/* Rings supported by the HW */ +u8 num_rings;DEV_INFO_FOR_EACH_FLAG (DEFINE_FLAG ,SEP_SEMICOLON );/* Register offsets for the various display pipes and transcoders */ int pipe_offsets[I915_MAX_TRANSCODERS ];drivers/gpu/drm/i915/i915_gem_context.c +1
-1@@ -568,7 +568,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 hw_flags)const int num_rings =/* Use an extended w/a on ivb+ if signalling from other rings */ i915.semaphores ? -hweight32 (INTEL_INFO (dev_priv)->ring_mask) -1 : +INTEL_INFO (dev_priv)->num_rings -1 :0 ;int len, ret;drivers/gpu/drm/i915/intel_engine_cs.c +5
-5@@ -109,6 +109,7 @@ intel_engine_setup(struct drm_i915_private *dev_priv,int intel_engines_init (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev); +struct intel_device_info *device_info =mkwrite_device_info (dev_priv);unsigned int mask =0 ;int (*init)(struct intel_engine_cs *engine);unsigned int i;@@ -142,11 +143,10 @@ int intel_engines_init(struct drm_device *dev)* are added to the driver by a warning and disabling the forgotten * engines. */ -if (WARN_ON (mask !=INTEL_INFO (dev_priv)->ring_mask)) { -struct intel_device_info *info = - (struct intel_device_info *)&dev_priv->info; - info->ring_mask = mask; - } +if (WARN_ON (mask !=INTEL_INFO (dev_priv)->ring_mask)) + device_info->ring_mask = mask; + + device_info->num_rings =hweight32 (mask);return 0 ;drivers/gpu/drm/i915/intel_ringbuffer.c +2
-2@@ -1317,7 +1317,7 @@ static int gen8_rcs_signal(struct drm_i915_gem_request *req)enum intel_engine_id id;int ret, num_rings; - num_rings =hweight32 (INTEL_INFO (dev_priv)->ring_mask); + num_rings =INTEL_INFO (dev_priv)->num_rings; ret =intel_ring_begin (req, (num_rings-1 ) *8 );if (ret)return ret;@@ -1354,7 +1354,7 @@ static int gen8_xcs_signal(struct drm_i915_gem_request *req)enum intel_engine_id id;int ret, num_rings; - num_rings =hweight32 (INTEL_INFO (dev_priv)->ring_mask); + num_rings =INTEL_INFO (dev_priv)->num_rings; ret =intel_ring_begin (req, (num_rings-1 ) *6 );if (ret)return ret;
drivers/gpu/drm/i915/intel_ringbuffer.c static int gen6_signal(struct drm_i915_gem_request *req) · line 1395
Quoted 8 lines
drivers/gpu/drm/i915/intel_ringbuffer.c +1
-1@@ -1389,7 +1389,7 @@ static int gen6_signal(struct drm_i915_gem_request *req)enum intel_engine_id id;int ret, num_rings; - num_rings =hweight32 (INTEL_INFO (dev_priv)->ring_mask); + num_rings =INTEL_INFO (dev_priv)->num_rings; ret =intel_ring_begin (req,round_up ((num_rings-1 ) *3 ,2 ));if (ret)return ret;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 5 lines · Tvrtko Ursulin
From: Tvrtko Ursulin <[email protected]>
Until now code was calling hweight32 to figure out the number from
device_info->ring_maskat runtime. Instead we can cache it at engine init time and use directly.
And calling hweight32() rather than hweight() on a u8.
Quoted 1 line
Signed-off-by Tvrtko Ursulin <[email protected]>
Momentary concern as I had 4 hweights inside intel_ringbuffer.c - then realised I've a patch to add one more.
-Chris
Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Ro.CI.BAT: failure for drm/i915: Store number of active engines in device info
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: drm/i915: Store number of active engines in device info
URL : https://patchwork.freedesktop.org/series/10921/
State : failure
== Summary ==
Series 10921v1 drm/i915: Store number of active engines in device info
http://patchwork.freedesktop.org/api/1.0/series/10921/revisions/1/mbox
Test kms_cursor_legacy:
Subgroup basic-cursor-vs-flip-varying-size:
fail -> PASS (ro-ilk1-i5-650)
Subgroup basic-flip-vs-cursor-legacy:
fail -> PASS (ro-skl3-i5-6260u)
fail -> PASS (ro-bdw-i7-5557U)
Subgroup basic-flip-vs-cursor-varying-size:
fail -> PASS (ro-bdw-i5-5250u)
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-b-frame-sequence:
pass -> FAIL (ro-bdw-i7-5600u)
Subgroup suspend-read-crc-pipe-b:
dmesg-warn -> SKIP (ro-bdw-i7-5557U)
Subgroup suspend-read-crc-pipe-c:
skip -> DMESG-WARN (ro-bdw-i5-5250u)ro-bdw-i5-5250u total:240 pass:219 dwarn:2 dfail:0 fail:1 skip:18 ro-bdw-i7-5557U total:240 pass:220 dwarn:1 dfail:0 fail:0 skip:19 ro-bdw-i7-5600u total:240 pass:206 dwarn:0 dfail:0 fail:2 skip:32 ro-bsw-n3050 total:240 pass:194 dwarn:0 dfail:0 fail:4 skip:42 ro-byt-n2820 total:240 pass:197 dwarn:0 dfail:0 fail:3 skip:40 ro-hsw-i3-4010u total:240 pass:214 dwarn:0 dfail:0 fail:0 skip:26 ro-hsw-i7-4770r total:240 pass:214 dwarn:0 dfail:0 fail:0 skip:26 ro-ilk1-i5-650 total:235 pass:174 dwarn:0 dfail:0 fail:1 skip:60 ro-ivb-i7-3770 total:240 pass:205 dwarn:0 dfail:0 fail:0 skip:35 ro-ivb2-i7-3770 total:240 pass:209 dwarn:0 dfail:0 fail:0 skip:31 ro-skl3-i5-6260u total:240 pass:223 dwarn:0 dfail:0 fail:3 skip:14
Results at /archive/results/CI_IGT_test/RO_Patchwork_1825/
3aec82c drm-intel-nightly: 2016y-08m-10d-15h-08m-03s UTC integration manifest 11c946d drm/i915: Store number of active engines in device info
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Tvrtko Ursulin
AppliedRe: ✗ Ro.CI.BAT: failure for drm/i915: Store number of active engines in device info
Quoted 12 lines · Patchwork
== Series Details ==
Series: drm/i915: Store number of active engines in device info
URL : https://patchwork.freedesktop.org/series/10921/
State : failure== Summary ==
Series 10921v1 drm/i915: Store number of active engines in device info
http://patchwork.freedesktop.org/api/1.0/series/10921/revisions/1/mboxTest
kms_cursor_legacy:
Quoted 10 lines
Subgroup basic-cursor-vs-flip-varying-size:
fail -> PASS (ro-ilk1-i5-650)
Subgroup basic-flip-vs-cursor-legacy:
fail -> PASS (ro-skl3-i5-6260u)
fail -> PASS (ro-bdw-i7-5557U)
Subgroup basic-flip-vs-cursor-varying-size:
fail -> PASS (ro-bdw-i5-5250u)
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-b-frame-sequence:
pass -> FAIL (ro-bdw-i7-5600u)(kms_pipe_crc_basic:8255) CRITICAL: Failed assertion: crcs[j].frame + 1 == crcs[j + 1].frame
Some modesetting problem, no idea, raised a new bug:
https://bugs.freedesktop.org/show_bug.cgi?id=97294
Quoted 4 lines
Subgroup suspend-read-crc-pipe-b:
dmesg-warn -> SKIP (ro-bdw-i7-5557U)
Subgroup suspend-read-crc-pipe-c:
skip -> DMESG-WARN (ro-bdw-i5-5250u)https://bugs.freedesktop.org/show_bug.cgi?id=96614
[ 482.345981] [drm:intel_dp_link_training_clock_recovery [i915]] *ERROR* failed to enable link training [ 482.431185] [drm:intel_dp_start_link_train [i915]] *ERROR* failed to start channel equalization
Quoted 13 lines
ro-bdw-i5-5250u total:240 pass:219 dwarn:2 dfail:0 fail:1 skip:18 ro-bdw-i7-5557U total:240 pass:220 dwarn:1 dfail:0 fail:0 skip:19 ro-bdw-i7-5600u total:240 pass:206 dwarn:0 dfail:0 fail:2 skip:32 ro-bsw-n3050 total:240 pass:194 dwarn:0 dfail:0 fail:4 skip:42 ro-byt-n2820 total:240 pass:197 dwarn:0 dfail:0 fail:3 skip:40 ro-hsw-i3-4010u total:240 pass:214 dwarn:0 dfail:0 fail:0 skip:26 ro-hsw-i7-4770r total:240 pass:214 dwarn:0 dfail:0 fail:0 skip:26 ro-ilk1-i5-650 total:235 pass:174 dwarn:0 dfail:0 fail:1 skip:60 ro-ivb-i7-3770 total:240 pass:205 dwarn:0 dfail:0 fail:0 skip:35 ro-ivb2-i7-3770 total:240 pass:209 dwarn:0 dfail:0 fail:0 skip:31 ro-skl3-i5-6260u total:240 pass:223 dwarn:0 dfail:0 fail:3 skip:14
Quoted 4 lines
Results at /archive/results/CI_IGT_test/RO_Patchwork_1825/
3aec82c drm-intel-nightly: 2016y-08m-10d-15h-08m-03s UTC integration manifest 11c946d drm/i915: Store number of active engines in device info
Merged to dinq, thanks for the review!
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx