summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFei Jiang <fei.jiang@intel.com>2010-09-16 08:43:07 +0800
committerPatrick Tjin <pattjin@google.com>2014-07-21 22:05:36 -0700
commitb5ebe747e2b4f6afc7008bd7e8704895cc231c5c (patch)
tree47aa8acc989b456581298dd3876b30f0f951016c
parent0e5e93192554443ad9308a85bbec2ca57ca198ad (diff)
downloadpsb_headers-b5ebe747e2b4f6afc7008bd7e8704895cc231c5c.tar.gz
Add some definitions for overlay code change.
Change-Id: I8e43676089f760d13ad2e5f231f498cca8a7325a
-rw-r--r--psb_drm.h21
1 files changed, 20 insertions, 1 deletions
diff --git a/psb_drm.h b/psb_drm.h
index c80a596..587794e 100644
--- a/psb_drm.h
+++ b/psb_drm.h
@@ -44,7 +44,7 @@
* c - Hotfix Release
* xxxx - Graphics internal build #
*/
-#define PSB_PACKAGE_VERSION "5.2.0.32L.1004"
+#define PSB_PACKAGE_VERSION "5.4.0.32L.0004"
#define DRM_PSB_SAREA_MAJOR 0
#define DRM_PSB_SAREA_MINOR 2
@@ -568,11 +568,20 @@ struct drm_psb_stolen_memory_arg {
#define REGRWBITS_PIPEBSRC (1 << 4)
#define REGRWBITS_VTOTAL_A (1 << 5)
#define REGRWBITS_VTOTAL_B (1 << 6)
+#ifdef MDFLD_HDCP
+#define REGRWBITS_HDCP (1 << 7)
+#endif
+#define REGRWBITS_DSPACNTR (1 << 8)
+#define REGRWBITS_DSPBCNTR (1 << 9)
+#define REGRWBITS_DSPCCNTR (1 << 10)
/*Overlay Register Bits*/
#define OV_REGRWBITS_OVADD (1 << 0)
#define OV_REGRWBITS_OGAM_ALL (1 << 1)
+#define OVC_REGRWBITS_OVADD (1 << 2)
+#define OVC_REGRWBITS_OGAM_ALL (1 << 3)
+
struct drm_psb_register_rw_arg {
uint32_t b_force_hw_on;
@@ -587,6 +596,10 @@ struct drm_psb_register_rw_arg {
uint32_t pipebsrc;
uint32_t vtotal_a;
uint32_t vtotal_b;
+#ifdef MDFLD_HDCP
+ uint32_t hdcp_reg;
+ uint32_t hdcp_value;
+#endif
} display;
uint32_t overlay_read_mask;
@@ -600,6 +613,9 @@ struct drm_psb_register_rw_arg {
uint32_t OGAMC3;
uint32_t OGAMC4;
uint32_t OGAMC5;
+ uint32_t IEP_ENABLED;
+ uint32_t IEP_BLE_MINMAX;
+ uint32_t IEP_BSSCC_CONTROL;
} overlay;
uint32_t sprite_enable_mask;
@@ -616,6 +632,9 @@ struct drm_psb_register_rw_arg {
uint32_t dspc_size;
uint32_t dspc_surface;
} sprite;
+
+ uint32_t subpicture_enable_mask;
+ uint32_t subpicture_disable_mask;
};
struct psb_gtt_mapping_arg {