Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2004-02-14 17:32:22 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2004-02-14 17:32:22 -0800
commit7b377012f0937e0705c3f27367f10ec724e38966 (patch)
tree4cc24803125138b36e3c11e2c8c6e8d643536e57
parent29d6f8c42d8137f1c1206aa3342df537f5100e41 (diff)
[PATCH] Fix fbdev pixmap locking
This removes the broken locking code in the pixmaps, and rewrite the buffer access function to properly call fb_sync when needed. The old broken loocking is useless as we are covered by the console semaphore in all cases hopefully (except if I missed one :)
-rw-r--r--drivers/video/console/fbcon.c6
-rw-r--r--drivers/video/fbmem.c36
-rw-r--r--drivers/video/softcursor.c2
-rw-r--r--include/linux/fb.h2
4 files changed, 21 insertions, 25 deletions
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 50fe17ea95dd..c2d6237f7f09 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -354,8 +354,6 @@ static void putcs_unaligned(struct vc_data *vc, struct fb_info *info,
info->fbops->fb_imageblit(info, image);
image->dx += cnt * vc->vc_font.width;
count -= cnt;
- atomic_dec(&info->pixmap.count);
- smp_mb__after_atomic_dec();
}
}
@@ -394,8 +392,6 @@ static void putcs_aligned(struct vc_data *vc, struct fb_info *info,
info->fbops->fb_imageblit(info, image);
image->dx += cnt * vc->vc_font.width;
count -= cnt;
- atomic_dec(&info->pixmap.count);
- smp_mb__after_atomic_dec();
}
}
@@ -466,8 +462,6 @@ static void accel_putc(struct vc_data *vc, struct fb_info *info,
move_buf_aligned(info, dst, src, pitch, width, image.height);
info->fbops->fb_imageblit(info, &image);
- atomic_dec(&info->pixmap.count);
- smp_mb__after_atomic_dec();
}
void accel_putcs(struct vc_data *vc, struct fb_info *info,
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c
index 4dea35376d2c..9fa0f4b9a38e 100644
--- a/drivers/video/fbmem.c
+++ b/drivers/video/fbmem.c
@@ -464,23 +464,32 @@ void move_buf_unaligned(struct fb_info *info, u8 *dst, u8 *src, u32 d_pitch,
*/
u32 fb_get_buffer_offset(struct fb_info *info, u32 size)
{
- u32 align = info->pixmap.buf_align - 1;
- u32 offset, count = 1000;
+ struct fb_pixmap *buf = &info->pixmap;
+ u32 align = buf->buf_align - 1, offset;
- spin_lock(&info->pixmap.lock);
- offset = info->pixmap.offset + align;
+ /* If IO mapped, we need to sync before access, no sharing of
+ * the pixmap is done
+ */
+ if (buf->flags & FB_PIXMAP_IO) {
+ if (info->fbops->fb_sync && (buf->flags & FB_PIXMAP_SYNC))
+ info->fbops->fb_sync(info);
+ return 0;
+ }
+
+ /* See if we fit in the remaining pixmap space */
+ offset = buf->offset + align;
offset &= ~align;
- if (offset + size > info->pixmap.size) {
- while (atomic_read(&info->pixmap.count) && count--);
- if (info->fbops->fb_sync &&
- info->pixmap.flags & FB_PIXMAP_SYNC)
+ if (offset + size > buf->size) {
+ /* We do not fit. In order to be able to re-use the buffer,
+ * we must ensure no asynchronous DMA'ing or whatever operation
+ * is in progress, we sync for that.
+ */
+ if (info->fbops->fb_sync && (buf->flags & FB_PIXMAP_SYNC))
info->fbops->fb_sync(info);
offset = 0;
}
- info->pixmap.offset = offset + size;
- atomic_inc(&info->pixmap.count);
- smp_mb__after_atomic_inc();
- spin_unlock(&info->pixmap.lock);
+ buf->offset = offset + size;
+
return offset;
}
@@ -733,8 +742,6 @@ int fb_show_logo(struct fb_info *info)
x <= info->var.xres-fb_logo.logo->width; x += (fb_logo.logo->width + 8)) {
image.dx = x;
info->fbops->fb_imageblit(info, &image);
- //atomic_dec(&info->pixmap.count);
- //smp_mb__after_atomic_dec();
}
if (palette != NULL)
@@ -1254,7 +1261,6 @@ register_framebuffer(struct fb_info *fb_info)
fb_info->pixmap.outbuf = sys_outbuf;
if (fb_info->pixmap.inbuf == NULL)
fb_info->pixmap.inbuf = sys_inbuf;
- spin_lock_init(&fb_info->pixmap.lock);
registered_fb[i] = fb_info;
diff --git a/drivers/video/softcursor.c b/drivers/video/softcursor.c
index 7ac5a923542a..85fde8f50857 100644
--- a/drivers/video/softcursor.c
+++ b/drivers/video/softcursor.c
@@ -74,8 +74,6 @@ int soft_cursor(struct fb_info *info, struct fb_cursor *cursor)
info->cursor.image.data = dst;
info->fbops->fb_imageblit(info, &info->cursor.image);
- atomic_dec(&info->pixmap.count);
- smp_mb__after_atomic_dec();
return 0;
}
diff --git a/include/linux/fb.h b/include/linux/fb.h
index b4a8f5c48312..32d119d0d0ea 100644
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
@@ -363,8 +363,6 @@ struct fb_pixmap {
/* access methods */
void (*outbuf)(u8 *dst, u8 *addr, unsigned int size);
u8 (*inbuf) (u8 *addr);
- spinlock_t lock; /* spinlock */
- atomic_t count;
};
/*