diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2018-05-17 12:36:29 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2018-07-09 18:24:39 +0200 |
| commit | ba5d5402b3e2e807d7e47205ac83f930b6c8caf5 (patch) | |
| tree | 3185fe880b8083729dcddedf23e26d26a280f010 /src/radeon_kms.c | |
| parent | eec4a41925127ae490f0a5156a881a08d521e28e (diff) | |
glamor: Don't store radeon_surfaces in pixmaps
Only EXA needs them.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src/radeon_kms.c')
| -rw-r--r-- | src/radeon_kms.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/radeon_kms.c b/src/radeon_kms.c index 861fbf97..0066c4e9 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -326,7 +326,6 @@ static Bool RADEONCreateScreenResources_KMS(ScreenPtr pScreen) ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); RADEONInfoPtr info = RADEONPTR(pScrn); PixmapPtr pixmap; - struct radeon_surface *surface; pScreen->CreateScreenResources = info->CreateScreenResources; if (!(*pScreen->CreateScreenResources)(pScreen)) @@ -364,10 +363,9 @@ static Bool RADEONCreateScreenResources_KMS(ScreenPtr pScreen) PixmapPtr pPix = pScreen->GetScreenPixmap(pScreen); if (!radeon_set_pixmap_bo(pPix, info->front_bo)) return FALSE; - surface = radeon_get_pixmap_surface(pPix); - if (surface) { - *surface = info->front_surface; - } + + if (info->surf_man && !info->use_glamor) + *radeon_get_pixmap_surface(pPix) = info->front_surface; } } @@ -2758,7 +2756,8 @@ static Bool radeon_setup_kernel_mem(ScreenPtr pScreen) default: break; } - info->front_surface = surface; + if (!info->use_glamor) + info->front_surface = surface; } { int cursor_size; |