aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/gma500
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2011-03-30 09:59:45 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-05 11:27:43 -0700
commitd3fc13d8fb6b7d71313fe57c342ba313bad22fd4 (patch)
treecb50e85dd3d6e492ddac8f055f8179b76956b370 /drivers/staging/gma500
parenta9100caeea46e345f918319048b817cd7d295518 (diff)
downloadkernel_samsung_smdk4412-d3fc13d8fb6b7d71313fe57c342ba313bad22fd4.zip
kernel_samsung_smdk4412-d3fc13d8fb6b7d71313fe57c342ba313bad22fd4.tar.gz
kernel_samsung_smdk4412-d3fc13d8fb6b7d71313fe57c342ba313bad22fd4.tar.bz2
staging: gma500: Add moorestown specific data to the device structure
Moorestown needs somewhere to stash various pipe config registers and the firmware and fuse configurations Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/gma500')
-rw-r--r--drivers/staging/gma500/psb_drv.h18
1 files changed, 17 insertions, 1 deletions
diff --git a/drivers/staging/gma500/psb_drv.h b/drivers/staging/gma500/psb_drv.h
index b7b21ae..b4a8f02 100644
--- a/drivers/staging/gma500/psb_drv.h
+++ b/drivers/staging/gma500/psb_drv.h
@@ -644,7 +644,8 @@ struct drm_psb_private {
struct drm_psb_sizes_arg sizes;
- uint32_t fuse_reg_value;
+ u32 fuse_reg_value;
+ u32 video_device_fuse;
/* pci revision id for B0:D2:F0 */
uint8_t platform_rev_id;
@@ -669,6 +670,7 @@ struct drm_psb_private {
unsigned int lvds_use_ssc:1;
int lvds_ssc_freq;
bool is_lvds_on;
+ bool is_mipi_on;
unsigned int core_freq;
uint32_t iLVDS_enable;
@@ -676,6 +678,20 @@ struct drm_psb_private {
/*runtime PM state*/
int rpm_enabled;
+ /* Moorestown specific */
+ struct mrst_vbt vbt_data;
+ struct mrst_gct_data gct_data;
+
+ /* Moorestown pipe config register value cache */
+ uint32_t pipeconf;
+ uint32_t pipeconf1;
+ uint32_t pipeconf2;
+
+ /* Moorestown plane control register value cache */
+ uint32_t dspcntr;
+ uint32_t dspcntr1;
+ uint32_t dspcntr2;
+
/*
*Register state
*/