diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2018-07-25 15:41:55 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-09-09 10:32:40 +0200 |
| commit | 0b5373ea72987884547c3a88c44cf93119c014e0 (patch) | |
| tree | 8fbeda8ebd57eff06ca430ec1a8cd1d6f80d01a3 | |
| parent | af0890aa45651a4ae37afefd29e2a0fa74c62f23 (diff) | |
| download | linux-stable-0b5373ea72987884547c3a88c44cf93119c014e0.tar.gz linux-stable-0b5373ea72987884547c3a88c44cf93119c014e0.tar.bz2 linux-stable-0b5373ea72987884547c3a88c44cf93119c014e0.zip | |
udlfb: make a local copy of fb_ops
commit 2c29cfc3eaf11779176bf41475cfca49bccba11c upstream.
The defio subsystem overwrites the method fb_osp->mmap. That method is
stored in module's static data - and that means that if we have multiple
diplaylink adapters, they will over write each other's method.
In order to avoid interference between multiple adapters, we copy the
fb_ops structure to a device-local memory.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/video/fbdev/udlfb.c | 3 | ||||
| -rw-r--r-- | include/video/udlfb.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c index fa63a2e359d6..770c1c8cfbd0 100644 --- a/drivers/video/fbdev/udlfb.c +++ b/drivers/video/fbdev/udlfb.c @@ -1665,7 +1665,8 @@ static void dlfb_init_framebuffer_work(struct work_struct *work) dlfb->info = info; info->par = dlfb; info->pseudo_palette = dlfb->pseudo_palette; - info->fbops = &dlfb_ops; + dlfb->ops = dlfb_ops; + info->fbops = &dlfb->ops; retval = fb_alloc_cmap(&info->cmap, 256, 0); if (retval < 0) { diff --git a/include/video/udlfb.h b/include/video/udlfb.h index 3b3c2f646589..6e1a2e790b1b 100644 --- a/include/video/udlfb.h +++ b/include/video/udlfb.h @@ -51,6 +51,7 @@ struct dlfb_data { int base8; u32 pseudo_palette[256]; int blank_mode; /*one of FB_BLANK_ */ + struct fb_ops ops; /* blit-only rendering path metrics, exposed through sysfs */ atomic_t bytes_rendered; /* raw pixel-bytes driver asked to render */ atomic_t bytes_identical; /* saved effort with backbuffer comparison */ |