Merge tag 'drm-misc-next-2019-12-16' of git://anongit.freedesktop.org/drm/drm-misc...

[sfrench/cifs-2.6.git] / drivers / video / fbdev / aty / atyfb_base.c

diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
index 79d548746efd477e662e4807833100878eb26caa..175d2598f28e4253b7844577199bd59f9983def3 100644 (file)
--- a/drivers/video/fbdev/aty/atyfb_base.c
+++ b/drivers/video/fbdev/aty/atyfb_base.c
@@ -1326,10 +1326,10 @@ static int atyfb_set_par(struct fb_info *info)
        par->accel_flags = var->accel_flags; /* hack */
 
        if (var->accel_flags) {
-               info->fbops->fb_sync = atyfb_sync;
+               atyfb_ops.fb_sync = atyfb_sync;
                info->flags &= ~FBINFO_HWACCEL_DISABLED;
        } else {
-               info->fbops->fb_sync = NULL;
+               atyfb_ops.fb_sync = NULL;
                info->flags |= FBINFO_HWACCEL_DISABLED;
        }
 
@@ -2712,7 +2712,7 @@ static int aty_init(struct fb_info *info)
 
 #ifdef CONFIG_FB_ATY_CT
        if (!noaccel && M64_HAS(INTEGRATED))
-               aty_init_cursor(info);
+               aty_init_cursor(info, &atyfb_ops);
 #endif /* CONFIG_FB_ATY_CT */
        info->var = var;