summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2016-11-01 16:01:24 +0900
committerMichel Dänzer <michel@daenzer.net>2016-11-02 12:32:29 +0900
commit5da43c5da8adc139d57d89975a52eef91a5595e1 (patch)
treeda5e1b967bb97ec8cf55e4a3ce4170f41a0b2bd0 /src
parentdd4a740714e481b09312a04883aa6e0f5200ca81 (diff)
Require xserver 1.10 or newer
1.10.0 was released in February 2011. We've been accidentally requiring 1.10 or newer since c7d27c94cb65 ("Keep track of damage event related flushes per-client"). (Ported from radeon commit 5df36de39952c3a26cb2fbc125f298139a9dd5bc) Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src')
-rw-r--r--src/amdgpu_drv.h2
-rw-r--r--src/amdgpu_kms.c6
-rw-r--r--src/amdgpu_probe.c5
-rw-r--r--src/drmmode_display.c7
-rw-r--r--src/drmmode_display.h2
5 files changed, 0 insertions, 22 deletions
diff --git a/src/amdgpu_drv.h b/src/amdgpu_drv.h
index fc6a79d..0f6bbf4 100644
--- a/src/amdgpu_drv.h
+++ b/src/amdgpu_drv.h
@@ -227,9 +227,7 @@ typedef struct {
DisplayModePtr currentMode;
CreateScreenResourcesProcPtr CreateScreenResources;
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 10
CreateWindowProcPtr CreateWindow;
-#endif
Bool IsSecondary;
diff --git a/src/amdgpu_kms.c b/src/amdgpu_kms.c
index 6fa63e9..acf3a7d 100644
--- a/src/amdgpu_kms.c
+++ b/src/amdgpu_kms.c
@@ -1245,8 +1245,6 @@ static void AMDGPUSetupCapabilities(ScrnInfoPtr pScrn)
#endif
}
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 10
-
/* When the root window is created, initialize the screen contents from
* console if -background none was specified on the command line
*/
@@ -1271,8 +1269,6 @@ static Bool AMDGPUCreateWindow_oneshot(WindowPtr pWin)
return ret;
}
-#endif
-
Bool AMDGPUPreInit_KMS(ScrnInfoPtr pScrn, int flags)
{
AMDGPUInfoPtr info;
@@ -1820,12 +1816,10 @@ Bool AMDGPUScreenInit_KMS(SCREEN_INIT_ARGS_DECL)
}
pScrn->pScreen = pScreen;
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 10
if (serverGeneration == 1 && bgNoneRoot && info->use_glamor) {
info->CreateWindow = pScreen->CreateWindow;
pScreen->CreateWindow = AMDGPUCreateWindow_oneshot;
}
-#endif
/* Provide SaveScreen & wrap BlockHandler and CloseScreen */
/* Wrap CloseScreen */
diff --git a/src/amdgpu_probe.c b/src/amdgpu_probe.c
index 213d245..52e962d 100644
--- a/src/amdgpu_probe.c
+++ b/src/amdgpu_probe.c
@@ -84,13 +84,8 @@ static char *amdgpu_bus_id(ScrnInfoPtr pScrn, struct pci_device *dev)
{
char *busid;
-#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,9,99,901,0)
XNFasprintf(&busid, "pci:%04x:%02x:%02x.%d",
dev->domain, dev->bus, dev->dev, dev->func);
-#else
- busid = XNFprintf("pci:%04x:%02x:%02x.%d",
- dev->domain, dev->bus, dev->dev, dev->func);
-#endif
if (!busid)
xf86DrvMsgVerb(pScrn->scrnIndex, X_ERROR, 0,
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
index b03a8a7..f514866 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
@@ -327,8 +327,6 @@ drmmode_crtc_dpms(xf86CrtcPtr crtc, int mode)
crtc->x, crtc->y);
}
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 10
-
static PixmapPtr
create_pixmap_for_fbcon(drmmode_ptr drmmode,
ScrnInfoPtr pScrn, int fbcon_id)
@@ -442,8 +440,6 @@ void drmmode_copy_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
return;
}
-#endif /* GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 10 */
-
static void
drmmode_crtc_scanout_destroy(drmmode_ptr drmmode,
struct drmmode_scanout *scanout)
@@ -1981,9 +1977,6 @@ static Bool drmmode_xf86crtc_resize(ScrnInfoPtr scrn, int width, int height)
width, height, -1, -1, pitch,
info->fb_shadow);
}
-#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,9,99,1,0)
- scrn->pixmapPrivate.ptr = ppix->devPrivate.ptr;
-#endif
if (!amdgpu_glamor_create_screen_resources(scrn->pScreen))
goto fail;
diff --git a/src/drmmode_display.h b/src/drmmode_display.h
index 4973bc2..2c4a869 100644
--- a/src/drmmode_display.h
+++ b/src/drmmode_display.h
@@ -138,9 +138,7 @@ extern void drmmode_set_cursor(ScrnInfoPtr scrn, drmmode_ptr drmmode, int id,
void drmmode_adjust_frame(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int x, int y);
extern Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode,
Bool set_hw);
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 10
extern void drmmode_copy_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
-#endif
extern Bool drmmode_setup_colormap(ScreenPtr pScreen, ScrnInfoPtr pScrn);
extern void drmmode_scanout_free(ScrnInfoPtr scrn);