Commit 6556551f authored by Borislav Petkov's avatar Borislav Petkov Committed by Daniel Vetter
Browse files

drm/r128: Fix undefined behavior due to shift overflowing the constant 

Fix:

  drivers/gpu/drm/r128/r128_cce.c: In function ‘r128_do_init_cce’:
  drivers/gpu/drm/r128/r128_cce.c:417:2: error: case label does not reduce to an integer constant
    case R128_PM4_64BM_64VCBM_64INDBM:
    ^~~~
  drivers/gpu/drm/r128/r128_cce.c:418:2: error: case label does not reduce to an integer constant
    case R128_PM4_64PIO_64VCPIO_64INDPIO:
    ^~~~

See https://lore.kernel.org/r/YkwQ6%2BtIH8GQpuct@zn.tnic

 for the gory
details as to why it triggers with older gccs only.

Reviewed-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20220405151517.29753-5-bp@alien8.de
parent 0b4c48f3

drivers/gpu/drm/r128/r128_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -300,8 +300,8 @@ extern long r128_compat_ioctl(struct file *filp, unsigned int cmd, 
#	define R128_PM4_64PIO_128INDBM		(5  << 28)

#	define R128_PM4_64BM_128INDBM		(6  << 28)

#	define R128_PM4_64PIO_64VCBM_64INDBM	(7  << 28)

#	define R128_PM4_64BM_64VCBM_64INDBM	(8  << 28)

#	define R128_PM4_64PIO_64VCPIO_64INDPIO	(15 << 28)

#	define R128_PM4_64BM_64VCBM_64INDBM	(8U  << 28)

#	define R128_PM4_64PIO_64VCPIO_64INDPIO	(15U << 28)

#	define R128_PM4_BUFFER_CNTL_NOUPDATE	(1  << 27)



#define R128_PM4_BUFFER_WM_CNTL		0x0708