summaryrefslogtreecommitdiff
path: root/src/gbm
diff options
context:
space:
mode:
authorMichel Dänzer <michel.daenzer@amd.com>2014-06-03 16:45:23 +0900
committerMichel Dänzer <michel@daenzer.net>2014-06-12 16:13:39 +0900
commitbe5e5b6c9364fcac8f26bc2875ffcfbaa4e17b45 (patch)
treeab29b1e57da1b0d35924a7a5e3e42a3c8f858d79 /src/gbm
parent2c8520c03de135228c37d67c9ff9756e3febb660 (diff)
gbm: Remove 64x64 restriction from GBM_BO_USE_CURSOR
GBM_BO_USE_CURSOR_64X64 is kept so that existing users of GBM continue to build, but it no longer rejects widths or heights other than 64. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79809 Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
Diffstat (limited to 'src/gbm')
-rw-r--r--src/gbm/backends/dri/gbm_dri.c8
-rw-r--r--src/gbm/main/gbm.c6
-rw-r--r--src/gbm/main/gbm.h12
3 files changed, 11 insertions, 15 deletions
diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c
index cec12d1f477..347bc997f4a 100644
--- a/src/gbm/backends/dri/gbm_dri.c
+++ b/src/gbm/backends/dri/gbm_dri.c
@@ -346,7 +346,7 @@ gbm_dri_is_format_supported(struct gbm_device *gbm,
return 0;
}
- if (usage & GBM_BO_USE_CURSOR_64X64 &&
+ if (usage & GBM_BO_USE_CURSOR &&
usage & GBM_BO_USE_RENDERING)
return 0;
@@ -532,7 +532,7 @@ gbm_dri_bo_import(struct gbm_device *gbm,
if (usage & GBM_BO_USE_SCANOUT)
dri_use |= __DRI_IMAGE_USE_SCANOUT;
- if (usage & GBM_BO_USE_CURSOR_64X64)
+ if (usage & GBM_BO_USE_CURSOR)
dri_use |= __DRI_IMAGE_USE_CURSOR;
if (dri->image->base.version >= 2 &&
!dri->image->validateUsage(bo->image, dri_use)) {
@@ -568,7 +568,7 @@ create_dumb(struct gbm_device *gbm,
struct drm_mode_destroy_dumb destroy_arg;
int ret;
- if (!(usage & GBM_BO_USE_CURSOR_64X64)) {
+ if (!(usage & GBM_BO_USE_CURSOR)) {
errno = EINVAL;
return NULL;
}
@@ -672,7 +672,7 @@ gbm_dri_bo_create(struct gbm_device *gbm,
if (usage & GBM_BO_USE_SCANOUT)
dri_use |= __DRI_IMAGE_USE_SCANOUT;
- if (usage & GBM_BO_USE_CURSOR_64X64)
+ if (usage & GBM_BO_USE_CURSOR)
dri_use |= __DRI_IMAGE_USE_CURSOR;
/* Gallium drivers requires shared in order to get the handle/stride */
diff --git a/src/gbm/main/gbm.c b/src/gbm/main/gbm.c
index 907ca3c90bf..c39cbfa7403 100644
--- a/src/gbm/main/gbm.c
+++ b/src/gbm/main/gbm.c
@@ -348,12 +348,6 @@ gbm_bo_create(struct gbm_device *gbm,
return NULL;
}
- if (usage & GBM_BO_USE_CURSOR_64X64 &&
- (width != 64 || height != 64)) {
- errno = EINVAL;
- return NULL;
- }
-
return gbm->bo_create(gbm, width, height, format, usage);
}
diff --git a/src/gbm/main/gbm.h b/src/gbm/main/gbm.h
index 92d472a0762..374cef83e3e 100644
--- a/src/gbm/main/gbm.h
+++ b/src/gbm/main/gbm.h
@@ -192,10 +192,13 @@ enum gbm_bo_flags {
*/
GBM_BO_USE_SCANOUT = (1 << 0),
/**
- * Buffer is going to be used as cursor - the dimensions for the buffer
- * must be 64x64 if this flag is passed.
+ * Buffer is going to be used as cursor
*/
- GBM_BO_USE_CURSOR_64X64 = (1 << 1),
+ GBM_BO_USE_CURSOR = (1 << 1),
+ /**
+ * Deprecated
+ */
+ GBM_BO_USE_CURSOR_64X64 = GBM_BO_USE_CURSOR,
/**
* Buffer is to be used for rendering - for example it is going to be used
* as the storage for a color buffer
@@ -203,8 +206,7 @@ enum gbm_bo_flags {
GBM_BO_USE_RENDERING = (1 << 2),
/**
* Buffer can be used for gbm_bo_write. This is guaranteed to work
- * with GBM_BO_USE_CURSOR_64X64. but may not work for other
- * combinations.
+ * with GBM_BO_USE_CURSOR. but may not work for other combinations.
*/
GBM_BO_USE_WRITE = (1 << 3),
};