From e1b78c7b484a5025d854d8f1e5d0cc3f2cc3113e Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Thu, 12 Nov 2015 20:20:04 +0200 Subject: dumbfb: move prime_fd() and fix its return type --- libkms++/dumbframebuffer.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'libkms++/dumbframebuffer.cpp') diff --git a/libkms++/dumbframebuffer.cpp b/libkms++/dumbframebuffer.cpp index 730d297..ec0fefb 100644 --- a/libkms++/dumbframebuffer.cpp +++ b/libkms++/dumbframebuffer.cpp @@ -35,19 +35,6 @@ DumbFramebuffer::~DumbFramebuffer() Destroy(); } -uint32_t DumbFramebuffer::prime_fd(unsigned int plane) -{ - if (m_planes[plane].prime_fd >= 0) - return m_planes[plane].prime_fd; - - int r = drmPrimeHandleToFD(card().fd(), m_planes[plane].handle, - DRM_CLOEXEC, &m_planes[plane].prime_fd); - if (r) - throw std::runtime_error("drmPrimeHandleToFD failed\n"); - - return m_planes[plane].prime_fd; -} - struct FormatPlaneInfo { uint8_t bitspp; /* bits per (macro) pixel */ @@ -164,4 +151,17 @@ uint8_t* DumbFramebuffer::map(unsigned plane) return p.map; } +int DumbFramebuffer::prime_fd(unsigned int plane) +{ + if (m_planes[plane].prime_fd >= 0) + return m_planes[plane].prime_fd; + + int r = drmPrimeHandleToFD(card().fd(), m_planes[plane].handle, + DRM_CLOEXEC, &m_planes[plane].prime_fd); + if (r) + throw std::runtime_error("drmPrimeHandleToFD failed\n"); + + return m_planes[plane].prime_fd; +} + } -- cgit v1.2.3