diff options
Diffstat (limited to 'drivers/video/sh_mobile_lcdcfb.h')
-rw-r--r-- | drivers/video/sh_mobile_lcdcfb.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.h b/drivers/video/sh_mobile_lcdcfb.h index 5c3bddd2cb72..0f92f6544b94 100644 --- a/drivers/video/sh_mobile_lcdcfb.h +++ b/drivers/video/sh_mobile_lcdcfb.h | |||
@@ -47,6 +47,7 @@ struct sh_mobile_lcdc_entity { | |||
47 | /* | 47 | /* |
48 | * struct sh_mobile_lcdc_chan - LCDC display channel | 48 | * struct sh_mobile_lcdc_chan - LCDC display channel |
49 | * | 49 | * |
50 | * @pan_y_offset: Panning linear offset in bytes (luma component) | ||
50 | * @base_addr_y: Frame buffer viewport base address (luma component) | 51 | * @base_addr_y: Frame buffer viewport base address (luma component) |
51 | * @base_addr_c: Frame buffer viewport base address (chroma component) | 52 | * @base_addr_c: Frame buffer viewport base address (chroma component) |
52 | * @pitch: Frame buffer line pitch | 53 | * @pitch: Frame buffer line pitch |
@@ -59,7 +60,7 @@ struct sh_mobile_lcdc_chan { | |||
59 | unsigned long *reg_offs; | 60 | unsigned long *reg_offs; |
60 | unsigned long ldmt1r_value; | 61 | unsigned long ldmt1r_value; |
61 | unsigned long enabled; /* ME and SE in LDCNT2R */ | 62 | unsigned long enabled; /* ME and SE in LDCNT2R */ |
62 | void *meram; | 63 | void *cache; |
63 | 64 | ||
64 | struct mutex open_lock; /* protects the use counter */ | 65 | struct mutex open_lock; /* protects the use counter */ |
65 | int use_count; | 66 | int use_count; |
@@ -68,7 +69,7 @@ struct sh_mobile_lcdc_chan { | |||
68 | unsigned long fb_size; | 69 | unsigned long fb_size; |
69 | 70 | ||
70 | dma_addr_t dma_handle; | 71 | dma_addr_t dma_handle; |
71 | unsigned long pan_offset; | 72 | unsigned long pan_y_offset; |
72 | 73 | ||
73 | unsigned long frame_end; | 74 | unsigned long frame_end; |
74 | wait_queue_head_t frame_end_wait; | 75 | wait_queue_head_t frame_end_wait; |