drm/kmb: Fix for build errors with Warray-bounds
Subsystems (2)
Anitha Chrisanthus
maintainerPATCH 1/1 drm/kmb: Fix for build errors with Warray-bounds
This fixes the following build error
drivers/gpu/drm/kmb/kmb_plane.c: In function 'kmb_plane_atomic_disable':drivers/gpu/drm/kmb/kmb_plane.c:165:34: error: array subscript 3 is above array bounds of 'struct layer_status[2]' [-Werror=array-bounds]
165 | kmb->plane_status[plane_id].ctrl =
LCD_CTRL_GL2_ENABLE;
| ~~~~~~~~~~~~~~~~~^~~~~~~~~~
In file included from drivers/gpu/drm/kmb/kmb_plane.c:17:
drivers/gpu/drm/kmb/kmb_drv.h:61:41: note: while referencing 'plane_status'
61 | struct layer_status
plane_status[KMB_MAX_PLANES];
| ^~~~~~~~~~~~
drivers/gpu/drm/kmb/kmb_plane.c:162:34: error: array subscript 2 is above array bounds of 'struct layer_status[2]' [-Werror=array-bounds]
162 |
kmb->plane_status[plane_id].ctrl =
LCD_CTRL_GL1_ENABLE;
| ~~~~~~~~~~~~~~~~~^~~~~~~~~~
In file included from
drivers/gpu/drm/kmb/kmb_plane.c:17:
drivers/gpu/drm/kmb/kmb_drv.h:61:41: note:
while referencing 'plane_status'
61 | struct layer_status
plane_status[KMB_MAX_PLANES];
|
^~~~~~~~~~~~
--- drivers/gpu/drm/kmb/kmb_plane.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/gpu/drm/kmb/kmb_plane.c +0 -6
@@ -158,12 +158,6 @@ static void kmb_plane_atomic_disable(struct drm_plane *plane,case LAYER_1 : kmb->plane_status[plane_id].ctrl =LCD_CTRL_VL2_ENABLE ;break ; -case LAYER_2 : - kmb->plane_status[plane_id].ctrl =LCD_CTRL_GL1_ENABLE ; -break ; -case LAYER_3 : - kmb->plane_status[plane_id].ctrl =LCD_CTRL_GL2_ENABLE ; -break ; } kmb->plane_status[plane_id].disable = true;
Signature · 1 line
2.25.1
Quoted 13 lines · Anitha Chrisanthus
This fixes the following build error
drivers/gpu/drm/kmb/kmb_plane.c: In function 'kmb_plane_atomic_disable':drivers/gpu/drm/kmb/kmb_plane.c:165:34: error: array subscript 3 is above array bounds of 'struct layer_status[2]' [-Werror=array-bounds]
165 | kmb->plane_status[plane_id].ctrl =
LCD_CTRL_GL2_ENABLE;
| ~~~~~~~~~~~~~~~~~^~~~~~~~~~
In file included fromdrivers/gpu/drm/kmb/kmb_plane.c:17:
drivers/gpu/drm/kmb/kmb_drv.h:61:41: note: while referencing 'plane_status'
61 | structlayer_status
plane_status[KMB_MAX_PLANES];
This would be better without the line wrapping (to match the actual output), but otherwise:
Quoted 43 lines
| ^~~~~~~~~~~~
drivers/gpu/drm/kmb/kmb_plane.c:162:34: error: array subscript 2 is above array bounds of 'struct layer_status[2]' [-Werror=array-bounds]
162 |
kmb->plane_status[plane_id].ctrl =LCD_CTRL_GL1_ENABLE;
| ~~~~~~~~~~~~~~~~~^~~~~~~~~~
In file included fromdrivers/gpu/drm/kmb/kmb_plane.c:17:
drivers/gpu/drm/kmb/kmb_drv.h:61:41: note:
while referencing 'plane_status'
61 | structlayer_status
plane_status[KMB_MAX_PLANES];
|
^~~~~~~~~~~~Fixes 7f7b96a8a0a1 ("drm/kmb: Add support for KeemBay Display")Signed-off-by Anitha Chrisanthus <[email protected]>--- drivers/gpu/drm/kmb/kmb_plane.c | 6 ------ 1 file changed, 6 deletions(-)drivers/gpu/drm/kmb/kmb_plane.c +0
-6@@ -158,12 +158,6 @@ static void kmb_plane_atomic_disable(struct drm_plane *plane,case LAYER_1 : kmb->plane_status[plane_id].ctrl =LCD_CTRL_VL2_ENABLE ;break ; -case LAYER_2 : - kmb->plane_status[plane_id].ctrl =LCD_CTRL_GL1_ENABLE ; -break ; -case LAYER_3 : - kmb->plane_status[plane_id].ctrl =LCD_CTRL_GL2_ENABLE ; -break ; } kmb->plane_status[plane_id].disable = true;Signature · 1 line
2.25.1
Signature · 1 line
Kees Cook
Chrisanthus, Anitha
maintainerThanks. Fixed line wrapping and change is pushed to drm-misc-fixes.
Quoted 77 lines
-----Original Message-----
From: dri-devel <[email protected]> On Behalf Of Kees Cook
Sent: Thursday, January 27, 2022 1:14 PM
To: Chrisanthus, Anitha <[email protected]>
Cc: Dea, Edmund J <[email protected]>; [email protected]; dri- [email protected]; [email protected]
Subject: Re: [PATCH] drm/kmb: Fix for build errors with Warray-boundsQuoted 13 lines · Anitha Chrisanthus
This fixes the following build error
drivers/gpu/drm/kmb/kmb_plane.c: In function 'kmb_plane_atomic_disable':drivers/gpu/drm/kmb/kmb_plane.c:165:34: error: array subscript 3 is above array bounds of 'struct layer_status[2]' [-Werror=array-bounds]
165 | kmb->plane_status[plane_id].ctrl =
LCD_CTRL_GL2_ENABLE;
| ~~~~~~~~~~~~~~~~~^~~~~~~~~~
In file included fromdrivers/gpu/drm/kmb/kmb_plane.c:17:
drivers/gpu/drm/kmb/kmb_drv.h:61:41: note: while referencing 'plane_status'
61 | structlayer_status
plane_status[KMB_MAX_PLANES];This would be better without the line wrapping (to match the actual output), but otherwise:
Reviewed-by Kees Cook <[email protected]>Quoted 17 lines
| ^~~~~~~~~~~~
drivers/gpu/drm/kmb/kmb_plane.c:162:34: error: array subscript 2 is above array bounds of 'struct layer_status[2]' [-Werror=array-bounds]
162 |
kmb->plane_status[plane_id].ctrl =LCD_CTRL_GL1_ENABLE;
| ~~~~~~~~~~~~~~~~~^~~~~~~~~~
In file included fromdrivers/gpu/drm/kmb/kmb_plane.c:17:
drivers/gpu/drm/kmb/kmb_drv.h:61:41: note:
while referencing 'plane_status'
61 | structlayer_status
plane_status[KMB_MAX_PLANES];
|
^~~~~~~~~~~~Review
Quoted 7 lines
Fixes 7f7b96a8a0a1 ("drm/kmb: Add support for KeemBay Display")Signed-off-by Anitha Chrisanthus <[email protected]>--- drivers/gpu/drm/kmb/kmb_plane.c | 6 ------ 1 file changed, 6 deletions(-)(quoted diff) +0
-0
b/drivers/gpu/drm/kmb/kmb_plane.cdrivers/gpu/drm/kmb/kmb_plane.c static void kmb_plane_atomic_disable(struct
Quoted 4 lines
index
00404ba4126d..2735b8eb3537100644drivers/gpu/drm/kmb/kmb_plane.c +0
-0@@ -158,12 +158,6 @@ static void kmb_plane_atomic_disable(struct
drm_plane*plane,Quoted 13 lines
drivers/gpu/drm/kmb/kmb_plane.c +0
-7case LAYER_1 : kmb->plane_status[plane_id].ctrl =LCD_CTRL_VL2_ENABLE ;break ; -case LAYER_2 : - kmb->plane_status[plane_id].ctrl =LCD_CTRL_GL1_ENABLE ; -break ; -case LAYER_3 : - kmb->plane_status[plane_id].ctrl =LCD_CTRL_GL2_ENABLE ; -break ; } kmb->plane_status[plane_id].disable = true; --Quoted 2 lines
2.25.1
--
Kees Cook