[PATCH xf86-video-amdgpu 2/2] Fix warnings for unused variables
Remove some unused variables to fix the compiling warnings. Signed-off-by: Jammy Zhou--- src/amdgpu_dri3.c | 2 -- src/amdgpu_glamor.c | 2 -- src/amdgpu_kms.c| 6 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/amdgpu_dri3.c b/src/amdgpu_dri3.c index a89421e..ad5734f 100644 --- a/src/amdgpu_dri3.c +++ b/src/amdgpu_dri3.c @@ -130,8 +130,6 @@ static int amdgpu_dri3_fd_from_pixmap(ScreenPtr screen, CARD16 *stride, CARD32 *size) { - ScrnInfoPtr scrn = xf86ScreenToScrn(screen); - AMDGPUInfoPtr info = AMDGPUPTR(scrn); struct amdgpu_buffer *bo; struct amdgpu_bo_info bo_info; uint32_t fd; diff --git a/src/amdgpu_glamor.c b/src/amdgpu_glamor.c index f994df4..fb0f8ff 100644 --- a/src/amdgpu_glamor.c +++ b/src/amdgpu_glamor.c @@ -81,8 +81,6 @@ Bool amdgpu_glamor_create_screen_resources(ScreenPtr screen) Bool amdgpu_glamor_pre_init(ScrnInfoPtr scrn) { AMDGPUInfoPtr info = AMDGPUPTR(scrn); - pointer glamor_module; - CARD32 version; if (!info->dri2.available) return FALSE; diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c index 32a34cb..91aba2f 100644 --- a/src/amdgpu_kms.c +++ b/src/amdgpu_kms.c @@ -944,10 +944,11 @@ void AMDGPUUnblank(ScrnInfoPtr pScrn) static Bool amdgpu_set_drm_master(ScrnInfoPtr pScrn) { AMDGPUInfoPtr info = AMDGPUPTR(pScrn); - AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn); int err; #ifdef XF86_PDEV_SERVER_FD + AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn); + if (pAMDGPUEnt->platform_dev && (pAMDGPUEnt->platform_dev->flags & XF86_PDEV_SERVER_FD)) return TRUE; @@ -963,9 +964,10 @@ static Bool amdgpu_set_drm_master(ScrnInfoPtr pScrn) static void amdgpu_drop_drm_master(ScrnInfoPtr pScrn) { AMDGPUInfoPtr info = AMDGPUPTR(pScrn); - AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn); #ifdef XF86_PDEV_SERVER_FD + AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn); + if (pAMDGPUEnt->platform_dev && (pAMDGPUEnt->platform_dev->flags & XF86_PDEV_SERVER_FD)) return; -- 1.9.1 ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
[PATCH xf86-video-amdgpu 1/2] Fix crash in PCI probe path (v3)
The crash is caused by the NULL value returned by AMDGPUPTR(pScrn), because the driverPrivate is not allocated yet in PciProbe phase, and it is usually done in the PreInit phase. Use pAMDGPUEnt->fd instead of info->dri2.drm_fd to avoid AMDGPUInfoPtr related code in amdgpu_open_drm_master, so that the crash can be fixed. v3: some more cleanup v2: switch to pAMDGPUEnt->fd, and update the commit message Signed-off-by: Jammy Zhou--- src/amdgpu_probe.c | 37 + 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/src/amdgpu_probe.c b/src/amdgpu_probe.c index 481271b..f6e675c 100644 --- a/src/amdgpu_probe.c +++ b/src/amdgpu_probe.c @@ -147,24 +147,14 @@ static int amdgpu_kernel_open_fd(ScrnInfoPtr pScrn, struct pci_device *dev, return fd; } -static Bool amdgpu_open_drm_master(ScrnInfoPtr pScrn) +static Bool amdgpu_open_drm_master(ScrnInfoPtr pScrn, AMDGPUEntPtr pAMDGPUEnt, + struct pci_device *pci_dev, int entity_num) { - AMDGPUInfoPtr info = AMDGPUPTR(pScrn); - AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn); drmSetVersion sv; int err; - if (pAMDGPUEnt->fd) { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - " reusing fd for second head\n"); - - info->drmmode.fd = info->dri2.drm_fd = pAMDGPUEnt->fd; - pAMDGPUEnt->fd_ref++; - return TRUE; - } - - info->dri2.drm_fd = amdgpu_kernel_open_fd(pScrn, info->PciInfo, NULL); - if (info->dri2.drm_fd == -1) + pAMDGPUEnt->fd = amdgpu_kernel_open_fd(pScrn, pci_dev, NULL); + if (pAMDGPUEnt->fd == -1) return FALSE; /* Check that what we opened was a master or a master-capable FD, @@ -175,18 +165,18 @@ static Bool amdgpu_open_drm_master(ScrnInfoPtr pScrn) sv.drm_di_minor = 1; sv.drm_dd_major = -1; sv.drm_dd_minor = -1; - err = drmSetInterfaceVersion(info->dri2.drm_fd, ); + err = drmSetInterfaceVersion(pAMDGPUEnt->fd, ); if (err != 0) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "[drm] failed to set drm interface version.\n"); - drmClose(info->dri2.drm_fd); + drmClose(pAMDGPUEnt->fd); return FALSE; } return TRUE; } -static Bool amdgpu_get_scrninfo(int entity_num, void *pci_dev) +static Bool amdgpu_get_scrninfo(int entity_num, struct pci_device *pci_dev) { ScrnInfoPtr pScrn = NULL; EntityInfoPtr pEnt; @@ -236,11 +226,13 @@ static Bool amdgpu_get_scrninfo(int entity_num, void *pci_dev) uint32_t minor_version; pPriv->ptr = xnfcalloc(sizeof(AMDGPUEntRec), 1); - pAMDGPUEnt = pPriv->ptr; + if (!pPriv->ptr) + return FALSE; - if (amdgpu_open_drm_master(pScrn)) { + pAMDGPUEnt = pPriv->ptr; + if (!amdgpu_open_drm_master(pScrn, pAMDGPUEnt, + pci_dev, entity_num)) goto error_fd; - } pAMDGPUEnt->fd_ref = 1; @@ -252,8 +244,6 @@ static Bool amdgpu_get_scrninfo(int entity_num, void *pci_dev) "amdgpu_device_initialize failed\n"); goto error_amdgpu; } - } else { - pAMDGPUEnt = pPriv->ptr; } xf86SetEntityInstanceForScreen(pScrn, pEnt->index, @@ -266,7 +256,6 @@ static Bool amdgpu_get_scrninfo(int entity_num, void *pci_dev) error_amdgpu: drmClose(pAMDGPUEnt->fd); - pAMDGPUEnt->fd = 0; error_fd: free(pPriv->ptr); return FALSE; @@ -276,7 +265,7 @@ static Bool amdgpu_pci_probe(DriverPtr pDriver, int entity_num, struct pci_device *device, intptr_t match_data) { - return amdgpu_get_scrninfo(entity_num, (void *)device); + return amdgpu_get_scrninfo(entity_num, device); } static Bool AMDGPUDriverFunc(ScrnInfoPtr scrn, xorgDriverFuncOp op, void *data) -- 1.9.1 ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
Re: [PATCH xf86-video-amdgpu 1/2] Fix crash in PCI probe path (v3)
On 28.10.2015 22:00, William Lewis wrote: > Would it not make more sense to set pAMDGPUEnt->fd to -1 beneath the > error_amdgpu tag? No: > On 10/28/15 08:24, Jammy Zhou wrote: >> +pAMDGPUEnt = pPriv->ptr; [...] >> @@ -266,7 +256,6 @@ static Bool amdgpu_get_scrninfo(int entity_num, void >> *pci_dev) >> >> error_amdgpu: >> drmClose(pAMDGPUEnt->fd); >> -pAMDGPUEnt->fd = 0; >> error_fd: >> free(pPriv->ptr); >> return FALSE; pAMDGPUEnt == pPriv->ptr, so the memory pointed to by pAMDGPUEnt is freed immediately after the removed assignment. -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
Re: [PATCH xf86-video-amdgpu 1/2] Fix crash in PCI probe path (v3)
Would it not make more sense to set pAMDGPUEnt->fd to -1 beneath the error_amdgpu tag? On 10/28/15 08:24, Jammy Zhou wrote: > The crash is caused by the NULL value returned by AMDGPUPTR(pScrn), > because the driverPrivate is not allocated yet in PciProbe phase, > and it is usually done in the PreInit phase. > > Use pAMDGPUEnt->fd instead of info->dri2.drm_fd to avoid AMDGPUInfoPtr > related code in amdgpu_open_drm_master, so that the crash can be fixed. > > v3: some more cleanup > v2: switch to pAMDGPUEnt->fd, and update the commit message > > Signed-off-by: Jammy Zhou> --- > src/amdgpu_probe.c | 37 + > 1 file changed, 13 insertions(+), 24 deletions(-) > > diff --git a/src/amdgpu_probe.c b/src/amdgpu_probe.c > index 481271b..f6e675c 100644 > --- a/src/amdgpu_probe.c > +++ b/src/amdgpu_probe.c > @@ -147,24 +147,14 @@ static int amdgpu_kernel_open_fd(ScrnInfoPtr pScrn, > struct pci_device *dev, > return fd; > } > > -static Bool amdgpu_open_drm_master(ScrnInfoPtr pScrn) > +static Bool amdgpu_open_drm_master(ScrnInfoPtr pScrn, AMDGPUEntPtr > pAMDGPUEnt, > +struct pci_device *pci_dev, int entity_num) > { > - AMDGPUInfoPtr info = AMDGPUPTR(pScrn); > - AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn); > drmSetVersion sv; > int err; > > - if (pAMDGPUEnt->fd) { > - xf86DrvMsg(pScrn->scrnIndex, X_INFO, > -" reusing fd for second head\n"); > - > - info->drmmode.fd = info->dri2.drm_fd = pAMDGPUEnt->fd; > - pAMDGPUEnt->fd_ref++; > - return TRUE; > - } > - > - info->dri2.drm_fd = amdgpu_kernel_open_fd(pScrn, info->PciInfo, NULL); > - if (info->dri2.drm_fd == -1) > + pAMDGPUEnt->fd = amdgpu_kernel_open_fd(pScrn, pci_dev, NULL); > + if (pAMDGPUEnt->fd == -1) > return FALSE; > > /* Check that what we opened was a master or a master-capable FD, > @@ -175,18 +165,18 @@ static Bool amdgpu_open_drm_master(ScrnInfoPtr pScrn) > sv.drm_di_minor = 1; > sv.drm_dd_major = -1; > sv.drm_dd_minor = -1; > - err = drmSetInterfaceVersion(info->dri2.drm_fd, ); > + err = drmSetInterfaceVersion(pAMDGPUEnt->fd, ); > if (err != 0) { > xf86DrvMsg(pScrn->scrnIndex, X_ERROR, > "[drm] failed to set drm interface version.\n"); > - drmClose(info->dri2.drm_fd); > + drmClose(pAMDGPUEnt->fd); > return FALSE; > } > > return TRUE; > } > > -static Bool amdgpu_get_scrninfo(int entity_num, void *pci_dev) > +static Bool amdgpu_get_scrninfo(int entity_num, struct pci_device *pci_dev) > { > ScrnInfoPtr pScrn = NULL; > EntityInfoPtr pEnt; > @@ -236,11 +226,13 @@ static Bool amdgpu_get_scrninfo(int entity_num, void > *pci_dev) > uint32_t minor_version; > > pPriv->ptr = xnfcalloc(sizeof(AMDGPUEntRec), 1); > - pAMDGPUEnt = pPriv->ptr; > + if (!pPriv->ptr) > + return FALSE; > > - if (amdgpu_open_drm_master(pScrn)) { > + pAMDGPUEnt = pPriv->ptr; > + if (!amdgpu_open_drm_master(pScrn, pAMDGPUEnt, > + pci_dev, entity_num)) > goto error_fd; > - } > > pAMDGPUEnt->fd_ref = 1; > > @@ -252,8 +244,6 @@ static Bool amdgpu_get_scrninfo(int entity_num, void > *pci_dev) > "amdgpu_device_initialize failed\n"); > goto error_amdgpu; > } > - } else { > - pAMDGPUEnt = pPriv->ptr; > } > > xf86SetEntityInstanceForScreen(pScrn, pEnt->index, > @@ -266,7 +256,6 @@ static Bool amdgpu_get_scrninfo(int entity_num, void > *pci_dev) > > error_amdgpu: > drmClose(pAMDGPUEnt->fd); > - pAMDGPUEnt->fd = 0; > error_fd: > free(pPriv->ptr); > return FALSE; > @@ -276,7 +265,7 @@ static Bool > amdgpu_pci_probe(DriverPtr pDriver, >int entity_num, struct pci_device *device, intptr_t match_data) > { > - return amdgpu_get_scrninfo(entity_num, (void *)device); > + return amdgpu_get_scrninfo(entity_num, device); > } > > static Bool AMDGPUDriverFunc(ScrnInfoPtr scrn, xorgDriverFuncOp op, void > *data) ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
Re: [PATCH:xorg-docs 3/4] X.man: document protocol/ syntax in display string
Should we also mention the extension that was added for launchd support where we DISPLAY=[.] > On Oct 27, 2015, at 19:45, Alan Coopersmith> wrote: > > See > http://www.x.org/releases/X11R7.7/doc/libX11/libX11/libX11.html#Opening_the_Display > > Signed-off-by: Alan Coopersmith > --- > man/X.man | 25 ++--- > 1 file changed, 22 insertions(+), 3 deletions(-) > > diff --git a/man/X.man b/man/X.man > index d07e69e..a4f4614 100644 > --- a/man/X.man > +++ b/man/X.man > @@ -1,4 +1,4 @@ > -.\" t > +'\" t > .\" > .\" Copyright (c) 1994, 2004 The Open Group > .\" Copyright \(co 2000 The XFree86 Project, Inc. > @@ -165,15 +165,34 @@ form: > .RS > \fIhostname:displaynumber.screennumber\fP > .RE > +or > +.RS > +\fIprotocol/hostname:displaynumber.screennumber\fP > +.RE > .sp > This information is used by the application to determine how it should > connect to the server and which screen it should use by default > (on displays with multiple monitors): > .TP 8 > +.I protocol > +The \fIprotocol\fP specifies the protocol to use for communication. > +Exactly which protocols are supported is platform dependent, but most > +commonly supported ones are: > +.TS > +l l. > +tcp TCP over IPv4 or IPv6 > +inetTCP over IPv4 only > +inet6 TCP over IPv6 only > +unixUNIX Domain Sockets (same host only) > +local Platform preferred local connection method > +.TE > +If the protocol is not specified, Xlib uses whatever it believes is the > +most efficient transport. > +.TP 8 > .I hostname > The \fIhostname\fP specifies the name of the machine to which the display is > -physically connected. If the hostname is not given, the most efficient way > of > -communicating to a server on the same machine will be used. > +physically connected. If the hostname is not given, a connection to a server > +on the same machine will be used. > .TP 8 > .I displaynumber > The phrase "display" is usually used to refer to a collection of monitors that > -- > 1.7.9.2 > > ___ > 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 smime.p7s Description: S/MIME cryptographic 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
Strange utf8/iso encoding problem with bitmap fonts
Hi, after upgrading from SLES 11 to SLES 12 one of my application that is using bitmap fonts (that I try to keep for all apps as I prefer them over antialised ttf fonts. etc) doesn't show certain characters. E.g. the signor certain characters with accents. After long debugging I figured out that it loads iso version of the fonts. Looking at the strace ofthe working run on a SLES 11 system I see this: galois [16:27] fst 2149) grep -i helvR log.cauchy 20450 open("/usr/share/fonts/100dpi/helvR10.pcf.gz", O_RDONLY) = 28 20450 open("/usr/share/fonts/75dpi/helvR08.pcf.gz", O_RDONLY) = 28 20450 open("/usr/share/fonts/100dpi/helvR12.pcf.gz", O_RDONLY) = 33 But for a run on the SLES 12 system it is different: galois [16:26] fst 2148) grep -i helvR log.galois 6728 access("/usr/share/fonts/75dpi/helvR12-ISO8859-1.pcf.gz", R_OK) = 0 6728 open("/usr/share/fonts/75dpi/helvR12-ISO8859-1.pcf.gz", O_RDONLY) = 13 6728 access("/usr/share/fonts/75dpi/helvR12-ISO8859-1.pcf.gz", R_OK) = 0 6728 open("/usr/share/fonts/75dpi/helvR12-ISO8859-1.pcf.gz", O_RDONLY) = 54 6728 open("/usr/share/fonts/75dpi/helvR08.pcf.gz", O_RDONLY) = 54 6728 open("/usr/share/fonts/75dpi/helvR14.pcf.gz", O_RDONLY) = 54 6728 open("/usr/share/fonts/100dpi/helvR08.pcf.gz", O_RDONLY Now the special characters are indeed visible for font size 8 and 14, but show as little dotted squares for size 12. When I remove the helvR12-ISO8859-1.pcf.gz file, only the helvR12.pcf.gz is loaded and the characters also show in size 12. SLES 11 for some reason was happy with the helvR??.pcf,gz. I've no idea why SLES 12 thinks it needs to load the ISO variants. Does anyone know a way I can influence what pcf files an application loads? I tried with setting LC_ALL, LANG, LC_CTYPE etc. to en_US.UTF-8 and starting the application from this terminal, but it doesn't change anything. cu, Frank -- Dipl.-Inform. Frank Steiner Web: http://www.bio.ifi.lmu.de/~steiner/ Lehrstuhl f. BioinformatikMail: http://www.bio.ifi.lmu.de/~steiner/m/ LMU, Amalienstr. 17 Phone: +49 89 2180-4049 80333 Muenchen, Germany Fax: +49 89 2180-99-4049 * Rekursion kann man erst verstehen, wenn man Rekursion verstanden hat. * ___ xorg@lists.x.org: X.Org support Archives: http://lists.freedesktop.org/archives/xorg Info: http://lists.x.org/mailman/listinfo/xorg Your subscription address: %(user_address)s
[Xorg-driver-geode] [Bug 92542] Geode cannot be used with GNOME because it requires root priviledges
https://bugs.freedesktop.org/show_bug.cgi?id=92542 --- Comment #1 from Martin-Éric Racine--- Someone had started developing a KMS driver for the Geode LX: https://gitorious.org/lx This would at least cover the OLPC XO-1 and a fairly large number of recent thin client terminals, but it would obviously leave the GX1 and GX2 hardware in the dust. -- You are receiving this mail because: You are the QA Contact for the bug. You are the assignee for the bug. ___ Xorg-driver-geode mailing list Xorg-driver-geode@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-geode
[PATCH] present: Execute right away if target_msc equals current_msc
It is according to the protocol: "If 'options' contains PresentOptionAsync, and the 'target-msc' is less than or equal to the current msc for 'window', then the operation will be performed as soon as possible, not necessarily waiting for the next vertical blank interval." Signed-off-by: Jammy Zhou--- present/present.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/present/present.c b/present/present.c index beb4ff0..5900c22 100644 --- a/present/present.c +++ b/present/present.c @@ -871,7 +871,7 @@ present_pixmap(WindowPtr window, xorg_list_add(>event_queue, _exec_queue); vblank->queued = TRUE; -if ((pixmap && target_msc >= crtc_msc) || (!pixmap && target_msc > crtc_msc)) { +if (target_msc > crtc_msc) { ret = present_queue_vblank(screen, target_crtc, vblank->event_id, target_msc); if (ret == Success) return Success; -- 1.9.1 ___ 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:xserver 1/3] Xorg.man: move XLOCAL details to X(7) man page instead
Series: Reviewed-by: Jeremy Huddleston Sequoia> On Oct 27, 2015, at 19:44, Alan Coopersmith > wrote: > > These settings affect clients, not server, so belong there, next to > the information about how to set $DISPLAY. > > Signed-off-by: Alan Coopersmith > --- > hw/xfree86/man/Xorg.man | 55 ++- > 1 file changed, 2 insertions(+), 53 deletions(-) > > diff --git a/hw/xfree86/man/Xorg.man b/hw/xfree86/man/Xorg.man > index 646a90c..b23db3d 100644 > --- a/hw/xfree86/man/Xorg.man > +++ b/hw/xfree86/man/Xorg.man > @@ -44,7 +44,8 @@ byte-streams: > .I "Local" > On most platforms, the "Local" connection type is a UNIX-domain socket. > On some System V platforms, the "local" connection types also include > -STREAMS pipes, named pipes, and some other mechanisms. > +STREAMS pipes, named pipes, and some other mechanisms. See the > +"LOCAL CONNECTIONS" section of X(__miscmansuffix__) for details. > .TP 4 > .I TCP/IP > .B Xorg > @@ -55,58 +56,6 @@ where > is the display number. This connection type can be disabled with the > .B \-nolisten > option (see the Xserver(1) man page for details). > -.SH "ENVIRONMENT VARIABLES" > -For operating systems that support local connections other than Unix > -Domain sockets (SVR3 and SVR4), there is a compiled-in list specifying > -the order in which local connections should be attempted. This list > -can be overridden by the > -.I XLOCAL > -environment variable described below. If the display name indicates a > -best-choice connection should be made (e.g. > -.BR :0.0 ), > -each connection mechanism is tried until a connection succeeds or no > -more mechanisms are available. Note: for these OSs, the Unix Domain > -socket connection is treated differently from the other local connection > -types. To use it the connection must be made to > -.BR unix:0.0 . > -.PP > -The > -.I XLOCAL > -environment variable should contain a list of one more > -more of the following: > -.PP > -.RS 8 > -.nf > -NAMED > -PTS > -SCO > -ISC > -.fi > -.RE > -.PP > -which represent SVR4 Named Streams pipe, Old-style USL Streams pipe, > -SCO XSight Streams pipe, and ISC Streams pipe, respectively. You can > -select a single mechanism (e.g. > -.IR XLOCAL=NAMED ), > -or an ordered list (e.g. \fIXLOCAL="NAMED:PTS:SCO"\fP). > -his variable overrides the compiled-in defaults. For SVR4 it is > -recommended that > -.I NAMED > -be the first preference connection. The default setting is > -.IR PTS:NAMED:ISC:SCO . > -.PP > -To globally override the compiled-in defaults, you should define (and > -export if using > -.B sh > -or > -.BR ksh ) > -.I XLOCAL > -globally. If you use startx(1) or xinit(1), the definition should be > -at the top of your > -.I .xinitrc > -file. If you use xdm(1), the definitions should be early on in the > -.I __projectroot__/lib/X11/xdm/Xsession > -script. > .SH OPTIONS > .B Xorg > supports several mechanisms for supplying/obtaining configuration and > -- > 1.7.9.2 > > ___ > 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 smime.p7s Description: S/MIME cryptographic 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
[ANNOUNCE] xorg-server 1.17.4
Minor brown-bag release. The important fix here is Martin's clientsWritable change which fixes a crash when built against xproto 7.0.28. Adam Jackson (1): xserver 1.17.4 Julien Cristau (1): Xext: fix build with --disable-xace Martin Peres (1): os: make sure the clientsWritable fd_set is initialized before use Michel Dänzer (1): DRI2: Sync radeonsi_pci_ids.h from Mesa git tag: xorg-server-1.17.4 http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.17.4.tar.bz2 MD5: 1509a9daae713895e7f5bcba8bcc05b2 xorg-server-1.17.4.tar.bz2 SHA1: 139c4d6795eb4c3848616cc514d134532975e49e xorg-server-1.17.4.tar.bz2 SHA256: 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2 PGP: http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.17.4.tar.bz2.sig http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.17.4.tar.gz MD5: e153561abccca3b83b9ccf6a0b110be7 xorg-server-1.17.4.tar.gz SHA1: d5117fbe296caf16b96d62805b5fa655f6126d18 xorg-server-1.17.4.tar.gz SHA256: 73208283875dc7f02c66546f8d83fe2e70ffc6d639c9394b8754d2edcbff6e2f xorg-server-1.17.4.tar.gz PGP: http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.17.4.tar.gz.sig - ajax signature.asc Description: This is a digitally signed message part ___ 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
[ANNOUNCE] xorg-server 1.17.4
Minor brown-bag release. The important fix here is Martin's clientsWritable change which fixes a crash when built against xproto 7.0.28. Adam Jackson (1): xserver 1.17.4 Julien Cristau (1): Xext: fix build with --disable-xace Martin Peres (1): os: make sure the clientsWritable fd_set is initialized before use Michel Dänzer (1): DRI2: Sync radeonsi_pci_ids.h from Mesa git tag: xorg-server-1.17.4 http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.17.4.tar.bz2 MD5: 1509a9daae713895e7f5bcba8bcc05b2 xorg-server-1.17.4.tar.bz2 SHA1: 139c4d6795eb4c3848616cc514d134532975e49e xorg-server-1.17.4.tar.bz2 SHA256: 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2 PGP: http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.17.4.tar.bz2.sig http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.17.4.tar.gz MD5: e153561abccca3b83b9ccf6a0b110be7 xorg-server-1.17.4.tar.gz SHA1: d5117fbe296caf16b96d62805b5fa655f6126d18 xorg-server-1.17.4.tar.gz SHA256: 73208283875dc7f02c66546f8d83fe2e70ffc6d639c9394b8754d2edcbff6e2f xorg-server-1.17.4.tar.gz PGP: http://xorg.freedesktop.org/archive/individual/xserver/xorg-server-1.17.4.tar.gz.sig - ajax signature.asc Description: This is a digitally signed message part ___ xorg@lists.x.org: X.Org support Archives: http://lists.freedesktop.org/archives/xorg Info: http://lists.x.org/mailman/listinfo/xorg Your subscription address: %(user_address)s
Re: [PATCH:macros] XORG_MANPAGE_SECTIONS: limit SVR4 man page sections to Solaris 2.0-11
On 10/27/15 07:03 PM, Jeremy Huddleston Sequoia wrote: On Oct 27, 2015, at 16:06, Alan Coopersmithwrote: All others (including other SunOS/Solaris releases) use the traditional Bell Labs / BSD / Linux section numbering. Signed-off-by: Alan Coopersmith --- xorg-macros.m4.in | 22 +- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in index f160a40..c62fae5 100644 --- a/xorg-macros.m4.in +++ b/xorg-macros.m4.in @@ -1,6 +1,6 @@ dnl @configure_input@ dnl -dnl Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved. +dnl Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. "-" rather than "," Thanks, but Oracle's lawyers prefer "," as our corporate standard, and I've got enough things to argue with them about to fight something that small. -- -Alan Coopersmith- alan.coopersm...@oracle.com Oracle Solaris Engineering - http://blogs.oracle.com/alanc ___ 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:xorg-docs 3/4] X.man: document protocol/ syntax in display string
On 10/28/15 07:46 AM, Jeremy Huddleston Sequoia wrote: Should we also mention the extension that was added for launchd support where we DISPLAY=[.] That sounds like a good followup patch for you to submit, since I didn't even remember that existed, much less know how to describe it. -- -Alan Coopersmith- alan.coopersm...@oracle.com Oracle Solaris Engineering - http://blogs.oracle.com/alanc ___ 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:xorg-docs 3/4] X.man: document protocol/ syntax in display string
Sent from my iPhone... > On Oct 28, 2015, at 10:01, Alan Coopersmith> wrote: > >> On 10/28/15 07:46 AM, Jeremy Huddleston Sequoia wrote: >> Should we also mention the extension that was added for launchd support >> where we DISPLAY=[.] > > That sounds like a good followup patch for you to submit, since I didn't even > remember that existed, much less know how to describe it. Yeah. I was more posing the question of "should we mention it or not?" rather than suggesting you ammend your commit. > -- >-Alan Coopersmith- alan.coopersm...@oracle.com > Oracle Solaris Engineering - http://blogs.oracle.com/alanc ___ 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 xf86-video-amdgpu 2/2] Fix warnings for unused variables
On Wed, Oct 28, 2015 at 9:24 AM, Jammy Zhouwrote: > Remove some unused variables to fix the compiling warnings. > > Signed-off-by: Jammy Zhou For the series: Reviewed-by: Alex Deucher > --- > src/amdgpu_dri3.c | 2 -- > src/amdgpu_glamor.c | 2 -- > src/amdgpu_kms.c| 6 -- > 3 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/src/amdgpu_dri3.c b/src/amdgpu_dri3.c > index a89421e..ad5734f 100644 > --- a/src/amdgpu_dri3.c > +++ b/src/amdgpu_dri3.c > @@ -130,8 +130,6 @@ static int amdgpu_dri3_fd_from_pixmap(ScreenPtr screen, > CARD16 *stride, > CARD32 *size) > { > - ScrnInfoPtr scrn = xf86ScreenToScrn(screen); > - AMDGPUInfoPtr info = AMDGPUPTR(scrn); > struct amdgpu_buffer *bo; > struct amdgpu_bo_info bo_info; > uint32_t fd; > diff --git a/src/amdgpu_glamor.c b/src/amdgpu_glamor.c > index f994df4..fb0f8ff 100644 > --- a/src/amdgpu_glamor.c > +++ b/src/amdgpu_glamor.c > @@ -81,8 +81,6 @@ Bool amdgpu_glamor_create_screen_resources(ScreenPtr screen) > Bool amdgpu_glamor_pre_init(ScrnInfoPtr scrn) > { > AMDGPUInfoPtr info = AMDGPUPTR(scrn); > - pointer glamor_module; > - CARD32 version; > > if (!info->dri2.available) > return FALSE; > diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c > index 32a34cb..91aba2f 100644 > --- a/src/amdgpu_kms.c > +++ b/src/amdgpu_kms.c > @@ -944,10 +944,11 @@ void AMDGPUUnblank(ScrnInfoPtr pScrn) > static Bool amdgpu_set_drm_master(ScrnInfoPtr pScrn) > { > AMDGPUInfoPtr info = AMDGPUPTR(pScrn); > - AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn); > int err; > > #ifdef XF86_PDEV_SERVER_FD > + AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn); > + > if (pAMDGPUEnt->platform_dev && > (pAMDGPUEnt->platform_dev->flags & XF86_PDEV_SERVER_FD)) > return TRUE; > @@ -963,9 +964,10 @@ static Bool amdgpu_set_drm_master(ScrnInfoPtr pScrn) > static void amdgpu_drop_drm_master(ScrnInfoPtr pScrn) > { > AMDGPUInfoPtr info = AMDGPUPTR(pScrn); > - AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn); > > #ifdef XF86_PDEV_SERVER_FD > + AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn); > + > if (pAMDGPUEnt->platform_dev && > (pAMDGPUEnt->platform_dev->flags & XF86_PDEV_SERVER_FD)) > return; > -- > 1.9.1 > > ___ > xorg-driver-ati mailing list > xorg-driver-ati@lists.x.org > http://lists.x.org/mailman/listinfo/xorg-driver-ati ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
Re: [PATCH:xserver 1/3] Xorg.man: move XLOCAL details to X(7) man page instead
On Wed, 2015-10-28 at 00:01 -0700, Jeremy Huddleston Sequoia wrote: > Series: > > Reviewed-by: Jeremy Huddleston Sequoiaremote: I: patch #63024 updated using rev 75157b7dbf4ed4db0492328a44e4e67dda83f769. remote: I: patch #63025 updated using rev 8fc295bde9a736f3c8c047031a6698d140d5266f. remote: I: patch #63023 updated using rev 478efe285a440c33b053bdf0bfbfdd482f429f01. remote: I: 3 patch(es) updated to state Accepted. To ssh://git.freedesktop.org/git/xorg/xserver 50c1671..478efe2 master -> master - ajax ___ 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 xf86-video-amdgpu 1/2] Fix crash in PCI probe path (v3)
On 28.10.2015 22:24, Jammy Zhou wrote: > The crash is caused by the NULL value returned by AMDGPUPTR(pScrn), > because the driverPrivate is not allocated yet in PciProbe phase, > and it is usually done in the PreInit phase. > > Use pAMDGPUEnt->fd instead of info->dri2.drm_fd to avoid AMDGPUInfoPtr > related code in amdgpu_open_drm_master, so that the crash can be fixed. > > v3: some more cleanup > v2: switch to pAMDGPUEnt->fd, and update the commit message > > Signed-off-by: Jammy Zhou> --- > src/amdgpu_probe.c | 37 + > 1 file changed, 13 insertions(+), 24 deletions(-) > > diff --git a/src/amdgpu_probe.c b/src/amdgpu_probe.c > index 481271b..f6e675c 100644 > --- a/src/amdgpu_probe.c > +++ b/src/amdgpu_probe.c > @@ -147,24 +147,14 @@ static int amdgpu_kernel_open_fd(ScrnInfoPtr pScrn, > struct pci_device *dev, > return fd; > } > > -static Bool amdgpu_open_drm_master(ScrnInfoPtr pScrn) > +static Bool amdgpu_open_drm_master(ScrnInfoPtr pScrn, AMDGPUEntPtr > pAMDGPUEnt, > +struct pci_device *pci_dev, int entity_num) Sorry I wasn't explicit about this before, but please don't add an unused entity_num parameter. > - if (pAMDGPUEnt->fd) { > - xf86DrvMsg(pScrn->scrnIndex, X_INFO, > -" reusing fd for second head\n"); > - > - info->drmmode.fd = info->dri2.drm_fd = pAMDGPUEnt->fd; > - pAMDGPUEnt->fd_ref++; > - return TRUE; > - } You could rebase on top of the attached patch, since this is a logically separate change from the crash fix. > -static Bool amdgpu_get_scrninfo(int entity_num, void *pci_dev) > +static Bool amdgpu_get_scrninfo(int entity_num, struct pci_device *pci_dev) > { > ScrnInfoPtr pScrn = NULL; > EntityInfoPtr pEnt; [...] > @@ -252,8 +244,6 @@ static Bool amdgpu_get_scrninfo(int entity_num, void > *pci_dev) > "amdgpu_device_initialize failed\n"); > goto error_amdgpu; > } > - } else { > - pAMDGPUEnt = pPriv->ptr; > } > > xf86SetEntityInstanceForScreen(pScrn, pEnt->index, > @@ -266,7 +256,6 @@ static Bool amdgpu_get_scrninfo(int entity_num, void > *pci_dev) > > error_amdgpu: > drmClose(pAMDGPUEnt->fd); > - pAMDGPUEnt->fd = 0; > error_fd: > free(pPriv->ptr); > return FALSE; > @@ -276,7 +265,7 @@ static Bool > amdgpu_pci_probe(DriverPtr pDriver, >int entity_num, struct pci_device *device, intptr_t match_data) > { > - return amdgpu_get_scrninfo(entity_num, (void *)device); > + return amdgpu_get_scrninfo(entity_num, device); > } > > static Bool AMDGPUDriverFunc(ScrnInfoPtr scrn, xorgDriverFuncOp op, void > *data) > These changes make sense, but are again logically separate from the crash fix. If you want, I can send out a new series with the logical changes split up into separate patches. -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer From eb618a4008821dcbf558066058a02b1b74ad6be4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= Date: Wed, 28 Oct 2015 17:56:13 +0900 Subject: [PATCH xf86-video-amdgpu] Remove dead code from amdgpu_open_drm_master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit amdgpu_get_scrninfo allocates the memory pointed to by pAMDGPUEnt just before it calls amdgpu_open_drm_master, so pAMDGPUEnt->fd is always 0 here. Signed-off-by: Michel Dänzer --- src/amdgpu_probe.c | 9 - 1 file changed, 9 deletions(-) diff --git a/src/amdgpu_probe.c b/src/amdgpu_probe.c index 481271b..3fedfab 100644 --- a/src/amdgpu_probe.c +++ b/src/amdgpu_probe.c @@ -154,15 +154,6 @@ static Bool amdgpu_open_drm_master(ScrnInfoPtr pScrn) drmSetVersion sv; int err; - if (pAMDGPUEnt->fd) { - xf86DrvMsg(pScrn->scrnIndex, X_INFO, - " reusing fd for second head\n"); - - info->drmmode.fd = info->dri2.drm_fd = pAMDGPUEnt->fd; - pAMDGPUEnt->fd_ref++; - return TRUE; - } - info->dri2.drm_fd = amdgpu_kernel_open_fd(pScrn, info->PciInfo, NULL); if (info->dri2.drm_fd == -1) return FALSE; -- 2.6.1 ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
[PATCH xf86-video-amdgpu] Call present_event_notify directly if target_msc <= crtc_msc (v2)
Do present immediately in this case. v2: fix the overflow Change-Id: I25b9212169ccbf572b88c033dc09c0ac5cfa4812 Signed-off-by: Jammy Zhou--- src/amdgpu_present.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/amdgpu_present.c b/src/amdgpu_present.c index 5e5ed72..b9cc1c7 100644 --- a/src/amdgpu_present.c +++ b/src/amdgpu_present.c @@ -160,6 +160,16 @@ amdgpu_present_queue_vblank(RRCrtcPtr crtc, uint64_t event_id, uint64_t msc) struct amdgpu_drm_queue_entry *queue; drmVBlank vbl; int ret; + uint64_t crtc_ust, crtc_msc; + + ret = amdgpu_present_get_ust_msc(crtc, _ust, _msc); + if (ret != Success) + return ret; + + if (crtc_msc >= msc) { + present_event_notify(event_id, crtc_ust, crtc_msc); + return Success; + } event = calloc(sizeof(struct amdgpu_present_vblank_event), 1); if (!event) -- 1.9.1 ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati
Re: [PATCH] present: Execute right away if target_msc equals current_msc
On 28.10.2015 19:39, Jammy Zhou wrote: > It is according to the protocol: > > "If 'options' contains PresentOptionAsync, and the 'target-msc' > is less than or equal to the current msc for 'window', then > the operation will be performed as soon as possible, not > necessarily waiting for the next vertical blank interval." > > Signed-off-by: Jammy Zhou> --- > present/present.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/present/present.c b/present/present.c > index beb4ff0..5900c22 100644 > --- a/present/present.c > +++ b/present/present.c > @@ -871,7 +871,7 @@ present_pixmap(WindowPtr window, > > xorg_list_add(>event_queue, _exec_queue); > vblank->queued = TRUE; > -if ((pixmap && target_msc >= crtc_msc) || (!pixmap && target_msc > > crtc_msc)) { > +if (target_msc > crtc_msc) { > ret = present_queue_vblank(screen, target_crtc, vblank->event_id, > target_msc); > if (ret == Success) > return Success; > Looks good to me, but Cc'ing Axel Davy, who made the last change to this code. Reviewed-by: Michel Dänzer -- Earthling Michel Dänzer | http://www.amd.com Libre software enthusiast | Mesa and X developer ___ 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 xf86-video-amdgpu] Call present_event_notify directly if target_msc <= crtc_msc
Do present immediately in this case. Signed-off-by: Jammy Zhou--- src/amdgpu_present.c | 10 ++ 1 file changed, 10 insertions(+) diff --git a/src/amdgpu_present.c b/src/amdgpu_present.c index 5e5ed72..82b22b7 100644 --- a/src/amdgpu_present.c +++ b/src/amdgpu_present.c @@ -160,6 +160,16 @@ amdgpu_present_queue_vblank(RRCrtcPtr crtc, uint64_t event_id, uint64_t msc) struct amdgpu_drm_queue_entry *queue; drmVBlank vbl; int ret; + uint64_t crtc_ust, crtc_msc; + + ret = amdgpu_present_get_ust_msc(crtc, _ust, _msc); + if (ret != Success) + return ret; + + if (crtc_msc - msc >= 0) { + present_event_notify(event_id, crtc_ust, crtc_msc); + return Success; + } event = calloc(sizeof(struct amdgpu_present_vblank_event), 1); if (!event) -- 1.9.1 ___ xorg-driver-ati mailing list xorg-driver-ati@lists.x.org http://lists.x.org/mailman/listinfo/xorg-driver-ati