src/via_id.c | 5 ++--
src/via_video.c | 68 --------------------------------------------------------
2 files changed, 4 insertions(+), 69 deletions(-)
New commits:
commit e8497d02f67ec8caf5b7d5b88b6b00fcd414709f
Author: gang65 <gang65@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Tue May 3 13:14:24 2011 +0000
Fix Xvideo crash on X.Org server 1.10
git-svn-id: http://svn.openchrome.org/svn/trunk@920
e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_video.c b/src/via_video.c
index 310f44b..58538d8 100644
--- a/src/via_video.c
+++ b/src/via_video.c
@@ -694,72 +694,6 @@ viaInitVideo(ScreenPtr pScreen)
}
}
-
-/*
- * This one gets called, for example, on panning.
- */
-
-static int
-viaReputImage(ScrnInfoPtr pScrn,
- short drw_x, short drw_y, RegionPtr clipBoxes, pointer data,
- DrawablePtr pDraw)
-{
-
- DDUPDATEOVERLAY UpdateOverlay_Video;
- LPDDUPDATEOVERLAY lpUpdateOverlay = &UpdateOverlay_Video;
- viaPortPrivPtr pPriv = (viaPortPrivPtr) data;
- VIAPtr pVia = VIAPTR(pScrn);
-
- if (!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) {
- REGION_COPY(pScrn->pScreen, &pPriv->clip, clipBoxes);
- if (pPriv->autoPaint) {
- if (pDraw->type == DRAWABLE_WINDOW) {
- /* TODO Replace xf86XVFillKeyHelper with
xf86XVFillKeyHelperDrawable
- Currently resizing problem exist in VLC Media Player
- Example of implementation:
- xf86XVFillKeyHelperDrawable(pDraw, pPriv->colorKey, clipBoxes);
- DamageDamageRegion(pDraw, clipBoxes); */
-
- xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey,
clipBoxes);
- } else {
- xf86XVFillKeyHelper(pScrn->pScreen, pPriv->colorKey,
clipBoxes);
- }
- }
- }
-
- if (drw_x == pPriv->old_drw_x &&
- drw_y == pPriv->old_drw_y &&
- pVia->swov.oldPanningX == pVia->swov.panning_x &&
- pVia->swov.oldPanningY == pVia->swov.panning_y) {
- viaXvError(pScrn, pPriv, xve_none);
- return Success;
- }
-
- lpUpdateOverlay->SrcLeft = pPriv->old_src_x;
- lpUpdateOverlay->SrcTop = pPriv->old_src_y;
- lpUpdateOverlay->SrcRight = pPriv->old_src_x + pPriv->old_src_w;
- lpUpdateOverlay->SrcBottom = pPriv->old_src_y + pPriv->old_src_h;
-
- lpUpdateOverlay->DstLeft = drw_x;
- lpUpdateOverlay->DstTop = drw_y;
- lpUpdateOverlay->DstRight = drw_x + pPriv->old_drw_w;
- lpUpdateOverlay->DstBottom = drw_y + pPriv->old_drw_h;
- pPriv->old_drw_x = drw_x;
- pPriv->old_drw_y = drw_y;
-
- lpUpdateOverlay->dwFlags = DDOVER_KEYDEST;
-
- if (pScrn->bitsPerPixel == 8)
- lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey & 0xff;
- else
- lpUpdateOverlay->dwColorSpaceLowValue = pPriv->colorKey;
-
- VIAVidUpdateOverlay(pScrn, lpUpdateOverlay);
-
- viaXvError(pScrn, pPriv, xve_none);
- return Success;
-}
-
static unsigned
viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr ** adaptors)
{
@@ -820,7 +754,7 @@ viaSetupAdaptors(ScreenPtr pScreen, XF86VideoAdaptorPtr **
adaptors)
viaAdaptPtr[i]->GetPortAttribute = viaGetPortAttribute;
viaAdaptPtr[i]->SetPortAttribute = viaSetPortAttribute;
viaAdaptPtr[i]->PutImage = viaPutImage;
- viaAdaptPtr[i]->ReputImage = viaReputImage;
+ viaAdaptPtr[i]->ReputImage = NULL;
viaAdaptPtr[i]->QueryImageAttributes = viaQueryImageAttributes;
for (j = 0; j < numPorts; ++j) {
viaPortPriv[j].dmaBounceBuffer = NULL;
commit 7aed4417b28d407fbb0d244a1bcafb7e7334c462
Author: schlobinux <schlobinux@e8d65cb0-85f4-0310-8831-c60e2a5ce829>
Date: Thu Apr 21 21:42:06 2011 +0000
Sharp Mebius PC-CS30H
git-svn-id: http://svn.openchrome.org/svn/trunk@919
e8d65cb0-85f4-0310-8831-c60e2a5ce829
diff --git a/src/via_id.c b/src/via_id.c
index 053b516..d5f5fdb 100644
--- a/src/via_id.c
+++ b/src/via_id.c
@@ -93,6 +93,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"Shuttle FX21", VIA_K8M800, 0x1297, 0x3052,
VIA_DEVICE_CRT},
{"Shuttle FX83", VIA_K8M800, 0x1297, 0xF683,
VIA_DEVICE_CRT | VIA_DEVICE_TV},
{"Sharp Actius AL27", VIA_K8M800, 0x13BD, 0x1044,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+ {"Sharp Mebius PC-CS30H", VIA_K8M800, 0x13BD, 0x1047,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Sharp PC-AE30J", VIA_K8M800, 0x13BD, 0x104B,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Giga-byte GA-K8VM800M", VIA_K8M800, 0x1458, 0xD000,
VIA_DEVICE_CRT},
{"MSI K8M Neo-V", VIA_K8M800, 0x1462, 0x0320,
VIA_DEVICE_CRT},
@@ -195,6 +196,7 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"MSI P4M900M3-L", VIA_P4M900, 0x1462, 0x7387,
VIA_DEVICE_CRT},
{"Twinhead H12V", VIA_P4M900, 0x14FF, 0xA00F,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Twinhead K15V", VIA_P4M900, 0x14FF, 0xA012,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
+ {"Semp Informática Notebook IS 1462", VIA_P4M900, 0x1509, 0x1D41,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Everex NC1501/NC1503", VIA_P4M900, 0x1509, 0x1E30,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Clevo M660SE", VIA_P4M900, 0x1558, 0x0664,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Clevo M660SR", VIA_P4M900, 0x1558, 0x0669,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
@@ -204,7 +206,6 @@ static struct ViaCardIdStruct ViaCardId[] = {
{"Fujitsu/Siemens Amilo Pro V3515", VIA_P4M900, 0x1734, 0x10CB,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Fujitsu/Siemens Amilo Li1705", VIA_P4M900, 0x1734, 0x10F7,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"ASRock P4VM900-SATA2", VIA_P4M900, 0x1849, 0x3371,
VIA_DEVICE_CRT},
- {"Semp Informática Notebook IS 1462", VIA_P4M900, 0x1509, 0x1D41,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
/*** CX700 ***/
{"VIA VT8454B", VIA_CX700, 0x0908, 0x1975,
VIA_DEVICE_CRT}, /* Evaluation board, reference possibly wrong */
@@ -231,13 +232,13 @@ static struct ViaCardIdStruct ViaCardId[] = {
/*** VX800 ***/
{"VIA Epia M700", VIA_VX800, 0x1106, 0x1122,
VIA_DEVICE_CRT},
+ {"Siragon ML-6200", VIA_VX800, 0x1106, 0x2211,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Guillemot-Hercules ECafe EC900B", VIA_VX800, 0x1106, 0x3349,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"VIA OpenBook", VIA_VX800, 0x1170, 0x0311,
VIA_DEVICE_CRT | VIA_DEVICE_LCD}, /* VIA OpenBook eNote VBE8910 */
{"Samsung NC20", VIA_VX800, 0x144d, 0xc04e,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"FIC CE2A1", VIA_VX800, 0x1509, 0x3002,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Quanta DreamBook Light IL1", VIA_VX800, 0x152d, 0x0771,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
{"Lenovo S12", VIA_VX800, 0x17aa, 0x388c,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
- {"Siragon ML-6200", VIA_VX800, 0x1106, 0x2211,
VIA_DEVICE_CRT | VIA_DEVICE_LCD},
/*** VX855 ***/
{"VIA VT8562C", VIA_VX855, 0x1106, 0x5122,
VIA_DEVICE_CRT},
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qhaiy-0002qo...@alioth.debian.org
