fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 13:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

panfrost: Adapt to constant name change in UABI

Browse source 
We hadn't updated the kernel header after the driver got into mainline.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
This commit is contained in:
Tomeu Vizoso 2019-05-31 09:12:59 +02:00
parent 5ad5777f89
commit 6f60fec48f
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/drm-uapi/panfrost_drm.h
View file

@ -59,7 +59,7 @@ struct drm_panfrost_submit {
/** /**
* struct drm_panfrost_wait_bo - ioctl argument for waiting for * struct drm_panfrost_wait_bo - ioctl argument for waiting for
* completion of the last DRM_PANFROST_SUBMIT_CL on a BO. * completion of the last DRM_PANFROST_SUBMIT on a BO.
* *
* This is useful for cases where multiple processes might be * This is useful for cases where multiple processes might be
* rendering to a BO and you want to wait for all rendering to be * rendering to a BO and you want to wait for all rendering to be
@ -82,6 +82,8 @@ struct drm_panfrost_create_bo {
__u32 flags; __u32 flags;
/** Returned GEM handle for the BO. */ /** Returned GEM handle for the BO. */
__u32 handle; __u32 handle;
/* Pad, must be zero-filled. */
__u32 pad;
/** /**
* Returned offset for the BO in the GPU address space. This offset * Returned offset for the BO in the GPU address space. This offset
* is private to the DRM fd and is valid for the lifetime of the GEM * is private to the DRM fd and is valid for the lifetime of the GEM
@ -113,7 +115,7 @@ struct drm_panfrost_mmap_bo {
}; };
enum drm_panfrost_param { enum drm_panfrost_param {
DRM_PANFROST_PARAM_GPU_ID, DRM_PANFROST_PARAM_GPU_PROD_ID,
}; };
struct drm_panfrost_get_param { struct drm_panfrost_get_param {

2
src/gallium/drivers/panfrost/pan_drm.c
View file

@ -337,7 +337,7 @@ panfrost_drm_query_gpu_version(struct panfrost_screen *screen)
struct drm_panfrost_get_param get_param = {0,}; struct drm_panfrost_get_param get_param = {0,};
int ret; int ret;
get_param.param = DRM_PANFROST_PARAM_GPU_ID; get_param.param = DRM_PANFROST_PARAM_GPU_PROD_ID;
ret = drmIoctl(drm->fd, DRM_IOCTL_PANFROST_GET_PARAM, &get_param); ret = drmIoctl(drm->fd, DRM_IOCTL_PANFROST_GET_PARAM, &get_param);
assert(!ret); assert(!ret);