[PATCH xserver 3/4] modesetting: Remove XF86_CRTC_VERSION checks

[Alex Deucher]

On Thu, Oct 29, 2015 at 9:58 AM, Daniel Martin
<daniel.martin at secunet.com> wrote:
> From: Daniel Martin <consume.noise at gmail.com>
>
> The ifdef checks for XF86_CRTC_VERSION >= 3/5 are remnants from the
> out-of-tree driver. Within the tree, we can rely on:
>     xf86Crtc.h:#define XF86_CRTC_VERSION 6
>
> Signed-off-by: Daniel Martin <consume.noise at gmail.com>

For 1-3:
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  hw/xfree86/drivers/modesetting/drmmode_display.c | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
> index 2684bae..4421578 100644
> --- a/hw/xfree86/drivers/modesetting/drmmode_display.c
> +++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
> @@ -462,11 +462,8 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
>          crtc->y = saved_y;
>          crtc->rotation = saved_rotation;
>          crtc->mode = saved_mode;
> -    }
> -#if defined(XF86_CRTC_VERSION) && XF86_CRTC_VERSION >= 3
> -    else
> +    } else
>          crtc->active = TRUE;
> -#endif
>
>      free(output_ids);
>
> @@ -1789,9 +1786,7 @@ drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
>      drmmode_clones_init(pScrn, drmmode, mode_res);
>
>      drmModeFreeResources(mode_res);
> -#if XF86_CRTC_VERSION >= 5
>      xf86ProviderSetup(pScrn, NULL, "modesetting");
> -#endif
>
>      xf86InitialConfiguration(pScrn, TRUE);
>
> --
> 2.6.1
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel