GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-25 04:29:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sometimes (especially with big images) reading pitch 0 from card's register

Browse Source 
returns 0 (probably due to full card's FIFO), which leads to SIGFPE later.

Fixed (or workarounded) by rereading pitch0, until it's not zero.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10971 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
lumag
2003-10-01 21:03:00 +00:00
parent 457debb6f1
commit 64b4914893
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
vidix/drivers/nvidia_vid.c
+9 -1
View File
@@ -419,6 +419,7 @@ void rivatv_overlay_start (struct rivatv_info *info,int bufno){
/*update depth & dimensions here because it may change with vo vesa or vo fbdev*/
info->chip.lock (&info->chip, 0);
do {
switch (info->chip.arch) {
case NV_ARCH_03:
pitch0 = info->chip.PGRAPH[0x00000650/4];
@@ -430,6 +431,9 @@ void rivatv_overlay_start (struct rivatv_info *info,int bufno){
pitch0 = info->chip.PGRAPH[0x00000670/4];
break;
}
if (pitch0 == 0)
printf("[nvidia_vid]: pitch0 = 0!!! Rereading\n");
} while (pitch0 == 0);
VID_WR08(info->chip.PCIO, 0x03D4, 0x28);
bpp = VID_RD08(info->chip.PCIO,0x03D5);
if(bpp==3)bpp = 4; //fixme do nvidia cards support 24bpp?
@@ -438,7 +442,7 @@ void rivatv_overlay_start (struct rivatv_info *info,int bufno){
if(!bpp)printf("[nvidia_vid] error invalid bpp\n");
else
{
// printf("[nvidia_vid] video mode: %ux%u@%u\n",screen_x = pitch0/bpp,(pitch0/bpp*3)/4,info->depth);
// printf("[nvidia_vid] video mode: %ux%u@%u\n",info->screen_x = pitch0/bpp,(pitch0/bpp*3)/4,info->depth);
info->screen_x = pitch0/bpp;
}
@@ -673,6 +677,7 @@ int vixInit(void){
{
uint32_t bpp=0,pitch0=0;
info->chip.lock (&info->chip, 0);
do {
switch (info->chip.arch) {
case NV_ARCH_03:
pitch0 = info->chip.PGRAPH[0x00000650/4];
@@ -684,6 +689,9 @@ int vixInit(void){
pitch0 = info->chip.PGRAPH[0x00000670/4];
break;
}
if (pitch0 == 0)
printf("[nvidia_vid]: pitch0 = 0!!! Rereading\n");
} while (pitch0 == 0);
VID_WR08(info->chip.PCIO, 0x03D4, 0x28);
bpp = VID_RD08(info->chip.PCIO,0x03D5);
if(bpp==3)bpp = 4; //fixme do nvidia cards support 24bpp?