diff options
| author | Russell King <rmk+cubox@arm.linux.org.uk> | 2013-10-30 10:48:39 +0000 |
|---|---|---|
| committer | Russell King <rmk@arm.linux.org.uk> | 2013-10-30 10:48:39 +0000 |
| commit | 3bade62beb2ff7614b8410d46104e10a1aaa2600 (patch) | |
| tree | b5beb842433ecff6737a210ca6ae6ae9b073b204 | |
| parent | a4d48f22f0156d5a387c2a38bf877f9d8fa81e7d (diff) | |
| download | xf86-video-armada-3bade62beb2ff7614b8410d46104e10a1aaa2600.tar.gz xf86-video-armada-3bade62beb2ff7614b8410d46104e10a1aaa2600.tar.xz | |
Avoid passing 'drm' to armada_bo_alloc_framebuffer()
armada_bo_alloc_framebuffer() can get at the drm structure itself
very trivially, it doesn't need to have it passed in.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| -rw-r--r-- | src/armada_drm.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/armada_drm.c b/src/armada_drm.c index b80a488..9ff1762 100644 --- a/src/armada_drm.c +++ b/src/armada_drm.c @@ -81,8 +81,9 @@ static void drmmode_ConvertToKMode(drmModeModeInfoPtr kmode, DisplayModePtr mode } static struct drm_armada_bo *armada_bo_alloc_framebuffer(ScrnInfoPtr pScrn, - struct armada_drm_info *drm, int width, int height, int bpp) + int width, int height, int bpp) { + struct armada_drm_info *drm = GET_DRM_INFO(pScrn); struct drm_armada_bo *bo; int ret; @@ -284,7 +285,7 @@ armada_drm_crtc_shadow_allocate(xf86CrtcPtr crtc, int width, int height) struct drm_armada_bo *bo; int ret; - bo = armada_bo_alloc_framebuffer(pScrn, drmc->drm, width, height, + bo = armada_bo_alloc_framebuffer(pScrn, width, height, pScrn->bitsPerPixel); if (!bo) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, @@ -435,7 +436,7 @@ static Bool armada_drm_xf86crtc_resize(ScrnInfoPtr pScrn, int width, int height) if (pScrn->virtualX == width && pScrn->virtualY == height) return TRUE; - bo = armada_bo_alloc_framebuffer(pScrn, drm, width, height, + bo = armada_bo_alloc_framebuffer(pScrn, width, height, pScrn->bitsPerPixel); if (!bo) return FALSE; @@ -750,7 +751,7 @@ armada_drm_ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) drm->accel = xf86ReturnOptValBool(drm->Options, OPTION_USE_GPU, TRUE); - bo = armada_bo_alloc_framebuffer(pScrn, drm, pScrn->virtualX, + bo = armada_bo_alloc_framebuffer(pScrn, pScrn->virtualX, pScrn->virtualY, pScrn->bitsPerPixel); if (!bo) return FALSE; |