Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc9a89f9 authored by Darren Jenkins's avatar Darren Jenkins Committed by Dave Airlie
Browse files

drm/radeon: fix a couple of array index errors 



There are a couple of array overruns, and some associated confusion in
the code.
This is just a wild guess at what the code should actually look like.

Coverity CID: 13305 13306

agd5f: fix up the original intent of the timing code

Signed-off-by: default avatarDarren Jenkins <darrenrjenkins@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 196c58d2

drivers/gpu/drm/radeon/radeon_legacy_tv.c

+7 −7
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ struct radeon_tv_mode_constants { 
	unsigned pix_to_tv;

};



static const uint16_t hor_timing_NTSC[] = {

static const uint16_t hor_timing_NTSC[MAX_H_CODE_TIMING_LEN] = {

	0x0007,

	0x003f,

	0x0263,
@@ -98,7 +98,7 @@ static const uint16_t hor_timing_NTSC[] = { 
	0

};



static const uint16_t vert_timing_NTSC[] = {

static const uint16_t vert_timing_NTSC[MAX_V_CODE_TIMING_LEN] = {

	0x2001,

	0x200d,

	0x1006,
@@ -115,7 +115,7 @@ static const uint16_t vert_timing_NTSC[] = { 
	0

};



static const uint16_t hor_timing_PAL[] = {

static const uint16_t hor_timing_PAL[MAX_H_CODE_TIMING_LEN] = {

	0x0007,

	0x0058,

	0x027c,
@@ -136,7 +136,7 @@ static const uint16_t hor_timing_PAL[] = { 
	0

};



static const uint16_t vert_timing_PAL[] = 	{

static const uint16_t vert_timing_PAL[MAX_V_CODE_TIMING_LEN] = {

	0x2001,

	0x200c,

	0x1005,
@@ -623,9 +623,9 @@ void radeon_legacy_tv_mode_set(struct drm_encoder *encoder, 
	}

	flicker_removal = (tmp + 500) / 1000;



	if (flicker_removal < 3)

		flicker_removal = 3;

	for (i = 0; i < 6; ++i) {

	if (flicker_removal < 2)

		flicker_removal = 2;

	for (i = 0; i < ARRAY_SIZE(SLOPE_limit); ++i) {

		if (flicker_removal == SLOPE_limit[i])

			break;

	}