mirror of
https://github.com/torvalds/linux.git
synced 2024-11-01 09:41:44 +00:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
216 lines
5.6 KiB
C
216 lines
5.6 KiB
C
/*
|
|
* ATI Mach64 CT/VT/GT/LT Cursor Support
|
|
*/
|
|
|
|
#include <linux/fb.h>
|
|
#include <linux/init.h>
|
|
#include <linux/string.h>
|
|
|
|
#include <asm/io.h>
|
|
|
|
#ifdef __sparc__
|
|
#include <asm/fbio.h>
|
|
#endif
|
|
|
|
#include <video/mach64.h>
|
|
#include "atyfb.h"
|
|
|
|
/*
|
|
* The hardware cursor definition requires 2 bits per pixel. The
|
|
* Cursor size reguardless of the visible cursor size is 64 pixels
|
|
* by 64 lines. The total memory required to define the cursor is
|
|
* 16 bytes / line for 64 lines or 1024 bytes of data. The data
|
|
* must be in a contigiuos format. The 2 bit cursor code values are
|
|
* as follows:
|
|
*
|
|
* 00 - pixel colour = CURSOR_CLR_0
|
|
* 01 - pixel colour = CURSOR_CLR_1
|
|
* 10 - pixel colour = transparent (current display pixel)
|
|
* 11 - pixel colour = 1's complement of current display pixel
|
|
*
|
|
* Cursor Offset 64 pixels Actual Displayed Area
|
|
* \_________________________/
|
|
* | | | |
|
|
* |<--------------->| | |
|
|
* | CURS_HORZ_OFFSET| | |
|
|
* | |_______| | 64 Lines
|
|
* | ^ | |
|
|
* | | | |
|
|
* | CURS_VERT_OFFSET| |
|
|
* | | | |
|
|
* |____________________|____| |
|
|
*
|
|
*
|
|
* The Screen position of the top left corner of the displayed
|
|
* cursor is specificed by CURS_HORZ_VERT_POSN. Care must be taken
|
|
* when the cursor hot spot is not the top left corner and the
|
|
* physical cursor position becomes negative. It will be be displayed
|
|
* if either the horizontal or vertical cursor position is negative
|
|
*
|
|
* If x becomes negative the cursor manager must adjust the CURS_HORZ_OFFSET
|
|
* to a larger number and saturate CUR_HORZ_POSN to zero.
|
|
*
|
|
* if Y becomes negative, CUR_VERT_OFFSET must be adjusted to a larger number,
|
|
* CUR_OFFSET must be adjusted to a point to the appropraite line in the cursor
|
|
* definitation and CUR_VERT_POSN must be saturated to zero.
|
|
*/
|
|
|
|
/*
|
|
* Hardware Cursor support.
|
|
*/
|
|
static const u8 cursor_bits_lookup[16] = {
|
|
0x00, 0x40, 0x10, 0x50, 0x04, 0x44, 0x14, 0x54,
|
|
0x01, 0x41, 0x11, 0x51, 0x05, 0x45, 0x15, 0x55
|
|
};
|
|
|
|
static int atyfb_cursor(struct fb_info *info, struct fb_cursor *cursor)
|
|
{
|
|
struct atyfb_par *par = (struct atyfb_par *) info->par;
|
|
u16 xoff, yoff;
|
|
int x, y, h;
|
|
|
|
#ifdef __sparc__
|
|
if (par->mmaped)
|
|
return -EPERM;
|
|
#endif
|
|
if (par->asleep)
|
|
return -EPERM;
|
|
|
|
wait_for_fifo(1, par);
|
|
if (cursor->enable)
|
|
aty_st_le32(GEN_TEST_CNTL, aty_ld_le32(GEN_TEST_CNTL, par)
|
|
| HWCURSOR_ENABLE, par);
|
|
else
|
|
aty_st_le32(GEN_TEST_CNTL, aty_ld_le32(GEN_TEST_CNTL, par)
|
|
& ~HWCURSOR_ENABLE, par);
|
|
|
|
/* set position */
|
|
if (cursor->set & FB_CUR_SETPOS) {
|
|
x = cursor->image.dx - cursor->hot.x - info->var.xoffset;
|
|
if (x < 0) {
|
|
xoff = -x;
|
|
x = 0;
|
|
} else {
|
|
xoff = 0;
|
|
}
|
|
|
|
y = cursor->image.dy - cursor->hot.y - info->var.yoffset;
|
|
if (y < 0) {
|
|
yoff = -y;
|
|
y = 0;
|
|
} else {
|
|
yoff = 0;
|
|
}
|
|
|
|
h = cursor->image.height;
|
|
|
|
/*
|
|
* In doublescan mode, the cursor location
|
|
* and heigh also needs to be doubled.
|
|
*/
|
|
if (par->crtc.gen_cntl & CRTC_DBL_SCAN_EN) {
|
|
y<<=1;
|
|
h<<=1;
|
|
}
|
|
wait_for_fifo(3, par);
|
|
aty_st_le32(CUR_OFFSET, (info->fix.smem_len >> 3) + (yoff << 1), par);
|
|
aty_st_le32(CUR_HORZ_VERT_OFF,
|
|
((u32) (64 - h + yoff) << 16) | xoff, par);
|
|
aty_st_le32(CUR_HORZ_VERT_POSN, ((u32) y << 16) | x, par);
|
|
}
|
|
|
|
/* Set color map */
|
|
if (cursor->set & FB_CUR_SETCMAP) {
|
|
u32 fg_idx, bg_idx, fg, bg;
|
|
|
|
fg_idx = cursor->image.fg_color;
|
|
bg_idx = cursor->image.bg_color;
|
|
|
|
fg = ((info->cmap.red[fg_idx] & 0xff) << 24) |
|
|
((info->cmap.green[fg_idx] & 0xff) << 16) |
|
|
((info->cmap.blue[fg_idx] & 0xff) << 8) | 0xff;
|
|
|
|
bg = ((info->cmap.red[bg_idx] & 0xff) << 24) |
|
|
((info->cmap.green[bg_idx] & 0xff) << 16) |
|
|
((info->cmap.blue[bg_idx] & 0xff) << 8);
|
|
|
|
wait_for_fifo(2, par);
|
|
aty_st_le32(CUR_CLR0, bg, par);
|
|
aty_st_le32(CUR_CLR1, fg, par);
|
|
}
|
|
|
|
if (cursor->set & (FB_CUR_SETSHAPE | FB_CUR_SETIMAGE)) {
|
|
u8 *src = (u8 *)cursor->image.data;
|
|
u8 *msk = (u8 *)cursor->mask;
|
|
u8 __iomem *dst = (u8 __iomem *)info->sprite.addr;
|
|
unsigned int width = (cursor->image.width + 7) >> 3;
|
|
unsigned int height = cursor->image.height;
|
|
unsigned int align = info->sprite.scan_align;
|
|
|
|
unsigned int i, j, offset;
|
|
u8 m, b;
|
|
|
|
// Clear cursor image with 1010101010...
|
|
fb_memset(dst, 0xaa, 1024);
|
|
|
|
offset = align - width*2;
|
|
|
|
for (i = 0; i < height; i++) {
|
|
for (j = 0; j < width; j++) {
|
|
b = *src++;
|
|
m = *msk++;
|
|
switch (cursor->rop) {
|
|
case ROP_XOR:
|
|
// Upper 4 bits of mask data
|
|
fb_writeb(cursor_bits_lookup[(b ^ m) >> 4], dst++);
|
|
// Lower 4 bits of mask
|
|
fb_writeb(cursor_bits_lookup[(b ^ m) & 0x0f],
|
|
dst++);
|
|
break;
|
|
case ROP_COPY:
|
|
// Upper 4 bits of mask data
|
|
fb_writeb(cursor_bits_lookup[(b & m) >> 4], dst++);
|
|
// Lower 4 bits of mask
|
|
fb_writeb(cursor_bits_lookup[(b & m) & 0x0f],
|
|
dst++);
|
|
break;
|
|
}
|
|
}
|
|
dst += offset;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int __devinit aty_init_cursor(struct fb_info *info)
|
|
{
|
|
unsigned long addr;
|
|
|
|
info->fix.smem_len -= PAGE_SIZE;
|
|
|
|
#ifdef __sparc__
|
|
addr = (unsigned long) info->screen_base - 0x800000 + info->fix.smem_len;
|
|
info->sprite.addr = (u8 *) addr;
|
|
#else
|
|
#ifdef __BIG_ENDIAN
|
|
addr = info->fix.smem_start - 0x800000 + info->fix.smem_len;
|
|
info->sprite.addr = (u8 *) ioremap(addr, 1024);
|
|
#else
|
|
addr = (unsigned long) info->screen_base + info->fix.smem_len;
|
|
info->sprite.addr = (u8 *) addr;
|
|
#endif
|
|
#endif
|
|
if (!info->sprite.addr)
|
|
return -ENXIO;
|
|
info->sprite.size = PAGE_SIZE;
|
|
info->sprite.scan_align = 16; /* Scratch pad 64 bytes wide */
|
|
info->sprite.buf_align = 16; /* and 64 lines tall. */
|
|
info->sprite.flags = FB_PIXMAP_IO;
|
|
|
|
info->fbops->fb_cursor = atyfb_cursor;
|
|
|
|
return 0;
|
|
}
|
|
|