[igt-dev] [PATCH i-g-t] tests/kms_rotation_crc: static before const

Petri Latvala petri.latvala at intel.com
Tue Dec 4 12:51:45 UTC 2018


On Tue, Dec 04, 2018 at 01:22:15PM +0100, Daniel Vetter wrote:
> My gcc is unhappy otherwise:
> 
> [191/829] Compiling C object 'tests/te...otation_crc at exe/kms_rotation_crc.c.o'.
> ../tests/kms_rotation_crc.c: In function ‘test_multi_plane_rotation’:
> ../tests/kms_rotation_crc.c:497:2: warning: ‘static’ is not at beginning of declaration [-Wold-style-declaration]
>   const static struct {
>   ^~~~~
> ../tests/kms_rotation_crc.c:524:2: warning: ‘static’ is not at beginning of declaration [-Wold-style-declaration]
>   const static uint32_t  formatlist[] = {DRM_FORMAT_RGB565,
>   ^~~~~
> 
> Fixes
> 
> commit 14c1b132c8f829637c55fb071a9a2e5ce00e7ed8
> Author: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
> Date:   Fri Nov 30 15:34:36 2018 +0200
> 
>     tests/kms_rotation_crc: Add multi plane tests
> 
> Cc: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com
> Cc: Ankit Nautiyal <ankit.k.nautiyal at intel.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> ---
>  tests/kms_rotation_crc.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/kms_rotation_crc.c b/tests/kms_rotation_crc.c
> index 369936f94528..05349dab5f79 100644
> --- a/tests/kms_rotation_crc.c
> +++ b/tests/kms_rotation_crc.c
> @@ -494,7 +494,7 @@ static void test_multi_plane_rotation(data_t *data, enum pipe pipe)
>  	struct p_struct *oldplanes;
>  	drmModeModeInfo *mode;
>  
> -	const static struct {
> +	static const struct {
>  		igt_rotation_t rotation;
>  		float_t width;
>  		float_t height;
> @@ -521,7 +521,7 @@ static void test_multi_plane_rotation(data_t *data, enum pipe pipe)
>  	* TODO:
>  	* Built support for NV12 here.
>  	*/
> -	const static uint32_t  formatlist[] = {DRM_FORMAT_RGB565,
> +	static const uint32_t  formatlist[] = {DRM_FORMAT_RGB565,
>  					       DRM_FORMAT_XRGB8888};

                             ^
Trim this extra space while at it too.



Reviewed-by: Petri Latvala <petri.latvala at intel.com>


More information about the igt-dev mailing list