diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2015-04-27 15:07:06 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2015-04-27 15:07:06 +0900 |
| commit | 340baf3804b7d9de8082badfc715a9bee7856e8f (patch) | |
| tree | e90746bff59673e8986262886554ed193409c2a1 /src | |
| parent | 80f3d727f93cb6efedd2b39338d2301035965fe2 (diff) | |
Don't call radeon_get_pixmap_private() when using EXA
It only works when using glamor.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90169
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/drmmode_display.c | 3 | ||||
| -rw-r--r-- | src/radeon_glamor.c | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 5af5900e..06d1ec06 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -150,7 +150,8 @@ static PixmapPtr drmmode_create_bo_pixmap(ScrnInfoPtr pScrn, } } - if (!radeon_glamor_create_textured_pixmap(pixmap, + if (info->use_glamor && + !radeon_glamor_create_textured_pixmap(pixmap, radeon_get_pixmap_private(pixmap))) { pScreen->DestroyPixmap(pixmap); return NULL; diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c index f00967f8..4b6b0243 100644 --- a/src/radeon_glamor.c +++ b/src/radeon_glamor.c @@ -153,12 +153,6 @@ radeon_glamor_pre_init(ScrnInfoPtr scrn) Bool radeon_glamor_create_textured_pixmap(PixmapPtr pixmap, struct radeon_pixmap *priv) { - ScrnInfoPtr scrn = xf86ScreenToScrn(pixmap->drawable.pScreen); - RADEONInfoPtr info = RADEONPTR(scrn); - - if ((info->use_glamor) == 0) - return TRUE; - return glamor_egl_create_textured_pixmap(pixmap, priv->bo->handle, pixmap->devKind); } |