Commit 3119cabc authored by Jiapeng Chong's avatar Jiapeng Chong Committed by Helge Deller
Browse files

fbdev: sisfb: Clean up some inconsistent indenting 

No functional modification involved.

drivers/video/fbdev/sis/sis_main.c:6165 sisfb_probe() warn: inconsistent indenting.
drivers/video/fbdev/sis/sis_main.c:4266 sisfb_post_300_rwtest() warn: inconsistent indenting.
drivers/video/fbdev/sis/sis_main.c:2388 SISDoSense() warn: inconsistent indenting.
drivers/video/fbdev/sis/sis_main.c:2531 SiS_Sense30x() warn: inconsistent indenting.
drivers/video/fbdev/sis/sis_main.c:2382 SISDoSense() warn: inconsistent indenting.
drivers/video/fbdev/sis/sis_main.c:2250 sisfb_sense_crt1() warn: inconsistent indenting.
drivers/video/fbdev/sis/sis_main.c:672 sisfb_validate_mode() warn: inconsistent indenting.

Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=1934


Reported-by: default avatarAbaci Robot <abaci@linux.alibaba.com>
Signed-off-by: default avatarJiapeng Chong <jiapeng.chong@linux.alibaba.com>
Signed-off-by: default avatarHelge Deller <deller@gmx.de>
parent 19f953e7

drivers/video/fbdev/sis/sis_main.c

+141 −133
Original line number Diff line number Diff line
@@ -2215,7 +2215,9 @@ static void sisfb_sense_crt1(struct sis_video_info *ivideo) 
	sr1F = SiS_GetReg(SISSR, 0x1F);

	SiS_SetRegOR(SISSR, 0x1F, 0x04);

	SiS_SetRegAND(SISSR, 0x1F, 0x3F);

    if(sr1F & 0xc0) mustwait = true;



	if (sr1F & 0xc0)

		mustwait = true;



#ifdef CONFIG_FB_SIS_315

	if (ivideo->sisvga_engine == SIS_315_VGA) {
@@ -2227,6 +2229,7 @@ static void sisfb_sense_crt1(struct sis_video_info *ivideo) 


	cr17 = SiS_GetReg(SISCR, 0x17);

	cr17 &= 0x80;



	if (!cr17) {

		SiS_SetRegOR(SISCR, 0x17, 0x80);

		mustwait = true;
@@ -2235,21 +2238,25 @@ static void sisfb_sense_crt1(struct sis_video_info *ivideo) 
	}



	if (mustwait) {

       for(i=0; i < 10; i++) sisfbwaitretracecrt1(ivideo);

		for (i = 0; i < 10; i++)

			sisfbwaitretracecrt1(ivideo);

	}



#ifdef CONFIG_FB_SIS_315

	if (ivideo->chip >= SIS_330) {

		SiS_SetRegAND(SISCR, 0x32, ~0x20);

       if(ivideo->chip >= SIS_340) {

		if (ivideo->chip >= SIS_340)

			SiS_SetReg(SISCR, 0x57, 0x4a);

       } else {

		else

			SiS_SetReg(SISCR, 0x57, 0x5f);

       }



		SiS_SetRegOR(SISCR, 0x53, 0x02);

	while ((SiS_GetRegByte(SISINPSTAT)) & 0x01)    break;

	while (!((SiS_GetRegByte(SISINPSTAT)) & 0x01)) break;

	if ((SiS_GetRegByte(SISMISCW)) & 0x10) temp = 1;

		while ((SiS_GetRegByte(SISINPSTAT)) & 0x01)

			break;

		while (!((SiS_GetRegByte(SISINPSTAT)) & 0x01))

			break;

		if ((SiS_GetRegByte(SISMISCW)) & 0x10)

			temp = 1;



		SiS_SetRegAND(SISCR, 0x53, 0xfd);

		SiS_SetRegAND(SISCR, 0x57, 0x00);

	}
@@ -2257,28 +2264,27 @@ static void sisfb_sense_crt1(struct sis_video_info *ivideo) 


	if (temp == 0xffff) {

		i = 3;



		do {

			temp = SiS_HandleDDC(&ivideo->SiS_Pr, ivideo->vbflags,

			ivideo->sisvga_engine, 0, 0, NULL, ivideo->vbflags2);

		} while (((temp == 0) || (temp == 0xffff)) && i--);



		if ((temp == 0) || (temp == 0xffff)) {

          if(sisfb_test_DDC1(ivideo)) temp = 1;

			if (sisfb_test_DDC1(ivideo))

				temp = 1;

		}

	}



    if((temp) && (temp != 0xffff)) {

	if ((temp) && (temp != 0xffff))

		SiS_SetRegOR(SISCR, 0x32, 0x20);

    }



#ifdef CONFIG_FB_SIS_315

    if(ivideo->sisvga_engine == SIS_315_VGA) {

	if (ivideo->sisvga_engine == SIS_315_VGA)

		SiS_SetRegANDOR(SISCR, ivideo->SiS_Pr.SiS_MyCR63, 0xBF, cr63);

    }

#endif



	SiS_SetRegANDOR(SISCR, 0x17, 0x7F, cr17);



	SiS_SetReg(SISSR, 0x1F, sr1F);

}
@@ -2387,14 +2393,17 @@ static int SISDoSense(struct sis_video_info *ivideo, u16 type, u16 test) 
			temp = SiS_GetReg(SISPART4, 0x03);

			temp ^= 0x0e;

			temp &= mytest;

          if(temp == mytest) result++;

			if (temp == mytest)

				result++;

#if 1

			SiS_SetReg(SISPART4, 0x11, 0x00);

			SiS_SetRegAND(SISPART4, 0x10, 0xe0);

			SiS_DDC2Delay(&ivideo->SiS_Pr, 0x1000);

#endif

		}

       if((result == 0) || (result >= 2)) break;



		if ((result == 0) || (result >= 2))

			break;

	}

	return result;

}
@@ -4263,7 +4272,6 @@ static int sisfb_post_300_rwtest(struct sis_video_info *ivideo, int iteration, 
	unsigned int PhysicalAdrOtherPage, PhysicalAdrHigh, PhysicalAdrHalfPage;



	for (k = 0; k < ARRAY_SIZE(SiS_DRAMType); k++) {



		RankCapacity = buswidth * SiS_DRAMType[k][3];



		if (RankCapacity != PseudoRankCapacity)
@@ -4287,8 +4295,12 @@ static int sisfb_post_300_rwtest(struct sis_video_info *ivideo, int iteration, 
		SiS_SetRegAND(SISSR, 0x15, 0xFB); /* Test */

		SiS_SetRegOR(SISSR, 0x15, 0x04);  /* Test */

		sr14 = (SiS_DRAMType[k][3] * buswidth) - 1;

		if(buswidth == 4)      sr14 |= 0x80;

		else if(buswidth == 2) sr14 |= 0x40;



		if (buswidth == 4)

			sr14 |= 0x80;

		else if (buswidth == 2)

			sr14 |= 0x40;



		SiS_SetReg(SISSR, 0x13, SiS_DRAMType[k][4]);

		SiS_SetReg(SISSR, 0x14, sr14);
@@ -6152,12 +6164,8 @@ static int sisfb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
#ifdef CONFIG_FB_SIS_315

		if (ivideo->sisvga_engine == SIS_315_VGA) {

			int result = 1;

		/*	if((ivideo->chip == SIS_315H)   ||

			   (ivideo->chip == SIS_315)    ||

			   (ivideo->chip == SIS_315PRO) ||

			   (ivideo->chip == SIS_330)) {

				sisfb_post_sis315330(pdev);

			} else */ if(ivideo->chip == XGI_20) {



			if (ivideo->chip == XGI_20) {

				result = sisfb_post_xgi(pdev);

				ivideo->sisfb_can_post = 1;

			} else if ((ivideo->chip == XGI_40) && ivideo->haveXGIROM) {