hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

video: fbdev: gbefb: add missing mtrr_del() calls 

This driver never removed the MTRRs. Fix that.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Juergen Gross <jgross@suse.com>
Cc: Jingoo Han <jg1.han@samsung.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Masanari Iida <standby24x7@gmail.com>
Cc: Suresh Siddha <sbsiddha@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Antonino Daplas <adaplas@gmail.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: linux-fbdev@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
This commit is contained in:
Luis R. Rodriguez 2015-05-28 17:30:33 -07:00 committed by Tomi Valkeinen
parent 5e200b5352
commit 5944d733f3
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/video/fbdev/gbefb.c
View File

@ -38,6 +38,7 @@ static struct sgi_gbe *gbe;
struct gbefb_par { struct gbefb_par {
struct fb_var_screeninfo var; struct fb_var_screeninfo var;
struct gbe_timing_info timing; struct gbe_timing_info timing;
int wc_cookie;
int valid; int valid;
}; };
@ -1198,8 +1199,10 @@ static int gbefb_probe(struct platform_device *p_dev)
gbe_mem_phys = (unsigned long) gbe_dma_addr; gbe_mem_phys = (unsigned long) gbe_dma_addr;
} }
par = info->par;
#ifdef CONFIG_X86 #ifdef CONFIG_X86
mtrr_add(gbe_mem_phys, gbe_mem_size, MTRR_TYPE_WRCOMB, 1); par->wc_cookie = mtrr_add(gbe_mem_phys, gbe_mem_size,
MTRR_TYPE_WRCOMB, 1);
#endif #endif
/* map framebuffer memory into tiles table */ /* map framebuffer memory into tiles table */
@ -1215,7 +1218,6 @@ static int gbefb_probe(struct platform_device *p_dev)
/* reset GBE */ /* reset GBE */
gbe_reset(); gbe_reset();
par = info->par;
/* turn on default video mode */ /* turn on default video mode */
if (fb_find_mode(&par->var, info, mode_option, NULL, 0, if (fb_find_mode(&par->var, info, mode_option, NULL, 0,
default_mode, 8) == 0) default_mode, 8) == 0)
@ -1240,6 +1242,10 @@ static int gbefb_probe(struct platform_device *p_dev)
return 0; return 0;
out_gbe_unmap: out_gbe_unmap:
#ifdef CONFIG_MTRR
if (par->wc_cookie >= 0)
mtrr_del(par->wc_cookie, 0, 0);
#endif
if (gbe_dma_addr) if (gbe_dma_addr)
dma_free_coherent(NULL, gbe_mem_size, gbe_mem, gbe_mem_phys); dma_free_coherent(NULL, gbe_mem_size, gbe_mem, gbe_mem_phys);
out_tiles_free: out_tiles_free:
@ -1256,9 +1262,14 @@ out_release_framebuffer:
static int gbefb_remove(struct platform_device* p_dev) static int gbefb_remove(struct platform_device* p_dev)
{ {
struct fb_info *info = platform_get_drvdata(p_dev); struct fb_info *info = platform_get_drvdata(p_dev);
struct gbefb_par *par = info->par;
unregister_framebuffer(info); unregister_framebuffer(info);
gbe_turn_off(); gbe_turn_off();
#ifdef CONFIG_MTRR
if (par->wc_cookie >= 0)
mtrr_del(par->wc_cookie, 0, 0);
#endif
if (gbe_dma_addr) if (gbe_dma_addr)
dma_free_coherent(NULL, gbe_mem_size, gbe_mem, gbe_mem_phys); dma_free_coherent(NULL, gbe_mem_size, gbe_mem, gbe_mem_phys);
dma_free_coherent(NULL, GBE_TLB_SIZE * sizeof(uint16_t), dma_free_coherent(NULL, GBE_TLB_SIZE * sizeof(uint16_t),