mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 23:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

CFbAccelARM::paintRect readded and for MIPS also added

Browse Source 
Conflicts:
	src/driver/fb_accel_arm.cpp
This commit is contained in:
redblue-pkt
2020-06-11 13:10:40 +02:00
committed by Thilo Graf
parent ae3d31b74b
commit 42890325d7
5 changed files with 345 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

246
src/driver/fb_accel_mips.cpp
View File

@@ -39,11 +39,13 @@
#include <stdlib.h>
#include <driver/abstime.h>
#include <system/set_threadname.h>
#include <gui/color.h>
#define LOGTAG "[fb_accel_mips] "
#define FBIO_BLIT 0x22
#define FBIO_ACCEL 0x23
static unsigned int displaylist[1024];
@@ -56,6 +58,172 @@ static bool supportblendingflags = true;
static int fb_fd = -1;
static int exec_list(void);
static bool accumulateoperations = false;
bool bcm_accel_has_alphablending()
{
return supportblendingflags;
}
int bcm_accel_accumulate()
{
#ifdef SUPPORT_ACCUMULATED_ACCELERATION_OPERATIONS
accumulateoperations = true;
return 0;
#else
return -1;
#endif
}
int bcm_accel_sync()
{
int retval = 0;
if (accumulateoperations)
{
if (ptr)
{
dprintf(DEBUG_NORMAL,"bcm_accel_sync: ptr %d\n", ptr);
retval = exec_list();
}
accumulateoperations = false;
}
return retval;
}
void bcm_accel_blit(
int src_addr, int src_width, int src_height, int src_stride, int src_format,
int dst_addr, int dst_width, int dst_height, int dst_stride,
int src_x, int src_y, int width, int height,
int dst_x, int dst_y, int dwidth, int dheight,
int pal_addr, int flags)
{
if (accumulateoperations)
{
if (((sizeof(displaylist) / sizeof(displaylist[0]) - ptr) / 2) < 40)
{
dprintf(DEBUG_NORMAL,"bcm_accel_blit: not enough space to accumulate\n");
bcm_accel_sync();
bcm_accel_accumulate();
}
}
C(0x43); // reset source
C(0x53); // reset dest
C(0x5b); // reset pattern
C(0x67); // reset blend
C(0x75); // reset output
P(0x0, src_addr); // set source addr
P(0x1, src_stride); // set source pitch
P(0x2, src_width); // source width
P(0x3, src_height); // height
switch (src_format)
{
case 0:
P(0x4, 0x7e48888); // format: ARGB 8888
break;
case 1:
P(0x4, 0x12e40008); // indexed 8bit
P(0x78, 256);
P(0x79, pal_addr);
P(0x7a, 0x7e48888);
break;
}
C(0x5); // set source surface (based on last parameters)
P(0x2e, src_x); // define rect
P(0x2f, src_y);
P(0x30, width);
P(0x31, height);
C(0x32); // set this rect as source rect
P(0x0, dst_addr); // prepare output surface
P(0x1, dst_stride);
P(0x2, dst_width);
P(0x3, dst_height);
P(0x4, 0x7e48888);
C(0x69); // set output surface
P(0x2e, dst_x); // prepare output rect
P(0x2f, dst_y);
P(0x30, dwidth);
P(0x31, dheight);
C(0x6e); // set this rect as output rect
if (supportblendingflags && flags) P(0x80, flags); /* blend flags... We'd really like some blending support in the drivers, to avoid punching holes in the osd */
C(0x77); // do it
if (!accumulateoperations) exec_list();
}
void bcm_accel_fill(
int dst_addr, int dst_width, int dst_height, int dst_stride,
int x, int y, int width, int height,
unsigned long color)
{
if (accumulateoperations)
{
if (((sizeof(displaylist) / sizeof(displaylist[0]) - ptr) / 2) < 40)
{
dprintf(DEBUG_NORMAL,"bcm_accel_fill: not enough space to accumulate\n");
bcm_accel_sync();
bcm_accel_accumulate();
}
}
C(0x43); // reset source
C(0x53); // reset dest
C(0x5b); // reset pattern
C(0x67); // reset blend
C(0x75); // reset output
// clear dest surface
P(0x0, 0);
P(0x1, 0);
P(0x2, 0);
P(0x3, 0);
P(0x4, 0);
C(0x45);
// clear src surface
P(0x0, 0);
P(0x1, 0);
P(0x2, 0);
P(0x3, 0);
P(0x4, 0);
C(0x5);
P(0x2d, color);
P(0x2e, x); // prepare output rect
P(0x2f, y);
P(0x30, width);
P(0x31, height);
C(0x6e); // set this rect as output rect
P(0x0, dst_addr); // prepare output surface
P(0x1, dst_stride);
P(0x2, dst_width);
P(0x3, dst_height);
P(0x4, 0x7e48888);
C(0x69); // set output surface
P(0x6f, 0);
P(0x70, 0);
P(0x71, 2);
P(0x72, 2);
C(0x73); // select color keying
C(0x77); // do it
if (!accumulateoperations) exec_list();
}
static int exec_list(void)
{
int ret;
@@ -76,6 +244,7 @@ static int exec_list(void)
CFbAccelMIPS::CFbAccelMIPS()
{
blit_thread = false;
fb_name = "mipsbox framebuffer";
fb_fd = open(FB_DEVICE, O_RDWR);
if (fb_fd < 0)
@@ -99,10 +268,18 @@ CFbAccelMIPS::CFbAccelMIPS()
/* hardware doesn't allow us to detect whether the opcode is working */
supportblendingflags = false;
#endif
OpenThreads::Thread::start();
}
CFbAccelMIPS::~CFbAccelMIPS()
{
if (blit_thread)
{
blit_thread = false;
blit(); /* wakes up the thread */
OpenThreads::Thread::join();
}
if (fb_fd >= 0)
{
close(fb_fd);
@@ -220,3 +397,72 @@ bool CFbAccelMIPS::fullHdAvailable()
#endif
return false;
}
#define BLIT_INTERVAL_MIN 40
#define BLIT_INTERVAL_MAX 250
void CFbAccelMIPS::run()
{
printf(LOGTAG "run start\n");
int64_t last_blit = 0;
blit_pending = false;
blit_thread = true;
blit_mutex.lock();
set_threadname("mipsfb::autoblit");
while (blit_thread) {
blit_cond.wait(&blit_mutex, blit_pending ? BLIT_INTERVAL_MIN : BLIT_INTERVAL_MAX);
int64_t now = time_monotonic_ms();
if (now - last_blit < BLIT_INTERVAL_MIN)
{
blit_pending = true;
//printf(LOGTAG "run: skipped, time %" PRId64 "\n", now - last_blit);
}
else
{
blit_pending = false;
blit_mutex.unlock();
_blit();
blit_mutex.lock();
last_blit = now;
}
}
blit_mutex.unlock();
printf(LOGTAG "run end\n");
}
void CFbAccelMIPS::blit()
{
//printf(LOGTAG "blit\n");
blit_mutex.lock();
blit_cond.signal();
blit_mutex.unlock();
}
void CFbAccelMIPS::_blit()
{
if (ioctl(fd, FBIO_BLIT) < 0)
printf("FBIO_BLIT");
}
#if ENABLE_MIPS_ACC
void CFbAccelMIPS::paintRect(const int x, const int y, const int dx, const int dy, const fb_pixel_t col)
{
if(dx <1 || dy <1 )
return;
bcm_accel_fill(fix.smem_start, screeninfo.xres, screeninfo.yres, stride,x, y, dx, dy,col);
int line = 0;
fb_pixel_t *fbp = getFrameBufferPointer() + (swidth * y);
int pos;
while (line < dy)
{
for (pos = x; pos < x + dx; pos++)
*(fbp + pos) = col;
fbp += swidth;
line++;
}
mark(x, y, x+dx, y+dy);
blit();
}
#endif