[PATCH xf86-video-amdgpu] Don't advertise rotation support without hardware acceleration v2

[Alex Deucher]

On Wed, Oct 7, 2015 at 3:45 AM, Michel Dänzer <michel at daenzer.net> wrote:
> From: Michel Dänzer <michel.daenzer at amd.com>
>
> Rotation currently doesn't work without acceleration (doesn't actually
> rotate with Option "NoAccel", crashes with Option "AccelMethod" "none"
> or when glamor fails to initialize) and would probably be too slow
> anyway.
>
> v2: Also remove now dead code checking for ShadowFB from
>     drmmode_crtc_scanout_allocate().
>
> Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

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

> ---
>  src/drmmode_display.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/src/drmmode_display.c b/src/drmmode_display.c
> index d75a629..42c4d8e 100644
> --- a/src/drmmode_display.c
> +++ b/src/drmmode_display.c
> @@ -475,20 +475,12 @@ drmmode_crtc_scanout_allocate(xf86CrtcPtr crtc,
>                               int width, int height)
>  {
>         ScrnInfoPtr pScrn = crtc->scrn;
> -       AMDGPUInfoPtr info = AMDGPUPTR(pScrn);
>         drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
>         drmmode_ptr drmmode = drmmode_crtc->drmmode;
>         int ret;
>         int pitch;
>         union gbm_bo_handle bo_handle;
>
> -       /* rotation requires acceleration */
> -       if (info->shadow_fb) {
> -               xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
> -                          "Rotation requires acceleration!\n");
> -               return NULL;
> -       }
> -
>         if (scanout->bo) {
>                 if (scanout->width == width && scanout->height == height)
>                         return scanout->bo;
> @@ -918,7 +910,7 @@ static Bool drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix)
>  }
>  #endif
>
> -static const xf86CrtcFuncsRec drmmode_crtc_funcs = {
> +static xf86CrtcFuncsRec drmmode_crtc_funcs = {
>         .dpms = drmmode_crtc_dpms,
>         .set_mode_major = drmmode_set_mode_major,
>         .set_cursor_colors = drmmode_set_cursor_colors,
> @@ -1872,6 +1864,7 @@ static void drm_wakeup_handler(pointer data, int err, pointer p)
>  Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
>  {
>         AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(pScrn);
> +       AMDGPUInfoPtr info = AMDGPUPTR(pScrn);
>         int i, num_dvi = 0, num_hdmi = 0;
>         unsigned int crtcs_needed = 0;
>         drmModeResPtr mode_res;
> @@ -1896,6 +1889,13 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int cpp)
>         xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, AMDGPU_LOGLEVEL_DEBUG,
>                        "%d crtcs needed for screen.\n", crtcs_needed);
>
> +       if (!info->use_glamor) {
> +               /* Rotation requires hardware acceleration */
> +               drmmode_crtc_funcs.shadow_allocate = NULL;
> +               drmmode_crtc_funcs.shadow_create = NULL;
> +               drmmode_crtc_funcs.shadow_destroy = NULL;
> +       }
> +
>         for (i = 0; i < mode_res->count_crtcs; i++)
>                 if (!xf86IsEntityShared(pScrn->entityList[0]) ||
>                     (crtcs_needed && !(pAMDGPUEnt->assigned_crtcs & (1 << i))))
> --
> 2.6.0
>
> _______________________________________________
> xorg-driver-ati mailing list
> xorg-driver-ati at lists.x.org
> http://lists.x.org/mailman/listinfo/xorg-driver-ati