turnip: use msm_drm.h from inc_freedreno

The recent change to msm_drm.h changed the APIs in an incompatible
way.
This commit is contained in:
Chia-I Wu
2019-01-11 10:03:51 -08:00
parent 4f32869e3d
commit 91232c52fe
2 changed files with 10 additions and 8 deletions
+2 -1
View File
@@ -28,7 +28,6 @@
#include "tu_private.h"
#include <fcntl.h>
#include <msm_drm.h>
#include <stdbool.h>
#include <string.h>
#include <sys/mman.h>
@@ -42,6 +41,8 @@
#include "vk_format.h"
#include "vk_util.h"
#include "drm/msm_drm.h"
static int
tu_device_get_cache_uuid(uint16_t family, void *uuid)
{
+8 -7
View File
@@ -24,11 +24,12 @@
#include "tu_private.h"
#include "xf86drm.h"
#include <errno.h>
#include <msm_drm.h>
#include <stdint.h>
#include <sys/ioctl.h>
#include <xf86drm.h>
#include "drm/msm_drm.h"
/**
* Return gem handle on success. Return 0 on failure.
@@ -61,11 +62,11 @@ tu_gem_close(struct tu_device *dev, uint32_t gem_handle)
/** Return UINT64_MAX on error. */
static uint64_t
tu_gem_info(struct tu_device *dev, uint32_t gem_handle, uint32_t flags)
tu_gem_info(struct tu_device *dev, uint32_t gem_handle, uint32_t info)
{
struct drm_msm_gem_info req = {
.handle = gem_handle,
.flags = flags,
.info = info,
};
int ret = drmCommandWriteRead(dev->physical_device->local_fd,
@@ -73,21 +74,21 @@ tu_gem_info(struct tu_device *dev, uint32_t gem_handle, uint32_t flags)
if (ret == -1)
return UINT64_MAX;
return req.offset;
return req.value;
}
/** Return UINT64_MAX on error. */
uint64_t
tu_gem_info_offset(struct tu_device *dev, uint32_t gem_handle)
{
return tu_gem_info(dev, gem_handle, 0);
return tu_gem_info(dev, gem_handle, MSM_INFO_GET_OFFSET);
}
/** Return UINT64_MAX on error. */
uint64_t
tu_gem_info_iova(struct tu_device *dev, uint32_t gem_handle)
{
return tu_gem_info(dev, gem_handle, MSM_INFO_IOVA);
return tu_gem_info(dev, gem_handle, MSM_INFO_GET_IOVA);
}
int