* [RFC][PATCH v2] drm_hwcomposer: Rework platformdrmgeneric.cpp to use libdrm's gralloc handle
@ 2018-04-03 3:57 John Stultz
2018-04-04 9:24 ` Robert Foss
0 siblings, 1 reply; 3+ messages in thread
From: John Stultz @ 2018-04-03 3:57 UTC (permalink / raw)
To: dri-devel; +Cc: Robert Foss, Rob Herring, Sean Paul, Stefan Schake
Rework the platformdrmgeneric buffer importer to use the libdrm
generic gralloc handle definition.
This is just to get the drm_hwcomposer project building in AOSP
along with the libdrm freedesktop/master branch. Similar changes
may also be needed to gbm_gralloc and other projects not used
in AOSP.
Mostly just sending this out for review feedback.
Cc: Robert Foss <robert.foss@collabora.com>
Cc: Rob Herring <rob.herring@linaro.org>
Cc: Sean Paul <seanpaul@google.com>
Cc: Stefan Schake <stschake@gmail.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
v2: Utilize libdrm exporting headers to avoid having to tweak
the includes path, as suggsted by Stefan Schake
---
platformdrmgeneric.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/platformdrmgeneric.cpp b/platformdrmgeneric.cpp
index 741d42b..2a6773c 100644
--- a/platformdrmgeneric.cpp
+++ b/platformdrmgeneric.cpp
@@ -25,7 +25,7 @@
#include <xf86drmMode.h>
#include <cutils/log.h>
-#include <gralloc_drm_handle.h>
+#include <gralloc_handle.h>
#include <hardware/gralloc.h>
#include <EGL/eglext.h>
@@ -85,23 +85,23 @@ uint32_t DrmGenericImporter::ConvertHalFormatToDrm(uint32_t hal_format) {
}
EGLImageKHR DrmGenericImporter::ImportImage(EGLDisplay egl_display, buffer_handle_t handle) {
- gralloc_drm_handle_t *gr_handle = gralloc_drm_handle(handle);
+ gralloc_handle_t *gr_handle = gralloc_handle(handle);
if (!gr_handle)
return NULL;
EGLint attr[] = {
- EGL_WIDTH, gr_handle->width,
- EGL_HEIGHT, gr_handle->height,
+ EGL_WIDTH, (EGLint)gr_handle->width,
+ EGL_HEIGHT, (EGLint)gr_handle->height,
EGL_LINUX_DRM_FOURCC_EXT, (EGLint)ConvertHalFormatToDrm(gr_handle->format),
EGL_DMA_BUF_PLANE0_FD_EXT, gr_handle->prime_fd,
EGL_DMA_BUF_PLANE0_OFFSET_EXT, 0,
- EGL_DMA_BUF_PLANE0_PITCH_EXT, gr_handle->stride,
+ EGL_DMA_BUF_PLANE0_PITCH_EXT, (EGLint)gr_handle->stride,
EGL_NONE,
};
return eglCreateImageKHR(egl_display, EGL_NO_CONTEXT, EGL_LINUX_DMA_BUF_EXT, NULL, attr);
}
int DrmGenericImporter::ImportBuffer(buffer_handle_t handle, hwc_drm_bo_t *bo) {
- gralloc_drm_handle_t *gr_handle = gralloc_drm_handle(handle);
+ gralloc_handle_t *gr_handle = gralloc_handle(handle);
if (!gr_handle)
return -EINVAL;
--
2.7.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [RFC][PATCH v2] drm_hwcomposer: Rework platformdrmgeneric.cpp to use libdrm's gralloc handle
2018-04-03 3:57 [RFC][PATCH v2] drm_hwcomposer: Rework platformdrmgeneric.cpp to use libdrm's gralloc handle John Stultz
@ 2018-04-04 9:24 ` Robert Foss
2018-04-04 17:33 ` John Stultz
0 siblings, 1 reply; 3+ messages in thread
From: Robert Foss @ 2018-04-04 9:24 UTC (permalink / raw)
To: John Stultz, dri-devel; +Cc: Rob Herring, Sean Paul, Stefan Schake
Hey,
Builds for hikey960, pushed upstream.
Rob.
On 04/03/2018 05:57 AM, John Stultz wrote:
> Rework the platformdrmgeneric buffer importer to use the libdrm
> generic gralloc handle definition.
>
> This is just to get the drm_hwcomposer project building in AOSP
> along with the libdrm freedesktop/master branch. Similar changes
> may also be needed to gbm_gralloc and other projects not used
> in AOSP.
>
> Mostly just sending this out for review feedback.
>
> Cc: Robert Foss <robert.foss@collabora.com>
> Cc: Rob Herring <rob.herring@linaro.org>
> Cc: Sean Paul <seanpaul@google.com>
> Cc: Stefan Schake <stschake@gmail.com>
> Signed-off-by: John Stultz <john.stultz@linaro.org>
> ---
> v2: Utilize libdrm exporting headers to avoid having to tweak
> the includes path, as suggsted by Stefan Schake
> ---
> platformdrmgeneric.cpp | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/platformdrmgeneric.cpp b/platformdrmgeneric.cpp
> index 741d42b..2a6773c 100644
> --- a/platformdrmgeneric.cpp
> +++ b/platformdrmgeneric.cpp
> @@ -25,7 +25,7 @@
> #include <xf86drmMode.h>
>
> #include <cutils/log.h>
> -#include <gralloc_drm_handle.h>
> +#include <gralloc_handle.h>
> #include <hardware/gralloc.h>
> #include <EGL/eglext.h>
>
> @@ -85,23 +85,23 @@ uint32_t DrmGenericImporter::ConvertHalFormatToDrm(uint32_t hal_format) {
> }
>
> EGLImageKHR DrmGenericImporter::ImportImage(EGLDisplay egl_display, buffer_handle_t handle) {
> - gralloc_drm_handle_t *gr_handle = gralloc_drm_handle(handle);
> + gralloc_handle_t *gr_handle = gralloc_handle(handle);
> if (!gr_handle)
> return NULL;
> EGLint attr[] = {
> - EGL_WIDTH, gr_handle->width,
> - EGL_HEIGHT, gr_handle->height,
> + EGL_WIDTH, (EGLint)gr_handle->width,
> + EGL_HEIGHT, (EGLint)gr_handle->height,
> EGL_LINUX_DRM_FOURCC_EXT, (EGLint)ConvertHalFormatToDrm(gr_handle->format),
> EGL_DMA_BUF_PLANE0_FD_EXT, gr_handle->prime_fd,
> EGL_DMA_BUF_PLANE0_OFFSET_EXT, 0,
> - EGL_DMA_BUF_PLANE0_PITCH_EXT, gr_handle->stride,
> + EGL_DMA_BUF_PLANE0_PITCH_EXT, (EGLint)gr_handle->stride,
> EGL_NONE,
> };
> return eglCreateImageKHR(egl_display, EGL_NO_CONTEXT, EGL_LINUX_DMA_BUF_EXT, NULL, attr);
> }
>
> int DrmGenericImporter::ImportBuffer(buffer_handle_t handle, hwc_drm_bo_t *bo) {
> - gralloc_drm_handle_t *gr_handle = gralloc_drm_handle(handle);
> + gralloc_handle_t *gr_handle = gralloc_handle(handle);
> if (!gr_handle)
> return -EINVAL;
>
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [RFC][PATCH v2] drm_hwcomposer: Rework platformdrmgeneric.cpp to use libdrm's gralloc handle
2018-04-04 9:24 ` Robert Foss
@ 2018-04-04 17:33 ` John Stultz
0 siblings, 0 replies; 3+ messages in thread
From: John Stultz @ 2018-04-04 17:33 UTC (permalink / raw)
To: Robert Foss; +Cc: Rob Herring, Sean Paul, dri-devel, Stefan Schake
On Wed, Apr 4, 2018 at 2:24 AM, Robert Foss <robert.foss@collabora.com> wrote:
> Hey,
>
> Builds for hikey960, pushed upstream.
>
Much appreciated! Thanks so much!
-john
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-04-04 17:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-04-03 3:57 [RFC][PATCH v2] drm_hwcomposer: Rework platformdrmgeneric.cpp to use libdrm's gralloc handle John Stultz
2018-04-04 9:24 ` Robert Foss
2018-04-04 17:33 ` John Stultz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.