diff options
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/arm/ipod/video/lcd-video.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/firmware/target/arm/ipod/video/lcd-video.c b/firmware/target/arm/ipod/video/lcd-video.c index e62928724e..56c606f940 100644 --- a/firmware/target/arm/ipod/video/lcd-video.c +++ b/firmware/target/arm/ipod/video/lcd-video.c | |||
@@ -112,10 +112,6 @@ struct | |||
112 | #ifdef HAVE_LCD_SLEEP | 112 | #ifdef HAVE_LCD_SLEEP |
113 | const fb_data *flash_vmcs_offset; | 113 | const fb_data *flash_vmcs_offset; |
114 | unsigned flash_vmcs_length; | 114 | unsigned flash_vmcs_length; |
115 | /* This mutex exists because enabling the backlight by changing a setting | ||
116 | will cause multiple concurrent lcd_wake() calls. | ||
117 | */ | ||
118 | static struct mutex lcdstate_lock SHAREDBSS_ATTR; | ||
119 | 115 | ||
120 | #define ROM_BASE 0x20000000 | 116 | #define ROM_BASE 0x20000000 |
121 | #define ROM_ID(a,b,c,d) (unsigned int)( ((unsigned int)(d)) | \ | 117 | #define ROM_ID(a,b,c,d) (unsigned int)( ((unsigned int)(d)) | \ |
@@ -359,7 +355,6 @@ void lcd_init_device(void) | |||
359 | /* lcd_write_data needs an even number of 16 bit values */ | 355 | /* lcd_write_data needs an even number of 16 bit values */ |
360 | flash_vmcs_length = ((flash_vmcs_length + 3) >> 1) & ~1; | 356 | flash_vmcs_length = ((flash_vmcs_length + 3) >> 1) & ~1; |
361 | } | 357 | } |
362 | mutex_init(&lcdstate_lock); | ||
363 | wakeup_init(&(lcd_state.initwakeup)); | 358 | wakeup_init(&(lcd_state.initwakeup)); |
364 | lcd_state.waking = false; | 359 | lcd_state.waking = false; |
365 | 360 | ||
@@ -599,7 +594,6 @@ void bcm_init(void) | |||
599 | 594 | ||
600 | void lcd_awake(void) | 595 | void lcd_awake(void) |
601 | { | 596 | { |
602 | mutex_lock(&lcdstate_lock); | ||
603 | if (!lcd_state.display_on && flash_vmcs_length != 0) | 597 | if (!lcd_state.display_on && flash_vmcs_length != 0) |
604 | { | 598 | { |
605 | /* Ensure BCM has been off for >= 50 ms */ | 599 | /* Ensure BCM has been off for >= 50 ms */ |
@@ -624,12 +618,10 @@ void lcd_awake(void) | |||
624 | 618 | ||
625 | lcd_activation_call_hook(); | 619 | lcd_activation_call_hook(); |
626 | } | 620 | } |
627 | mutex_unlock(&lcdstate_lock); | ||
628 | } | 621 | } |
629 | 622 | ||
630 | void lcd_sleep(void) | 623 | void lcd_sleep(void) |
631 | { | 624 | { |
632 | mutex_lock(&lcdstate_lock); | ||
633 | if (lcd_state.display_on && flash_vmcs_length != 0) | 625 | if (lcd_state.display_on && flash_vmcs_length != 0) |
634 | { | 626 | { |
635 | lcd_state.display_on = false; | 627 | lcd_state.display_on = false; |
@@ -644,7 +636,6 @@ void lcd_sleep(void) | |||
644 | /* Remember time to ensure BCM stays off for >= 50 ms */ | 636 | /* Remember time to ensure BCM stays off for >= 50 ms */ |
645 | lcd_state.update_timeout = current_tick; | 637 | lcd_state.update_timeout = current_tick; |
646 | } | 638 | } |
647 | mutex_unlock(&lcdstate_lock); | ||
648 | } | 639 | } |
649 | 640 | ||
650 | bool lcd_active(void) | 641 | bool lcd_active(void) |