Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PCI memory access working

Browse Source
This commit is contained in:
Markus Fröschle
2016-10-15 21:26:49 +00:00
parent 369cc9dc0a
commit 42729fa2ea
68 changed files with 14798 additions and 2460 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
video/fbmem.c
View File

@@ -148,25 +148,14 @@ int fb_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
*/
struct fb_info *framebuffer_alloc(unsigned long size)
{
struct fb_info *info = driver_mem_alloc(sizeof(struct fb_info));
/* changed for BaS_gcc:
* we do not allocate anything here anymore, info_fb is statically allocated in video.c
* This leads to the (not really existing) limitation that we only support one Radeon
* card in the system
*/
extern struct fb_info *info_fb;
if (info == NULL)
{
dbg("%s: could not allocate fb_info structure\r\n", __FUNCTION__);
return 0;
}
memset(info, 0, sizeof(struct fb_info));
if (size)
{
char *p = driver_mem_alloc(size);
if (!p)
return NULL;
memset(p, 0, size);
info->par = p;
}
return info;
return info_fb;
}
/**

34
video/video.c
View File

@@ -7,13 +7,8 @@
#include "fb.h"
#include "radeonfb.h"
#define DBG_VIDEO
#ifdef DBG_VIDEO
#define dbg(format, arg...) do { xprintf("DEBUG (%s()): " format, __FUNCTION__, ##arg);} while(0)
#else
#define dbg(format, arg...) do {;} while (0)
#endif /* DBG_VIDEO */
#define err(format, arg...) do { xprintf("ERROR (%s()): " format, __FUNCTION__, ##arg); } while(0)
// #define DEBUG
#include "debug.h"
#ifdef _USE_VIDEL_
#define MON_ALL -1 /* code used in VMODE_ENTRY for match on mode only */
@@ -277,7 +272,13 @@ void videl_screen_init(void)
#endif /* _USE_VIDEL_ */
static struct fb_info fb;
static struct radeonfb_info rfb;
static struct fb_info fb =
{
.par = &rfb
};
struct fb_info *info_fb = &fb;
const char monitor_layout[1024] = "CRT,CRT";
@@ -345,18 +346,15 @@ void video_init(void)
dbg("matched\r\n");
xprintf("not registering RADEON card\r\n");
xprintf("registering RADEON card with PCI handle 0x%02x\r\n", handle);
if (0)
if (radeonfb_pci_register(handle, board) >= 0)
{
if (radeonfb_pci_register(handle, board) >= 0)
{
xprintf("RADEON video card found and registered\r\n");
}
else
{
dbg("failed to register RADEON PCI video card\r\n");
}
xprintf("RADEON video card found and registered\r\n");
}
else
{
dbg("failed to register RADEON PCI video card\r\n");
}
return;
}