shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 21:07:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of 10.10.10.29:/home/rockchip/kernel into develop

Browse Source
This commit is contained in:
蔡枫
2011-06-28 16:16:19 +08:00
parent 3c734df1e9 c2779c627f
commit 5d00576a6e
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/video/rk29_fb.c
View File

@@ -38,6 +38,7 @@
#include <asm/io.h>
#include <asm/div64.h>
#include <asm/uaccess.h>
#include <asm/cacheflush.h>
#include "rk29_fb.h"
@@ -794,20 +795,23 @@ int rk29_set_cursor_img_transform(char *data)
int rk29_set_cursor_img(struct rk29fb_inf *inf, char *data)
{
if(data)
{
rk29_set_cursor_img_transform(data);
if(data)
{
rk29_set_cursor_img_transform(data);
}
else
{
rk29_set_cursor_img_transform(cursor_img);
}
LcdWrReg(inf, HWC_MST, __pa(rk29_cursor_buf));
LcdSetRegisterBit(inf, SYS_CONFIG,m_HWC_RELOAD_EN);
LcdWrReg(inf, REG_CFG_DONE, 0x01);
else
{
rk29_set_cursor_img_transform(cursor_img);
}
LcdWrReg(inf, HWC_MST, __pa(rk29_cursor_buf));
//LcdSetBit(inf, SYS_CONFIG,m_HWC_RELOAD_EN);
LcdSetBit(inf, SYS_CONFIG, m_HWC_RELOAD_EN |m_HWC_ENABLE);
flush_cache_all();
LcdWrReg(inf, REG_CFG_DONE, 0x01);
return 0;
}
int rk29_set_cursor_test(struct fb_info *info)
{
struct rk29fb_inf *inf = dev_get_drvdata(info->device);

4
drivers/video/rk29_fb.h
View File

@@ -28,8 +28,8 @@
#define OUT_S888 8
#define OUT_S888DUMY 12
#define OUT_P16BPP4 24 //ģ<>ⷽʽ,<2C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֧<EFBFBD><D6A7>
#define OUT_D888_P666 0x21 //666<36><36><EFBFBD><EFBFBD>, <20><>DATA2-7, DATA10-15, DATA17-22
#define OUT_D888_P565 0x22 //565<36><35><EFBFBD><EFBFBD>, <20><>DATA3-7, DATA10-15, DATA18-22
#define OUT_D888_P666 0x21 //666<36><36><EFBFBD><EFBFBD>, <20><>DATA2-7, DATA10-15, DATA18-23
#define OUT_D888_P565 0x22 //565<36><35><EFBFBD><EFBFBD>, <20><>DATA3-7, DATA10-15, DATA19-23
/* SYS_CONFIG */
#define m_W2_FORMAT (3<<0)