diff mbox series

drm/i915: fix subslice mask array size

Message ID 20181106182918.5748-1-daniele.ceraolospurio@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/i915: fix subslice mask array size | expand

Commit Message

Daniele Ceraolo Spurio Nov. 6, 2018, 6:29 p.m. UTC
We have a subslice mask per slice, not per subslice.
MAX_SUBSLICES > MAX_SLICES, so the wrong size didn't cause any issue
apart from using extra memory.

Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
---
 drivers/gpu/drm/i915/intel_device_info.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Lionel Landwerlin Nov. 6, 2018, 6:33 p.m. UTC | #1
On 06/11/2018 18:29, Daniele Ceraolo Spurio wrote:
> We have a subslice mask per slice, not per subslice.
> MAX_SUBSLICES > MAX_SLICES, so the wrong size didn't cause any issue
> apart from using extra memory.
>
> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>

Indeed!
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>

Thanks,

-
Lionel


> ---
>   drivers/gpu/drm/i915/intel_device_info.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
> index 86ce1db1b33a..88f97210dc49 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.h
> +++ b/drivers/gpu/drm/i915/intel_device_info.h
> @@ -124,7 +124,7 @@ enum intel_ppgtt {
>   
>   struct sseu_dev_info {
>   	u8 slice_mask;
> -	u8 subslice_mask[GEN_MAX_SUBSLICES];
> +	u8 subslice_mask[GEN_MAX_SLICES];
>   	u16 eu_total;
>   	u8 eu_per_subslice;
>   	u8 min_eu_in_pool;
Daniele Ceraolo Spurio Nov. 8, 2018, 10:03 p.m. UTC | #2
On 07/11/2018 08:10, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915: fix subslice mask array size
> URL   : https://patchwork.freedesktop.org/series/52110/
> State : success
> 
> == Summary ==
> 
> = CI Bug Log - changes from CI_DRM_5096_full -> Patchwork_10742_full =
> 
> == Summary - WARNING ==
> 
>    Minor unknown changes coming with Patchwork_10742_full need to be verified
>    manually.
>    
>    If you think the reported changes have nothing to do with the changes
>    introduced in Patchwork_10742_full, please notify your bug team to allow them
>    to document this new failure mode, which will reduce false positives in CI.
> 
>    
> 
> == Possible new issues ==
> 
>    Here are the unknown changes that may have been introduced in Patchwork_10742_full:
> 
>    === IGT changes ===
> 
>      ==== Warnings ====
> 
>      igt@kms_chv_cursor_fail@pipe-b-64x64-right-edge:
>        shard-snb:          PASS -> SKIP +3

looks like the connector on the machine disconnected:

	No valid connector found on pipe A
	No valid connector found on pipe B
	Subtest pipe-B-64x64-right-edge: SKIP

Daniele

> 
>      igt@pm_rc6_residency@rc6-accuracy:
>        shard-kbl:          SKIP -> PASS
> 
>      
> == Known issues ==
> 
>    Here are the changes found in Patchwork_10742_full that come from known issues:
> 
>    === IGT changes ===
> 
>      ==== Issues hit ====
> 
>      igt@gem_eio@in-flight-1us:
>        shard-glk:          PASS -> INCOMPLETE (fdo#103359, k.org#198133)
> 
>      igt@gem_exec_schedule@pi-ringfull-vebox:
>        shard-skl:          NOTRUN -> FAIL (fdo#103158)
> 
>      igt@gem_softpin@noreloc-s3:
>        shard-skl:          PASS -> INCOMPLETE (fdo#104108, fdo#107773)
> 
>      igt@kms_atomic_transition@1x-modeset-transitions-nonblocking:
>        shard-apl:          PASS -> DMESG-WARN (fdo#105602, fdo#103558) +9
> 
>      igt@kms_busy@extended-modeset-hang-newfb-render-b:
>        shard-skl:          NOTRUN -> DMESG-WARN (fdo#107956)
> 
>      igt@kms_cursor_crc@cursor-128x128-onscreen:
>        shard-apl:          PASS -> FAIL (fdo#103232) +2
> 
>      igt@kms_flip@flip-vs-expired-vblank-interruptible:
>        shard-skl:          NOTRUN -> FAIL (fdo#105363)
> 
>      igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-mmap-cpu:
>        shard-apl:          PASS -> FAIL (fdo#103167) +1
> 
>      igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-onoff:
>        shard-glk:          PASS -> FAIL (fdo#103167) +2
> 
>      igt@kms_frontbuffer_tracking@psr-1p-primscrn-spr-indfb-draw-render:
>        shard-skl:          NOTRUN -> FAIL (fdo#103167)
> 
>      igt@kms_pipe_crc_basic@read-crc-pipe-c:
>        shard-skl:          PASS -> FAIL (fdo#107362)
> 
>      igt@kms_plane_alpha_blend@pipe-a-alpha-basic:
>        shard-skl:          NOTRUN -> FAIL (fdo#107815, fdo#108145)
> 
>      igt@kms_plane_alpha_blend@pipe-c-alpha-transparant-fb:
>        shard-skl:          NOTRUN -> FAIL (fdo#108145) +2
> 
>      igt@pm_rpm@sysfs-read:
>        shard-skl:          PASS -> INCOMPLETE (fdo#107807)
> 
>      
>      ==== Possible fixes ====
> 
>      igt@drv_suspend@shrink:
>        shard-glk:          INCOMPLETE (fdo#103359, k.org#198133, fdo#106886) -> PASS
> 
>      igt@gem_ctx_isolation@vcs0-s3:
>        shard-skl:          INCOMPLETE (fdo#104108, fdo#107773) -> PASS
> 
>      igt@gem_exec_reuse@baggage:
>        shard-apl:          DMESG-WARN (fdo#108690) -> PASS
> 
>      igt@gem_userptr_blits@readonly-unsync:
>        shard-skl:          INCOMPLETE (fdo#108074) -> PASS
> 
>      igt@kms_color@pipe-a-ctm-max:
>        shard-apl:          FAIL (fdo#108147) -> PASS
> 
>      igt@kms_cursor_crc@cursor-128x128-onscreen:
>        shard-glk:          FAIL (fdo#103232) -> PASS
> 
>      igt@kms_cursor_crc@cursor-128x128-sliding:
>        shard-apl:          FAIL (fdo#103232) -> PASS
> 
>      igt@kms_draw_crc@draw-method-xrgb2101010-blt-untiled:
>        shard-skl:          FAIL (fdo#103184) -> PASS
> 
>      igt@kms_draw_crc@draw-method-xrgb2101010-mmap-wc-untiled:
>        shard-skl:          FAIL (fdo#103232, fdo#103184) -> PASS
> 
>      igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
>        shard-hsw:          FAIL (fdo#102887) -> PASS
> 
>      igt@kms_flip_tiling@flip-to-yf-tiled:
>        shard-skl:          FAIL (fdo#107931) -> PASS
> 
>      igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-render:
>        shard-skl:          FAIL (fdo#105682) -> PASS
> 
>      igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
>        shard-apl:          FAIL (fdo#103167) -> PASS +3
> 
>      igt@kms_frontbuffer_tracking@fbc-2p-primscrn-spr-indfb-draw-mmap-cpu:
>        shard-glk:          FAIL (fdo#103167) -> PASS
> 
>      igt@kms_frontbuffer_tracking@psr-1p-primscrn-pri-indfb-draw-pwrite:
>        shard-skl:          FAIL (fdo#103167) -> PASS +1
> 
>      igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
>        shard-skl:          FAIL (fdo#107815) -> PASS
> 
>      igt@kms_plane_multiple@atomic-pipe-a-tiling-x:
>        shard-apl:          FAIL (fdo#103166) -> PASS +2
> 
>      igt@kms_setmode@basic:
>        shard-apl:          FAIL (fdo#99912) -> PASS
> 
>      igt@pm_rpm@dpms-lpsp:
>        shard-skl:          INCOMPLETE (fdo#107807) -> PASS +2
> 
>      igt@prime_busy@after-vebox:
>        shard-snb:          INCOMPLETE (fdo#105411) -> SKIP
> 
>      
>    fdo#102887 https://bugs.freedesktop.org/show_bug.cgi?id=102887
>    fdo#103158 https://bugs.freedesktop.org/show_bug.cgi?id=103158
>    fdo#103166 https://bugs.freedesktop.org/show_bug.cgi?id=103166
>    fdo#103167 https://bugs.freedesktop.org/show_bug.cgi?id=103167
>    fdo#103184 https://bugs.freedesktop.org/show_bug.cgi?id=103184
>    fdo#103232 https://bugs.freedesktop.org/show_bug.cgi?id=103232
>    fdo#103359 https://bugs.freedesktop.org/show_bug.cgi?id=103359
>    fdo#103558 https://bugs.freedesktop.org/show_bug.cgi?id=103558
>    fdo#104108 https://bugs.freedesktop.org/show_bug.cgi?id=104108
>    fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
>    fdo#105411 https://bugs.freedesktop.org/show_bug.cgi?id=105411
>    fdo#105602 https://bugs.freedesktop.org/show_bug.cgi?id=105602
>    fdo#105682 https://bugs.freedesktop.org/show_bug.cgi?id=105682
>    fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
>    fdo#107362 https://bugs.freedesktop.org/show_bug.cgi?id=107362
>    fdo#107773 https://bugs.freedesktop.org/show_bug.cgi?id=107773
>    fdo#107807 https://bugs.freedesktop.org/show_bug.cgi?id=107807
>    fdo#107815 https://bugs.freedesktop.org/show_bug.cgi?id=107815
>    fdo#107931 https://bugs.freedesktop.org/show_bug.cgi?id=107931
>    fdo#107956 https://bugs.freedesktop.org/show_bug.cgi?id=107956
>    fdo#108074 https://bugs.freedesktop.org/show_bug.cgi?id=108074
>    fdo#108145 https://bugs.freedesktop.org/show_bug.cgi?id=108145
>    fdo#108147 https://bugs.freedesktop.org/show_bug.cgi?id=108147
>    fdo#108690 https://bugs.freedesktop.org/show_bug.cgi?id=108690
>    fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
>    k.org#198133 https://bugzilla.kernel.org/show_bug.cgi?id=198133
> 
> 
> == Participating hosts (6 -> 6) ==
> 
>    No changes in participating hosts
> 
> 
> == Build changes ==
> 
>      * Linux: CI_DRM_5096 -> Patchwork_10742
> 
>    CI_DRM_5096: 9dd45e92a3e9b238d044adde1061a8ee0ce24b73 @ git://anongit.freedesktop.org/gfx-ci/linux
>    IGT_4711: cc41f4c921e56c62c85ec5349c47022ae9b5f008 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
>    Patchwork_10742: 89ede27c7244afba92bd286660421ef0ec0e4d8a @ git://anongit.freedesktop.org/gfx-ci/linux
>    piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
> 
> == Logs ==
> 
> For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_10742/shards.html
>
Daniele Ceraolo Spurio Nov. 9, 2018, 9:33 p.m. UTC | #3
On 06/11/2018 10:33, Lionel Landwerlin wrote:
> On 06/11/2018 18:29, Daniele Ceraolo Spurio wrote:
>> We have a subslice mask per slice, not per subslice.
>> MAX_SUBSLICES > MAX_SLICES, so the wrong size didn't cause any issue
>> apart from using extra memory.
>>
>> Cc: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
>> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> 
> Indeed!
> Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
> > Thanks,
> 
> -
> Lionel
>

Pushed, thanks for the review.

Daniele

> 
>> ---
>>   drivers/gpu/drm/i915/intel_device_info.h | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_device_info.h 
>> b/drivers/gpu/drm/i915/intel_device_info.h
>> index 86ce1db1b33a..88f97210dc49 100644
>> --- a/drivers/gpu/drm/i915/intel_device_info.h
>> +++ b/drivers/gpu/drm/i915/intel_device_info.h
>> @@ -124,7 +124,7 @@ enum intel_ppgtt {
>>   struct sseu_dev_info {
>>       u8 slice_mask;
>> -    u8 subslice_mask[GEN_MAX_SUBSLICES];
>> +    u8 subslice_mask[GEN_MAX_SLICES];
>>       u16 eu_total;
>>       u8 eu_per_subslice;
>>       u8 min_eu_in_pool;
> 
>
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/intel_device_info.h b/drivers/gpu/drm/i915/intel_device_info.h
index 86ce1db1b33a..88f97210dc49 100644
--- a/drivers/gpu/drm/i915/intel_device_info.h
+++ b/drivers/gpu/drm/i915/intel_device_info.h
@@ -124,7 +124,7 @@  enum intel_ppgtt {
 
 struct sseu_dev_info {
 	u8 slice_mask;
-	u8 subslice_mask[GEN_MAX_SUBSLICES];
+	u8 subslice_mask[GEN_MAX_SLICES];
 	u16 eu_total;
 	u8 eu_per_subslice;
 	u8 min_eu_in_pool;