From 0c7d64b46abd58e4e1b87e14322a644e8e0424c1 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Wed, 30 Mar 2011 09:59:45 +0100 Subject: [PATCH] --- yaml --- r: 249023 b: refs/heads/master c: d3fc13d8fb6b7d71313fe57c342ba313bad22fd4 h: refs/heads/master i: 249021: 3609d7c90501320a8a61ad16712fdbb834db6797 249019: 491a4dd671808f2b8e40b60297aebfb7a4bb4f6a 249015: e89da2d0b9d533e6bddd061e42d7779a24d08aed 249007: d471d31897b9bae524857ab7842cd3c9175743a8 248991: e1a9ddfa467fd6d7455543f1981c29647fcc51b4 248959: 5ae74446add60654776dcb84864c2376f8aebb42 v: v3 --- [refs] | 2 +- trunk/drivers/staging/gma500/psb_drv.h | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3a7152846a5d..187de49c2213 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a9100caeea46e345f918319048b817cd7d295518 +refs/heads/master: d3fc13d8fb6b7d71313fe57c342ba313bad22fd4 diff --git a/trunk/drivers/staging/gma500/psb_drv.h b/trunk/drivers/staging/gma500/psb_drv.h index b7b21ae83dba..b4a8f0294b24 100644 --- a/trunk/drivers/staging/gma500/psb_drv.h +++ b/trunk/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 */