[PATCH v2] Allow enabling glamor on R500 (and R300) class 3D engines as well.

[Alex Deucher]

On Mon, Mar 10, 2014 at 3:33 AM, Michel Dänzer <michel at daenzer.net> wrote:
> From: Michel Dänzer <michel.daenzer at amd.com>
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75709
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

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

> ---
>
> v2:
> * Allow R300 as well, but add warning that glamor may not work (well) there.
> * Document which GPUs can use glamor/EXA in the radeon manpage.
>
>  man/radeon.man      |  6 +++---
>  src/radeon_glamor.c | 11 ++++++++---
>  2 files changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/man/radeon.man b/man/radeon.man
> index 1363d8b..7edb5e6 100644
> --- a/man/radeon.man
> +++ b/man/radeon.man
> @@ -271,9 +271,9 @@ Pageflipping is supported on all radeon hardware.
>  .BI "Option \*qAccelMethod\*q \*q" "string" \*q
>  Chooses between available acceleration architectures.  Valid values are
>  .B EXA
> -and
> -.B glamor.
> -The default is
> +(for pre-TAHITI GPUs) and
> +.B glamor
> +(for R300 or higher). The default is
>  .B glamor
>  as of TAHITI, otherwise
>  .B EXA.
> diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c
> index 1d666d1..eb8da8f 100644
> --- a/src/radeon_glamor.c
> +++ b/src/radeon_glamor.c
> @@ -93,12 +93,17 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn)
>         if (s && strcasecmp(s, "glamor") != 0)
>                 return FALSE;
>
> -       if (info->ChipFamily < CHIP_FAMILY_R600) {
> -               xf86DrvMsg(scrn->scrnIndex, s ? X_ERROR : X_WARNING,
> -                          "glamor requires R600 or newer GPU, disabling.\n");
> +       if (info->ChipFamily < CHIP_FAMILY_R300) {
> +               xf86DrvMsg(scrn->scrnIndex, X_ERROR,
> +                          "glamor requires R300 or higher GPU, disabling.\n");
>                 return FALSE;
>         }
>
> +       if (info->ChipFamily < CHIP_FAMILY_RV515) {
> +               xf86DrvMsg(scrn->scrnIndex, X_WARNING,
> +                          "glamor may not work (well) with GPUs < RV515.\n");
> +       }
> +
>         if (scrn->depth < 24) {
>                 xf86DrvMsg(scrn->scrnIndex, s ? X_ERROR : X_WARNING,
>                            "glamor requires depth >= 24, disabling.\n");
> --
> 1.9.0
>
> _______________________________________________
> xorg-driver-ati mailing list
> xorg-driver-ati at lists.x.org
> http://lists.x.org/mailman/listinfo/xorg-driver-ati