diff options
Diffstat (limited to 'hw/xfree86')
| -rw-r--r-- | hw/xfree86/dri2/drv_dri2.c | 1 | ||||
| -rw-r--r-- | hw/xfree86/drvmodes/xf86DrvCrtc.c | 2 | ||||
| -rw-r--r-- | hw/xfree86/os-support/shared/sigio.c | 12 |
3 files changed, 2 insertions, 13 deletions
diff --git a/hw/xfree86/dri2/drv_dri2.c b/hw/xfree86/dri2/drv_dri2.c index 4d031c3fa..533f0b523 100644 --- a/hw/xfree86/dri2/drv_dri2.c +++ b/hw/xfree86/dri2/drv_dri2.c @@ -103,7 +103,6 @@ DrvDRI2ScreenPtr DrvDRI2GetScreenPrime(DrvScreenPtr pDrvScreen, unsigned int prime_id) { DrvScreenPtr drvscreen = DrvGetScreenPrime(pDrvScreen, prime_id); - return DrvDRI2GetScreen(drvscreen); } diff --git a/hw/xfree86/drvmodes/xf86DrvCrtc.c b/hw/xfree86/drvmodes/xf86DrvCrtc.c index 6a0d711aa..96a4077d9 100644 --- a/hw/xfree86/drvmodes/xf86DrvCrtc.c +++ b/hw/xfree86/drvmodes/xf86DrvCrtc.c @@ -2914,12 +2914,14 @@ xf86DrvOutputSetEDIDProperty (xf86DrvOutputPtr output, void *data, int data_len) if (output->randr_output == NULL) return; +#if 0 if (data_len != 0) { RRChangeOutputProperty(output->randr_output, edid_atom, XA_INTEGER, 8, PropModeReplace, data_len, data, FALSE, TRUE); } else { RRDeleteOutputProperty(output->randr_output, edid_atom); } +#endif } #endif diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c index 780cc1169..7f2de2799 100644 --- a/hw/xfree86/os-support/shared/sigio.c +++ b/hw/xfree86/os-support/shared/sigio.c @@ -159,18 +159,6 @@ xf86InstallSIGIOHandler(int fd, void (*f)(int, void *), void *closure) fd, strerror(errno)); } else { int own_res = -1; -#ifdef F_SETOWN_EX - { - struct f_owner_ex f_ex; - f_ex.type = F_OWNER_TID; - f_ex.pid = gettid(); - own_res = fcntl(fd, F_SETOWN_EX, &f_ex); - if (own_res == -1) { - xf86Msg(X_WARNING, "fcntl(%d, F_SETOWN_EX): %s\n", - fd, strerror(errno)); - } - } -#endif if (own_res == -1) { own_res = fcntl(fd, F_SETOWN, getpid()); if (own_res == -1) { |