← Back to branch summary

~ubuntu-branches/ubuntu/vivid/linux-fsl-imx51/vivid

« back to all changes in this revision

Viewing changes to include/linux/mxcfb.h

  • Committer: Bazaar Package Importer
  • Author(s): Andy Whitcroft, Amit Kucheria, Andy Whitcroft, Bryan Wu, Upstream Kernel Changes
  • Date: 2010-01-11 16:26:27 UTC
  • Revision ID: james.westby@ubuntu.com-20100111162627-1q2fl9tcuwcywt1e
Tags: 2.6.31-602.4
[ Amit Kucheria ]

* Update to official 2.6.31 BSP release from Freescale

[ Andy Whitcroft ]

* drop a number of modules no longer built

[ Bryan Wu ]

* [Config] Update configs after applying .31 patchset from Freescale
* [Config] Sync with imx51_defconfig from Freescale BSP

[ Upstream Kernel Changes ]

* Update to official 2.6.31 BSP release from Freescale.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/linux/mxcfb.h
35
35
        int alpha;
36
36
};
37
37
 
 
38
struct mxcfb_loc_alpha {
 
39
        int enable;
 
40
        unsigned long alpha_phy_addr0;
 
41
        unsigned long alpha_phy_addr1;
 
42
};
 
43
 
38
44
struct mxcfb_color_key {
39
45
        int enable;
40
46
        __u32 color_key;
45
51
        __u16 y;
46
52
};
47
53
 
 
54
struct mxcfb_gamma {
 
55
        int enable;
 
56
        int constk[16];
 
57
        int slopek[16];
 
58
};
 
59
 
48
60
#define MXCFB_WAIT_FOR_VSYNC    _IOW('F', 0x20, u_int32_t)
49
61
#define MXCFB_SET_GBL_ALPHA     _IOW('F', 0x21, struct mxcfb_gbl_alpha)
50
62
#define MXCFB_SET_CLR_KEY       _IOW('F', 0x22, struct mxcfb_color_key)
51
 
#define MXCFB_SET_OVERLAY_POS   _IOW('F', 0x24, struct mxcfb_pos)
52
 
#define MXCFB_GET_FB_IPU_CHAN   _IOR('F', 0x25, u_int32_t)
 
63
#define MXCFB_SET_OVERLAY_POS   _IOWR('F', 0x24, struct mxcfb_pos)
 
64
#define MXCFB_GET_FB_IPU_CHAN   _IOR('F', 0x25, u_int32_t)
 
65
#define MXCFB_SET_LOC_ALPHA     _IOWR('F', 0x26, struct mxcfb_loc_alpha)
 
66
#define MXCFB_SET_LOC_ALP_BUF    _IOW('F', 0x27, unsigned long)
 
67
#define MXCFB_SET_GAMMA        _IOW('F', 0x28, struct mxcfb_gamma)
53
68
 
54
69
#ifdef __KERNEL__
55
70