viafb: improve viafb_par

This patch introduces viafb_shared and is the beginning of a smooth
transition to use it.

viafb_shared should contain all general, non-surface specific data that
should be shared along all viafb framebuffers while viafb_par should only
contain things that are specific to each surface or in other words extend
fb_info.  This change is intended to clean the dual/multi framebuffer
handling up.

This removes the annoyance that viafbinfo1->par points to a different
structure than viaparinfo1.

As the last change is fundamental it is difficult to ensure that all parts
of the driver do not depend on the previous brokenness but the chance of
regressions is very low.

Signed-off-by: Florian 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 16 insertions, 3 deletions

diff --git a/drivers/video/via/viafbdev.h b/drivers/video/via/viafbdev.h
index 2763922bbe4f..1d1fe35feaa7 100644
--- a/drivers/video/via/viafbdev.h
+++ b/drivers/video/via/viafbdev.h
@@ -37,6 +37,20 @@
 #define VERSION_OS          0   /* 0: for 32 bits OS, 1: for 64 bits OS */
 #define VERSION_MINOR       4
 
+struct viafb_shared {
+        struct proc_dir_entry *proc_entry;      /*viafb proc entry */
+
+        /* I2C stuff */
+        struct via_i2c_stuff i2c_stuff;
+
+        /* All the information will be needed to set engine */
+        struct tmds_setting_information tmds_setting_info;
+        struct crt_setting_information crt_setting_info;
+        struct lvds_setting_information lvds_setting_info;
+        struct lvds_setting_information lvds_setting_info2;
+        struct chip_information chip_info;
+};
+
 struct viafb_par {
         void __iomem *io_virt;  /*iospace virtual memory address */
         unsigned int fbmem;     /*framebuffer physical memory address */
@@ -47,12 +61,11 @@ struct viafb_par {
         u32 VQ_start;           /* Virtual Queue Start Address */
         u32 VQ_end;             /* Virtual Queue End Address */
         u32 iga_path;
-        struct proc_dir_entry *proc_entry;      /*viafb proc entry */
 
-        /* I2C stuff */
-        struct via_i2c_stuff i2c_stuff;
+        struct viafb_shared *shared;
 
         /* All the information will be needed to set engine */
+        /* depreciated, use the ones in shared directly */
         struct tmds_setting_information *tmds_setting_info;
         struct crt_setting_information *crt_setting_info;
         struct lvds_setting_information *lvds_setting_info;