3.16.62-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: Mikulas Patocka mpatocka@redhat.com
commit 564f1807379298dfdb12ed0d5b25fcb89c238527 upstream.
The udlfb driver reprograms the hardware everytime the user switches the console, that makes quite unusable when working on the console.
This patch makes the driver remember the videomode we are in and avoid reprogramming the hardware if we switch to the same videomode.
We mask the "activate" field and the "FB_VMODE_SMOOTH_XPAN" flag when comparing the videomode, because they cause spurious switches when switching to and from the Xserver.
Signed-off-by: Mikulas Patocka mpatocka@redhat.com Signed-off-by: Bartlomiej Zolnierkiewicz b.zolnierkie@samsung.com [bwh: Backported to 3.16: Pointer to struct dlfb_data is named "dev" rather than "dlfb"] Signed-off-by: Ben Hutchings ben@decadent.org.uk --- drivers/video/fbdev/udlfb.c | 18 ++++++++++++++++-- include/video/udlfb.h | 1 + 2 files changed, 17 insertions(+), 2 deletions(-)
--- a/drivers/video/fbdev/udlfb.c +++ b/drivers/video/fbdev/udlfb.c @@ -1057,10 +1057,24 @@ static int dlfb_ops_set_par(struct fb_in int result; u16 *pix_framebuffer; int i; + struct fb_var_screeninfo fvs; + + /* clear the activate field because it causes spurious miscompares */ + fvs = info->var; + fvs.activate = 0; + fvs.vmode &= ~FB_VMODE_SMOOTH_XPAN; + + if (!memcmp(&dev->current_mode, &fvs, sizeof(struct fb_var_screeninfo))) + return 0;
result = dlfb_set_video_mode(dev, &info->var);
- if ((result == 0) && (dev->fb_count == 0)) { + if (result) + return result; + + dev->current_mode = fvs; + + if (dev->fb_count == 0) {
/* paint greenscreen */
@@ -1072,7 +1086,7 @@ static int dlfb_ops_set_par(struct fb_in info->screen_base); }
- return result; + return 0; }
/* To fonzi the jukebox (e.g. make blanking changes take effect) */ --- a/include/video/udlfb.h +++ b/include/video/udlfb.h @@ -56,6 +56,7 @@ struct dlfb_data { atomic_t bytes_identical; /* saved effort with backbuffer comparison */ atomic_t bytes_sent; /* to usb, after compression including overhead */ atomic_t cpu_kcycles_used; /* transpired during pixel processing */ + struct fb_var_screeninfo current_mode; };
#define NR_USB_REQUEST_I2C_SUB_IO 0x02