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

Commit 3915a927 authored by Florian Tobias Schandinat's avatar Florian Tobias Schandinat Committed by Linus Torvalds
Browse files

viafb: remove temporary start address setting 



Currently the start address is set to an initial value every time
viafb_setmode is called.

This is not done consistently along graphic cores and not even the whole
address but often only parts of it.  On top of that it seems useless as
the real/final address will be set by viafb_set_start_addr a few lines
later.

Remove this superfluous initalization to shrink register initalization and
as a start to decouple primary and secondary display.  Code cleanup, no
notable runtime change expected.

Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
Cc: Scott Fang <ScottFang@viatech.com.cn>
Cc: Joseph Chan <JosephChan@via.com.tw>
Cc: Harald Welte <laforge@gnumonks.org>
Cc: Jonathan Corbet <corbet@lwn.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0e3ca33a

drivers/video/via/viamode.c

+0 −17
Original line number Original line Diff line number Diff line
@@ -100,12 +100,8 @@ struct io_reg CN400_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01}, 
{VIACR, CR0F, 0xFF, 0x00},	/* Cursor Localtion Low                */

{VIACR, CR0F, 0xFF, 0x00},	/* Cursor Localtion Low                */

{VIACR, CR32, 0xFF, 0x00},

{VIACR, CR32, 0xFF, 0x00},

{VIACR, CR33, 0xFF, 0x00},

{VIACR, CR33, 0xFF, 0x00},

{VIACR, CR34, 0xFF, 0x00},

{VIACR, CR35, 0xFF, 0x00},

{VIACR, CR35, 0xFF, 0x00},

{VIACR, CR36, 0x08, 0x00},

{VIACR, CR36, 0x08, 0x00},

{VIACR, CR62, 0xFF, 0x00},	/* Secondary Display Starting Address  */

{VIACR, CR63, 0xFF, 0x00},	/* Secondary Display Starting Address  */

{VIACR, CR64, 0xFF, 0x00},	/* Secondary Display Starting Address  */

{VIACR, CR69, 0xFF, 0x00},

{VIACR, CR69, 0xFF, 0x00},

{VIACR, CR6A, 0xFF, 0x40},

{VIACR, CR6A, 0xFF, 0x40},

{VIACR, CR6B, 0xFF, 0x00},

{VIACR, CR6B, 0xFF, 0x00},
@@ -159,16 +155,12 @@ struct io_reg CN700_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01}, 
{VIASR, CR30, 0xFF, 0x04},

{VIASR, CR30, 0xFF, 0x04},

{VIACR, CR32, 0xFF, 0x00},

{VIACR, CR32, 0xFF, 0x00},

{VIACR, CR33, 0x7F, 0x00},

{VIACR, CR33, 0x7F, 0x00},

{VIACR, CR34, 0xFF, 0x00},

{VIACR, CR35, 0xFF, 0x00},

{VIACR, CR35, 0xFF, 0x00},

{VIACR, CR36, 0xFF, 0x31},

{VIACR, CR36, 0xFF, 0x31},

{VIACR, CR41, 0xFF, 0x80},

{VIACR, CR41, 0xFF, 0x80},

{VIACR, CR42, 0xFF, 0x00},

{VIACR, CR42, 0xFF, 0x00},

{VIACR, CR55, 0x80, 0x00},

{VIACR, CR55, 0x80, 0x00},

{VIACR, CR5D, 0x80, 0x00},	/*Horizontal Retrace Start bit[11] should be 0*/

{VIACR, CR5D, 0x80, 0x00},	/*Horizontal Retrace Start bit[11] should be 0*/

{VIACR, CR62, 0xFF, 0x00},	/* Secondary Display Starting Address */

{VIACR, CR63, 0xFF, 0x00},	/* Secondary Display Starting Address */

{VIACR, CR64, 0xFF, 0x00},	/* Secondary Display Starting Address */

{VIACR, CR68, 0xFF, 0x67},	/* Default FIFO For IGA2 */

{VIACR, CR68, 0xFF, 0x67},	/* Default FIFO For IGA2 */

{VIACR, CR69, 0xFF, 0x00},

{VIACR, CR69, 0xFF, 0x00},

{VIACR, CR6A, 0xFD, 0x40},

{VIACR, CR6A, 0xFD, 0x40},
@@ -233,9 +225,6 @@ struct io_reg KM400_ModeXregs[] = { 
	{VIACR, CR55, 0x80, 0x00},

	{VIACR, CR55, 0x80, 0x00},

	{VIACR, CR5D, 0x80, 0x00},

	{VIACR, CR5D, 0x80, 0x00},

	{VIACR, CR36, 0xFF, 0x01},	/* Power Mangement 3                  */

	{VIACR, CR36, 0xFF, 0x01},	/* Power Mangement 3                  */

	{VIACR, CR62, 0xFF, 0x00},	/* Secondary Display Starting Address */

	{VIACR, CR63, 0xFF, 0x00},	/* Secondary Display Starting Address */

	{VIACR, CR64, 0xFF, 0x00},	/* Secondary Display Starting Address */

	{VIACR, CR68, 0xFF, 0x67},	/* Default FIFO For IGA2              */

	{VIACR, CR68, 0xFF, 0x67},	/* Default FIFO For IGA2              */

	{VIACR, CR6A, 0x20, 0x20},	/* Extended FIFO On                   */

	{VIACR, CR6A, 0x20, 0x20},	/* Extended FIFO On                   */

	{VIACR, CR7A, 0xFF, 0x01},	/* LCD Scaling Parameter 1            */

	{VIACR, CR7A, 0xFF, 0x01},	/* LCD Scaling Parameter 1            */
@@ -285,14 +274,9 @@ struct io_reg CX700_ModeXregs[] = { {VIASR, SR10, 0xFF, 0x01}, 
{VIACR, CR0F, 0xFF, 0x00},	/* Cursor Localtion Low                */

{VIACR, CR0F, 0xFF, 0x00},	/* Cursor Localtion Low                */

{VIACR, CR32, 0xFF, 0x00},

{VIACR, CR32, 0xFF, 0x00},

{VIACR, CR33, 0xFF, 0x00},

{VIACR, CR33, 0xFF, 0x00},

{VIACR, CR34, 0xFF, 0x00},

{VIACR, CR35, 0xFF, 0x00},

{VIACR, CR35, 0xFF, 0x00},

{VIACR, CR36, 0x08, 0x00},

{VIACR, CR36, 0x08, 0x00},

{VIACR, CR47, 0xC8, 0x00},	/* Clear VCK Plus. */

{VIACR, CR47, 0xC8, 0x00},	/* Clear VCK Plus. */

{VIACR, CR62, 0xFF, 0x00},	/* Secondary Display Starting Address  */

{VIACR, CR63, 0xFF, 0x00},	/* Secondary Display Starting Address  */

{VIACR, CR64, 0xFF, 0x00},	/* Secondary Display Starting Address  */

{VIACR, CRA3, 0xFF, 0x00},	/* Secondary Display Starting Address  */

{VIACR, CR69, 0xFF, 0x00},

{VIACR, CR69, 0xFF, 0x00},

{VIACR, CR6A, 0xFF, 0x40},

{VIACR, CR6A, 0xFF, 0x40},

{VIACR, CR6B, 0xFF, 0x00},

{VIACR, CR6B, 0xFF, 0x00},
@@ -340,7 +324,6 @@ struct io_reg CLE266_ModeXregs[] = { {VIASR, SR1E, 0xF0, 0x00}, 
{VIASR, SR1A, 0xFB, 0x08},

{VIASR, SR1A, 0xFB, 0x08},





{VIACR, CR32, 0xFF, 0x00},

{VIACR, CR32, 0xFF, 0x00},

{VIACR, CR34, 0xFF, 0x00},

{VIACR, CR35, 0xFF, 0x00},

{VIACR, CR35, 0xFF, 0x00},

{VIACR, CR36, 0x08, 0x00},

{VIACR, CR36, 0x08, 0x00},

{VIACR, CR6A, 0xFF, 0x80},

{VIACR, CR6A, 0xFF, 0x80},