|
@@ -594,10 +594,9 @@ static int dlfb_render_hline(struct dlfb_data *dlfb, struct urb **urb_ptr,
|
|
|
return 0;
|
|
return 0;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
-static int dlfb_handle_damage(struct dlfb_data *dlfb, int x, int y,
|
|
|
|
|
- int width, int height, char *data)
|
|
|
|
|
|
|
+static int dlfb_handle_damage(struct dlfb_data *dlfb, int x, int y, int width, int height)
|
|
|
{
|
|
{
|
|
|
- int i, ret;
|
|
|
|
|
|
|
+ int i;
|
|
|
char *cmd;
|
|
char *cmd;
|
|
|
cycles_t start_cycles, end_cycles;
|
|
cycles_t start_cycles, end_cycles;
|
|
|
int bytes_sent = 0;
|
|
int bytes_sent = 0;
|
|
@@ -641,7 +640,7 @@ static int dlfb_handle_damage(struct dlfb_data *dlfb, int x, int y,
|
|
|
*cmd++ = 0xAF;
|
|
*cmd++ = 0xAF;
|
|
|
/* Send partial buffer remaining before exiting */
|
|
/* Send partial buffer remaining before exiting */
|
|
|
len = cmd - (char *) urb->transfer_buffer;
|
|
len = cmd - (char *) urb->transfer_buffer;
|
|
|
- ret = dlfb_submit_urb(dlfb, urb, len);
|
|
|
|
|
|
|
+ dlfb_submit_urb(dlfb, urb, len);
|
|
|
bytes_sent += len;
|
|
bytes_sent += len;
|
|
|
} else
|
|
} else
|
|
|
dlfb_urb_completion(urb);
|
|
dlfb_urb_completion(urb);
|
|
@@ -679,7 +678,7 @@ static ssize_t dlfb_ops_write(struct fb_info *info, const char __user *buf,
|
|
|
(u32)info->var.yres);
|
|
(u32)info->var.yres);
|
|
|
|
|
|
|
|
dlfb_handle_damage(dlfb, 0, start, info->var.xres,
|
|
dlfb_handle_damage(dlfb, 0, start, info->var.xres,
|
|
|
- lines, info->screen_base);
|
|
|
|
|
|
|
+ lines);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
return result;
|
|
@@ -695,7 +694,7 @@ static void dlfb_ops_copyarea(struct fb_info *info,
|
|
|
sys_copyarea(info, area);
|
|
sys_copyarea(info, area);
|
|
|
|
|
|
|
|
dlfb_handle_damage(dlfb, area->dx, area->dy,
|
|
dlfb_handle_damage(dlfb, area->dx, area->dy,
|
|
|
- area->width, area->height, info->screen_base);
|
|
|
|
|
|
|
+ area->width, area->height);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static void dlfb_ops_imageblit(struct fb_info *info,
|
|
static void dlfb_ops_imageblit(struct fb_info *info,
|
|
@@ -706,7 +705,7 @@ static void dlfb_ops_imageblit(struct fb_info *info,
|
|
|
sys_imageblit(info, image);
|
|
sys_imageblit(info, image);
|
|
|
|
|
|
|
|
dlfb_handle_damage(dlfb, image->dx, image->dy,
|
|
dlfb_handle_damage(dlfb, image->dx, image->dy,
|
|
|
- image->width, image->height, info->screen_base);
|
|
|
|
|
|
|
+ image->width, image->height);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
static void dlfb_ops_fillrect(struct fb_info *info,
|
|
static void dlfb_ops_fillrect(struct fb_info *info,
|
|
@@ -717,7 +716,7 @@ static void dlfb_ops_fillrect(struct fb_info *info,
|
|
|
sys_fillrect(info, rect);
|
|
sys_fillrect(info, rect);
|
|
|
|
|
|
|
|
dlfb_handle_damage(dlfb, rect->dx, rect->dy, rect->width,
|
|
dlfb_handle_damage(dlfb, rect->dx, rect->dy, rect->width,
|
|
|
- rect->height, info->screen_base);
|
|
|
|
|
|
|
+ rect->height);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -859,8 +858,7 @@ static int dlfb_ops_ioctl(struct fb_info *info, unsigned int cmd,
|
|
|
if (area.y > info->var.yres)
|
|
if (area.y > info->var.yres)
|
|
|
area.y = info->var.yres;
|
|
area.y = info->var.yres;
|
|
|
|
|
|
|
|
- dlfb_handle_damage(dlfb, area.x, area.y, area.w, area.h,
|
|
|
|
|
- info->screen_base);
|
|
|
|
|
|
|
+ dlfb_handle_damage(dlfb, area.x, area.y, area.w, area.h);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
@@ -1065,8 +1063,7 @@ static int dlfb_ops_set_par(struct fb_info *info)
|
|
|
pix_framebuffer[i] = 0x37e6;
|
|
pix_framebuffer[i] = 0x37e6;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- dlfb_handle_damage(dlfb, 0, 0, info->var.xres, info->var.yres,
|
|
|
|
|
- info->screen_base);
|
|
|
|
|
|
|
+ dlfb_handle_damage(dlfb, 0, 0, info->var.xres, info->var.yres);
|
|
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
|
}
|
|
}
|