microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

video: fbdev: nvidia: modify the static fb_ops directly 

Avoid modifying the fb_ops via info->fbops to let us make the pointer
const in the future.

Cc: linux-fbdev@vger.kernel.org
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/9639e2305fd4d03311bf909b8914277b221ca582.1575390740.git.jani.nikula@intel.com
This commit is contained in:
Jani Nikula 2019-12-03 18:38:45 +02:00
Родитель c63c35dea3
Коммит 9567a03e19
1 изменённых файлов: 11 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
drivers/video/fbdev/nvidia/nvidia.c
Просмотреть файл

@ -607,6 +607,8 @@ static int nvidiafb_cursor(struct fb_info *info, struct fb_cursor *cursor)
return 0;
}
static struct fb_ops nvidia_fb_ops;
static int nvidiafb_set_par(struct fb_info *info)
{
struct nvidia_par *par = info->par;
@ -660,19 +662,19 @@ static int nvidiafb_set_par(struct fb_info *info)
info->fix.line_length = (info->var.xres_virtual *
info->var.bits_per_pixel) >> 3;
if (info->var.accel_flags) {
info->fbops->fb_imageblit = nvidiafb_imageblit;
info->fbops->fb_fillrect = nvidiafb_fillrect;
info->fbops->fb_copyarea = nvidiafb_copyarea;
info->fbops->fb_sync = nvidiafb_sync;
nvidia_fb_ops.fb_imageblit = nvidiafb_imageblit;
nvidia_fb_ops.fb_fillrect = nvidiafb_fillrect;
nvidia_fb_ops.fb_copyarea = nvidiafb_copyarea;
nvidia_fb_ops.fb_sync = nvidiafb_sync;
info->pixmap.scan_align = 4;
info->flags &= ~FBINFO_HWACCEL_DISABLED;
info->flags |= FBINFO_READS_FAST;
NVResetGraphics(info);
} else {
info->fbops->fb_imageblit = cfb_imageblit;
info->fbops->fb_fillrect = cfb_fillrect;
info->fbops->fb_copyarea = cfb_copyarea;
info->fbops->fb_sync = NULL;
nvidia_fb_ops.fb_imageblit = cfb_imageblit;
nvidia_fb_ops.fb_fillrect = cfb_fillrect;
nvidia_fb_ops.fb_copyarea = cfb_copyarea;
nvidia_fb_ops.fb_sync = NULL;
info->pixmap.scan_align = 1;
info->flags |= FBINFO_HWACCEL_DISABLED;
info->flags &= ~FBINFO_READS_FAST;
@ -1165,7 +1167,7 @@ static int nvidia_set_fbinfo(struct fb_info *info)
info->pixmap.flags = FB_PIXMAP_SYSTEM;
if (!hwcur)
info->fbops->fb_cursor = NULL;
nvidia_fb_ops.fb_cursor = NULL;
info->var.accel_flags = (!noaccel);