lineage-rockchip/android_external_minigbm
1
0
Fork 0
Code Activity Actions

Revert "minigbm: define GBM_BO_IMPORT_FD_MODIFIER"

Browse source 
This reverts commit bc667c3ef6.

Reason for revert: This change might cause crbug.com/913329.

Original change's description:
> minigbm: define GBM_BO_IMPORT_FD_MODIFIER
>
> This CL aligns the minigbm more with the upstream GBM
> by defining GBM_BO_IMPORT_FD_MODIFIER and using
> gbm_import_fd_modifier_data instead.
>
> That is, the main difference between the old
> gbm_import_fd_planar_data one and the new one is
> the format_modifiers variable. In the upstream
> GBM, it's a single variable. In the minigbm, it is
> an array.
>
> As we know there are no cases when modifiers would
> be different for each plane. Thus, it's safe to eliminate
> that and adapt more to the upstream.
>
> Change-Id: Iaae062ef1fe9fc9ab0ead09c5f4bfa91d2db67c3
> Reviewed-on: https://chromium-review.googlesource.com/1360771
> Commit-Ready: Maksim Sisov <msisov@igalia.com>
> Tested-by: Maksim Sisov <msisov@igalia.com>
> Reviewed-by: Gurchetan Singh <gurchetansingh@chromium.org>

Change-Id: I7dec62abd4243554847930cce33f0d5db069c3f4
Reviewed-on: https://chromium-review.googlesource.com/1369469
Commit-Ready: Naoki Fukino <fukino@chromium.org>
Tested-by: Naoki Fukino <fukino@chromium.org>
Reviewed-by: Naoki Fukino <fukino@chromium.org>
This commit is contained in:
Naoki Fukino 2018-12-10 06:22:23 +00:00 • committed by chrome-bot
parent bc667c3ef6
commit 400e928a09
2 changed files with 1 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

16
gbm.h
View file

@ -305,9 +305,7 @@ gbm_bo_create_with_modifiers(struct gbm_device *gbm,
#define GBM_BO_IMPORT_WL_BUFFER 0x5501
#define GBM_BO_IMPORT_EGL_IMAGE 0x5502
#define GBM_BO_IMPORT_FD 0x5503
#define GBM_BO_IMPORT_FD_MODIFIER 0x5504
// Deprecated. Use GBM_BO_IMPORT_FD_MODIFIER instead.
#define GBM_BO_IMPORT_FD_PLANAR 0x5505
#define GBM_BO_IMPORT_FD_PLANAR 0x5504
struct gbm_import_fd_data {
int fd;
@ -317,18 +315,6 @@ struct gbm_import_fd_data {
uint32_t format;
};
struct gbm_import_fd_modifier_data {
uint32_t width;
uint32_t height;
uint32_t format;
uint32_t num_fds;
int fds[GBM_MAX_PLANES];
int strides[GBM_MAX_PLANES];
int offsets[GBM_MAX_PLANES];
uint64_t modifier;
};
// Deprecated. Use gbm_import_fd_modifier_data instead.
struct gbm_import_fd_planar_data {
int fds[GBM_MAX_PLANES];
uint32_t width;