diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-05-18 15:34:43 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-05-18 16:03:41 -0700 |
| commit | 8f53239ad7aa65e198402b3ce20a4a47d7dca279 (patch) | |
| tree | 0f20f5fac7322b83b9857146dc6ce2cd184bda39 /src/smi_video.c | |
| parent | 0d6cd745232b97ee13d03ab1d9de589b0907e791 (diff) | |
Raise minimum supported Xserver version to 1.18 (ABI_VIDEODRV_VERSION 20.0)
Already effectively required by use of XNFcallocarray() introduced in
xorg/xserver@b96dc999 - xserver-1.18.0, released in Nov. 2015.
Allows dropping remnants of code for XAA and pre-pciaccess X servers
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-siliconmotion/-/merge_requests/7>
Diffstat (limited to 'src/smi_video.c')
| -rw-r--r-- | src/smi_video.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/smi_video.c b/src/smi_video.c index 62de55d..d3b7a42 100644 --- a/src/smi_video.c +++ b/src/smi_video.c @@ -519,17 +519,11 @@ SMI_AddEncoding(XF86VideoEncodingPtr enc, int i, norm_string = VideoNorms[norm].name; input_string = VideoInputs[input].name; snprintf(channel_string, sizeof(channel_string), "%d", channel); - enc[i].id = i; -#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) >= 10 if (Xasprintf(&name_string, "%s-%s-%s", norm_string, input_string, channel_string) < 0) LEAVE(-1); -#else - name_string = Xprintf("%s-%s-%s", - norm_string, input_string, channel_string); - if (NULL == name_string) - LEAVE(-1); -#endif + + enc[i].id = i; enc[i].name = name_string; enc[i].width = VideoNorms[norm].Wa; |