[PATCH s3virge] Do not use deprecated xf86PciInfo.h
From: Tormod Volden debian.tor...@gmail.com Signed-off-by: Tormod Volden debian.tor...@gmail.com --- src/s3v.h|3 --- src/s3v_accel.c |1 + src/s3v_dga.c|1 - src/s3v_driver.c |5 +++-- src/s3v_hwcurs.c |1 + src/s3v_i2c.c|1 - src/s3v_pciids.h | 18 ++ src/s3v_shadow.c |1 - src/s3v_xv.c |5 +++-- 9 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 src/s3v_pciids.h diff --git a/src/s3v.h b/src/s3v.h index 42b1f83..f4976ca 100644 --- a/src/s3v.h +++ b/src/s3v.h @@ -40,9 +40,6 @@ in this Software without prior written authorization from the XFree86 Project. /* Everything using inb/outb, etc needs compiler.h */ #include compiler.h -/* Drivers for PCI hardware need this */ -#include xf86PciInfo.h - /* Drivers that need to access the PCI config space directly need this */ #include xf86Pci.h diff --git a/src/s3v_accel.c b/src/s3v_accel.c index 2e6d798..7837e4a 100644 --- a/src/s3v_accel.c +++ b/src/s3v_accel.c @@ -30,6 +30,7 @@ in this Software without prior written authorization from the XFree86 Project. #include unistd.h #include s3v.h +#include s3v_pciids.h #include miline.h /* fb includes are in s3v.h */ diff --git a/src/s3v_dga.c b/src/s3v_dga.c index 57d05ef..ecf8571 100644 --- a/src/s3v_dga.c +++ b/src/s3v_dga.c @@ -62,7 +62,6 @@ in this Software without prior written authorization from the XFree86 Project. #include xf86.h #include xf86_OSproc.h #include xf86Pci.h -#include xf86PciInfo.h #include xaa.h #include xaalocal.h #include s3v.h diff --git a/src/s3v_driver.c b/src/s3v_driver.c index 5f64be1..7064b1e 100644 --- a/src/s3v_driver.c +++ b/src/s3v_driver.c @@ -57,8 +57,9 @@ in this Software without prior written authorization from the XFree86 Project. */ - /* Most xf86 commons are already in s3v.h */ -#include s3v.h +/* Most xf86 commons are already in s3v.h */ +#include s3v.h +#include s3v_pciids.h #include globals.h diff --git a/src/s3v_hwcurs.c b/src/s3v_hwcurs.c index 53c539f..58e8fd9 100644 --- a/src/s3v_hwcurs.c +++ b/src/s3v_hwcurs.c @@ -39,6 +39,7 @@ in this Software without prior written authorization from the XFree86 Project. #include s3v.h +#include s3v_pciids.h /* protos */ diff --git a/src/s3v_i2c.c b/src/s3v_i2c.c index cbac21f..6bbfd1e 100644 --- a/src/s3v_i2c.c +++ b/src/s3v_i2c.c @@ -58,7 +58,6 @@ in this Software without prior written authorization from the XFree86 Project. #include compiler.h #include xf86Pci.h -#include xf86PciInfo.h #include vgaHW.h diff --git a/src/s3v_pciids.h b/src/s3v_pciids.h new file mode 100644 index 000..5d11333 --- /dev/null +++ b/src/s3v_pciids.h @@ -0,0 +1,18 @@ +#ifndef S3V_PCIIDS_H +#define S3V_PCIIDS_H + +#define PCI_VENDOR_S3 0x5333 +#define PCI_CHIP_VIRGE 0x5631 +#define PCI_CHIP_TRIO 0x8811 +#define PCI_CHIP_TRIO64UVP 0x8814 +#define PCI_CHIP_VIRGE_VX 0x883D +#define PCI_CHIP_TRIO64V2_DXGX 0x8901 +#define PCI_CHIP_Trio3D0x8904 +#define PCI_CHIP_VIRGE_DXGX0x8A01 +#define PCI_CHIP_VIRGE_GX2 0x8A10 +#define PCI_CHIP_Trio3D_2X 0x8A13 +#define PCI_CHIP_VIRGE_MX 0x8C01 +#define PCI_CHIP_VIRGE_MXPLUS 0x8C02 +#define PCI_CHIP_VIRGE_MXP 0x8C03 + +#endif /* S3V_PCIIDS_H */ diff --git a/src/s3v_shadow.c b/src/s3v_shadow.c index e2e1269..82b763f 100644 --- a/src/s3v_shadow.c +++ b/src/s3v_shadow.c @@ -60,7 +60,6 @@ in this Software without prior written authorization from the XFree86 Project. #include xf86.h #include xf86_OSproc.h -#include xf86PciInfo.h #include xf86Pci.h #include shadowfb.h #include servermd.h diff --git a/src/s3v_xv.c b/src/s3v_xv.c index cc836d4..2466789 100644 --- a/src/s3v_xv.c +++ b/src/s3v_xv.c @@ -40,8 +40,9 @@ in this Software without prior written authorization from the XFree86 Project. #include config.h #endif - /* Most xf86 commons are already in s3v.h */ -#include s3v.h +/* Most xf86 commons are already in s3v.h */ +#include s3v.h +#include s3v_pciids.h #if 0 #define OFF_DELAY 250 /* milliseconds */ -- 1.7.7.3 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[Resend] Patch: fix regression introduced in intel driver version 2.16.0
Hi,
I sent this message on 29 December, but I guess all the intel driver developers
were busy with
(well-earned) Yuletide relaxing. Here it is again with the graphics-related
output from lspci
added...
I recently upgraded from version 2.15.0 of the intel driver to 2.17.0 but found
that with the latter
a trail of 'droppings' was left in the otherwise blank areas of a konqueror
window when an icon was
dragged around in the window, under kde-3.5.10. The 'droppings' can be cleaned
up by refreshing the
window. Investigation showed that the fault is also present in 2.16.0. I cloned
the git archive and
through bisection identified the change that introduced the problem as:
commit ace324e4aa27effdd621156eec03f3f87b610732
Author: Eric Anholt e...@anholt.net
Date: Tue May 31 23:13:18 2011 -0700
uxa: Simplify BLT solid acceleration for spans filling by only clipping
once.
Due to subsequent changes that patch cannot be reverted but the attached patch
reverts the 2.17.0
driver to its old (2.15.0) behaviour and eliminates the 'droppings'.
lspci -vvv gives:
00:02.0 VGA compatible controller: Intel Corporation Mobile 4 Series Chipset
Integrated Graphics
Controller (rev 07)(prog-if 00 [VGA controller])
Subsystem: Hewlett-Packard Company Device 3069
Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr-
Stepping- SERR- FastB2B-
DisINTx-
Status: Cap+ 66MHz- UDF- FastB2B+ ParErr- DEVSEL=fast TAbort- TAbort-
MAbort- SERR-
PERR- INTx-
Latency: 0
Interrupt: pin A routed to IRQ 16
Region 0: Memory at d000 (64-bit, non-prefetchable) [size=4M]
Region 2: Memory at c000 (64-bit, prefetchable) [size=256M]
Region 4: I/O ports at 4110 [size=8]
Expansion ROM at unassigned [disabled]
Capabilities: [90] MSI: Enable- Count=1/1 Maskable- 64bit-
Address: Data:
Capabilities: [d0] Power Management version 3
Flags: PMEClk- DSI+ D1- D2- AuxCurrent=0mA
PME(D0-,D1-,D2-,D3hot-,D3cold-)
Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=0 PME-
Kernel driver in use: i915
00:02.1 Display controller: Intel Corporation Mobile 4 Series Chipset
Integrated Graphics Controller
(rev 07)
Subsystem: Hewlett-Packard Company Device 3069
Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr-
Stepping- SERR- FastB2B-
DisINTx-
Status: Cap+ 66MHz- UDF- FastB2B+ ParErr- DEVSEL=fast TAbort- TAbort-
MAbort- SERR-
PERR- INTx-
Latency: 0
Region 0: Memory at d240 (64-bit, non-prefetchable) [size=1M]
Capabilities: [d0] Power Management version 3
Flags: PMEClk- DSI+ D1- D2- AuxCurrent=0mA
PME(D0-,D1-,D2-,D3hot-,D3cold-)
Status: D0 NoSoftRst- PME-Enable- DSel=0 DScale=0 PME-
Happy to test a better patch that anyone cooks up.
Chris
--
The more I see, the more I know. The more I know, the less I understand.
Changing Man - Paul Weller
--- xf86-video-intel-2.17.0/uxa/uxa-accel.c.droppings 2011-08-29 10:21:25.0 +0100
+++ xf86-video-intel-2.17.0/uxa/uxa-accel.c 2011-12-19 22:50:16.0 +
@@ -45,9 +45,11 @@ uxa_fill_spans(DrawablePtr pDrawable, GC
uxa_screen_t *uxa_screen = uxa_get_screen(screen);
RegionPtr pClip = fbGetCompositeClip(pGC);
PixmapPtr dst_pixmap;
- BoxPtr pbox;
+ BoxPtr pextent, pbox;
int nbox;
- int x1, x2, y;
+ int extentX1, extentX2, extentY1, extentY2;
+ int fullX1, fullX2, fullY1;
+ int partX1, partX2;
int off_x, off_y;
if (uxa_screen-swappedOut || uxa_screen-force_fallback)
@@ -70,32 +72,58 @@ uxa_fill_spans(DrawablePtr pDrawable, GC
pGC-fgPixel))
goto fallback;
+ pextent = REGION_EXTENTS(pGC-screen, pClip);
+ extentX1 = pextent-x1;
+ extentY1 = pextent-y1;
+ extentX2 = pextent-x2;
+ extentY2 = pextent-y2;
while (n--) {
- x1 = ppt-x;
- y = ppt-y;
- x2 = x1 + (int)*pwidth;
+ fullX1 = ppt-x;
+ fullY1 = ppt-y;
+ fullX2 = fullX1 + (int)*pwidth;
ppt++;
pwidth++;
- nbox = REGION_NUM_RECTS(pClip);
- pbox = REGION_RECTS(pClip);
- while (nbox--) {
- if (pbox-y1 y || pbox-y2 = y)
-continue;
+ if (fullY1 extentY1 || extentY2 = fullY1)
+ continue;
- if (x1 pbox-x1)
-x1 = pbox-x1;
+ if (fullX1 extentX1)
+ fullX1 = extentX1;
- if (x2 pbox-x2)
-x2 = pbox-x2;
+ if (fullX2 extentX2)
+ fullX2 = extentX2;
- if (x2 = x1)
-continue;
+ if (fullX1 = fullX2)
+ continue;
+ nbox = REGION_NUM_RECTS(pClip);
+ if (nbox == 1) {
(*uxa_screen-info-solid) (dst_pixmap,
- x1 + off_x, y + off_y,
- x2 + off_x, y + 1 + off_y);
- pbox++;
+ fullX1 + off_x,
+ fullY1 + off_y,
+ fullX2 + off_x,
+ fullY1 + 1 + off_y);
+ } else {
+ pbox = REGION_RECTS(pClip);
+ while (nbox--) {
+if (pbox-y1 = fullY1 fullY1 pbox-y2) {
+ partX1 = pbox-x1;
+ if (partX1 fullX1)
+ partX1 = fullX1;
+ partX2 =
Re: [PATCH s3virge] Do not use deprecated xf86PciInfo.h
Tormod Volden lists.tor...@gmail.com (08/01/2012): From: Tormod Volden debian.tor...@gmail.com Looks reasonable. Reviewed-by: Cyril Brulebois k...@debian.org Mraw, KiBi. signature.asc Description: Digital signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [Resend] Patch: fix regression introduced in intel driver version 2.16.0
Hi, On 6 January 2012 14:53, Chris Clayton chris2...@googlemail.com wrote: I sent this message on 29 December, but I guess all the intel driver developers were busy with (well-earned) Yuletide relaxing. Here it is again with the graphics-related output from lspci added... The Intel guys have their own list at intel-...@lists.x.org - you might want to send it there. Note that you'll need to subscribe first though, or it'll get auto-rejected. Cheers, Daniel ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [Resend] Patch: fix regression introduced in intel driver version 2.16.0
On Fri, 6 Jan 2012 14:53:29 +, Chris Clayton chris2...@googlemail.com wrote: Hi, I sent this message on 29 December, but I guess all the intel driver developers were busy with (well-earned) Yuletide relaxing. Here it is again with the graphics-related output from lspci added... I recently upgraded from version 2.15.0 of the intel driver to 2.17.0 but found that with the latter a trail of 'droppings' was left in the otherwise blank areas of a konqueror window when an icon was dragged around in the window, under kde-3.5.10. The 'droppings' can be cleaned up by refreshing the window. Investigation showed that the fault is also present in 2.16.0. I cloned the git archive and through bisection identified the change that introduced the problem as: commit ace324e4aa27effdd621156eec03f3f87b610732 Author: Eric Anholt e...@anholt.net Date: Tue May 31 23:13:18 2011 -0700 uxa: Simplify BLT solid acceleration for spans filling by only clipping once. Due to subsequent changes that patch cannot be reverted but the attached patch reverts the 2.17.0 driver to its old (2.15.0) behaviour and eliminates the 'droppings'. Should be fixed with commit 429a36f7481b9bfd5ed137642d2916d69a713557 Author: Chris Wilson ch...@chris-wilson.co.uk Date: Fri Dec 9 09:54:12 2011 + uxa: Fix clip processing for uxa_fill_spans() Fixes regression from e0066e77e026b0dd0daa0c3765473c7d63aa6753 (uxa: Simplify Composite solid acceleration for spans by only clipping once) [2.15.901] Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43649 Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk Can you confirm by testing with master? -Chris -- Chris Wilson, Intel Open Source Technology Centre ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:intel-gpu-tools 0/6] Port to Solaris
On Fri, 6 Jan 2012 14:37:15 -0800, Alan Coopersmith alan.coopersm...@oracle.com wrote: This allows the tools to build on Solaris 11, using either gcc 4.5.2 or Solaris Studio 12.3. The tools that require the Linux debugfs don't run, but others, such as intel_gpu_top and intel_reg_dumper do work. I've tried not to break any other platforms, but haven't tested on any to confirm that. Alan Coopersmith (6): Provide Solaris implementation of intel_get_total_ram_mb Solaris defines struct winsize in termios.h Use sched_yield if pthread_yield is not available List out array values instead of using gcc range extension include fcntl.h in lib/intel_mmio.c for open() prototype on Solaris Fix pthread compiler flags to work on Solaris and with Studio compiler Acked-by: Eric Anholt e...@anholt.net pgp5XP5DaXLS9.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PULL updated] input fixes
Updated pull request with more bugfixes The following changes since commit 98cde254acb9b98337ddecf64c138d38c14ec2bf: Bump version to 1.11.99.901 (1.12 RC1) (2011-12-27 14:02:39 -0800) are available in the git repository at: git://people.freedesktop.org/~whot/xserver for-keith Andreas Wettstein (1): xkb: Message actions suppress other key presses #28575 Peter Hutterer (5): xfree86: split warning about missing identifier or input driver dix: send focus events to the immediate parent (#44079) dix: on PointerRootWin send a FocusIn to the sprite window too dix: fix wrong condition checking for attached slave (#44003) Xi: change XIChangeDeviceProperty from const pointer to const void * Xi/xiproperty.c|2 +- dix/enterleave.c |9 ++--- dix/getevents.c|2 +- hw/xfree86/common/xf86Xinput.c | 11 ++- include/exevents.h |2 +- xkb/xkbActions.c |2 +- 6 files changed, 16 insertions(+), 12 deletions(-) pgp8z1pSXfiJ2.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PULL] Multitouch fixes
Addition of a new event flag and two fixes for grabbing clients. The following changes since commit 98cde254acb9b98337ddecf64c138d38c14ec2bf: Bump version to 1.11.99.901 (1.12 RC1) (2011-12-27 14:02:39 -0800) are available in the git repository at: git://people.freedesktop.org/~whot/xserver multitouch Carlos Garnacho (1): dix: Set XITouchEmulatingPointer on events from the touch sequence emulating pointer events Chase Douglas (2): Don't end touchpoint if owning client hasn't accepted/rejected Remove last listener on touch reject Peter Hutterer (1): Require inputproto 2.1.99.5 Xi/exevents.c | 20 ++-- configure.ac |2 +- dix/eventconvert.c |4 3 files changed, 15 insertions(+), 11 deletions(-) pgpyOAMhEAoBo.pgp Description: PGP signature ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH] render: don't bother with animated cursors on floating slaves (#39989)
In the case of floating slave devices that is reattached to a master with an
animated cursor, that cursor may jump outside it's window confines. Since
floating slaves never display a cursor anyway, we might as well short-cut
this and exit early.
X.Org Bug 39989 http://bugs.freedesktop.org/show_bug.cgi?id=39989
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Tested-by: Harald Judt h.j...@gmx.at
---
render/animcur.c |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/render/animcur.c b/render/animcur.c
index 4cf1fdf..0f174fd 100644
--- a/render/animcur.c
+++ b/render/animcur.c
@@ -208,6 +208,9 @@ AnimCurDisplayCursor (DeviceIntPtr pDev,
AnimCurScreenPtras = GetAnimCurScreen(pScreen);
Bool ret;
+if (IsFloating(pDev))
+ return FALSE;
+
Unwrap (as, pScreen, DisplayCursor);
if (IsAnimCur(pCursor))
{
--
1.7.7.4
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
[PATCH] dix: Update pointer limits for floating devices too (#43635)
When the screen is restructured, the pointer limits need to be reset for
floating slave devices as well, not just for master pointers. Only skip
devices that don't have a cursor (attached slaves and keyboard)
Bug reproducer: float an absolute slave device, rotate the screen - the
device is now confined to a section of the screen only.
X.Org Bug 43635 http://bugs.freedesktop.org/show_bug.cgi?id=43635
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
---
dix/events.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dix/events.c b/dix/events.c
index daed46b..358e646 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -1368,7 +1368,7 @@ ScreenRestructured (ScreenPtr pScreen)
for (pDev = inputInfo.devices; pDev; pDev = pDev-next)
{
-if (!DevHasCursor(pDev))
+if (!IsFloating(pDev) !DevHasCursor(pDev))
continue;
/* GrabDevice doesn't have a confineTo field, so we don't need to
--
1.7.7.4
___
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [PATCH:intel-gpu-tools 0/6] Port to Solaris
On Fri, Jan 06, 2012 at 02:37:15PM -0800, Alan Coopersmith wrote: This allows the tools to build on Solaris 11, using either gcc 4.5.2 or Solaris Studio 12.3. The tools that require the Linux debugfs don't run, but others, such as intel_gpu_top and intel_reg_dumper do work. I've tried not to break any other platforms, but haven't tested on any to confirm that. Applied. Thanks a lot for the patches. One small nitpick to annoy you: I prefer patch revision notes in the commit messages - makes it easier to check that I've applied the right version with git am ;-) Yours, Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48 ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
Re: [Resend] Patch: fix regression introduced in intel driver version 2.16.0
On Sunday 08 January 2012 18:07:01 Chris Wilson wrote: On Fri, 6 Jan 2012 14:53:29 +, Chris Clayton chris2...@googlemail.com wrote: Hi, I sent this message on 29 December, but I guess all the intel driver developers were busy with (well-earned) Yuletide relaxing. Here it is again with the graphics-related output from lspci added... I recently upgraded from version 2.15.0 of the intel driver to 2.17.0 but found that with the latter a trail of 'droppings' was left in the otherwise blank areas of a konqueror window when an icon was dragged around in the window, under kde-3.5.10. The 'droppings' can be cleaned up by refreshing the window. Investigation showed that the fault is also present in 2.16.0. I cloned the git archive and through bisection identified the change that introduced the problem as: commit ace324e4aa27effdd621156eec03f3f87b610732 Author: Eric Anholt e...@anholt.net Date: Tue May 31 23:13:18 2011 -0700 uxa: Simplify BLT solid acceleration for spans filling by only clipping once. Due to subsequent changes that patch cannot be reverted but the attached patch reverts the 2.17.0 driver to its old (2.15.0) behaviour and eliminates the 'droppings'. Should be fixed with commit 429a36f7481b9bfd5ed137642d2916d69a713557 Author: Chris Wilson ch...@chris-wilson.co.uk Date: Fri Dec 9 09:54:12 2011 + uxa: Fix clip processing for uxa_fill_spans() Fixes regression from e0066e77e026b0dd0daa0c3765473c7d63aa6753 (uxa: Simplify Composite solid acceleration for spans by only clipping once) [2.15.901] Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=43649 Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk Can you confirm by testing with master? Yes, a driver built from a clone of git://anongit.freedesktop.org/xorg/driver/xf86-video-intel taken a few minutes ago does not exhibit the problem I reported. Thanks, Chris. Chris -Chris -- The more I see, the more I know. The more I know, the less I understand. Changing Man - Paul Weller ___ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
