diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/mxc/mxc_epdc_fb.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/video/mxc/mxc_epdc_fb.c b/drivers/video/mxc/mxc_epdc_fb.c index 2df44041e65c..95f15c96bed7 100644 --- a/drivers/video/mxc/mxc_epdc_fb.c +++ b/drivers/video/mxc/mxc_epdc_fb.c @@ -735,24 +735,18 @@ static int epdc_choose_next_lut(int rev, int *next_lut) { u64 luts_status, unprocessed_luts; bool next_lut_found = false; - /* Available LUTs are reduced to 16 in 5-bit waveform mode */ - u32 format_p5n = __raw_readl(EPDC_FORMAT) & - EPDC_FORMAT_BUF_PIXEL_FORMAT_P5N; luts_status = __raw_readl(EPDC_STATUS_LUTS); - if ((rev < 20) || format_p5n) + if (rev < 20) luts_status &= 0xFFFF; else luts_status |= ((u64)__raw_readl(EPDC_STATUS_LUTS2) << 32); - if (rev < 20) { + if (rev < 20) unprocessed_luts = __raw_readl(EPDC_IRQ) & 0xFFFF; - } else { + else unprocessed_luts = __raw_readl(EPDC_IRQ1) | ((u64)__raw_readl(EPDC_IRQ2) << 32); - if (format_p5n) - unprocessed_luts &= 0xFFFF; - } while (!next_lut_found) { /* @@ -768,7 +762,7 @@ static int epdc_choose_next_lut(int rev, int *next_lut) */ *next_lut = fls64(luts_status); - if ((rev < 20) || format_p5n) { + if (rev < 20) { if (*next_lut > 15) *next_lut = ffz(luts_status); } else { |