diff options
| author | Russell King <rmk@arm.linux.org.uk> | 2015-06-12 17:16:26 +0100 |
|---|---|---|
| committer | Russell King <rmk@arm.linux.org.uk> | 2015-06-29 12:58:34 +0100 |
| commit | a5de282fa42d69fcf8d7a1cf898027e11004c694 (patch) | |
| tree | 6aa7311b28a58214310980d09d2c186fd6ef88d4 | |
| parent | 2e138f3ab75eda32c415b2f510a9a4a991c60cfd (diff) | |
src: Xv: remove old bmm buffer passing from armada DRM Xv backend
Remove the old (and non-functional) bmm buffer passing from the
Armada DRM Xv backend. This is obsolete and unsupported.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>
| -rw-r--r-- | src/armada_drm_xv.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/src/armada_drm_xv.c b/src/armada_drm_xv.c index 8c8b960..7eaafe1 100644 --- a/src/armada_drm_xv.c +++ b/src/armada_drm_xv.c @@ -564,13 +564,6 @@ static Bool armada_drm_is_bmm(unsigned char *buf) } static int -armada_drm_get_bmm(ScrnInfoPtr pScrn, struct drm_xv *drmxv, unsigned char *buf, - uint32_t *id) -{ - return BadAlloc; -} - -static int armada_drm_get_xvbo(ScrnInfoPtr pScrn, struct drm_xv *drmxv, unsigned char *buf, uint32_t *id) { @@ -704,6 +697,12 @@ armada_drm_plane_fbid(ScrnInfoPtr pScrn, struct drm_xv *drmxv, int image, * first word. */ image = ((uint32_t *)buf)[0]; + else if (armada_drm_is_bmm(buf)) + /* + * We no longer handle the old Marvell BMM buffer + * passing protocol + */ + return BadAlloc; if (drmxv->width != width || drmxv->height != height || drmxv->fourcc != image || !drmxv->plane_format) { @@ -718,9 +717,6 @@ armada_drm_plane_fbid(ScrnInfoPtr pScrn, struct drm_xv *drmxv, int image, if (is_bo) { drmxv->is_bmm = TRUE; drmxv->get_fb = armada_drm_get_xvbo; - } else if (armada_drm_is_bmm(buf)) { - drmxv->is_bmm = TRUE; - drmxv->get_fb = armada_drm_get_bmm; } else { drmxv->is_bmm = FALSE; drmxv->get_fb = armada_drm_get_std; @@ -738,8 +734,8 @@ armada_drm_plane_fbid(ScrnInfoPtr pScrn, struct drm_xv *drmxv, int image, drmxv->fourcc = image; // xf86DrvMsg(pScrn->scrnIndex, X_INFO, -// "[drm] bmm %u xvbo %u fourcc %08x\n", -// drmxv->is_bmm, is_bo, image); +// "[drm] xvbo %u fourcc %08x\n", +// is_bo, image); /* Pre-allocate the buffers if we aren't using XVBO or BMM */ if (!drmxv->is_bmm) { |