* [PATCH 1/8] eyxnos: install exynos tests if HAVE_INSTALL_TESTS
2014-03-05 5:01 [PATCH 0/8] various exynos cleanups Daniel Kurtz
@ 2014-03-05 5:01 ` Daniel Kurtz
2014-03-05 5:01 ` [PATCH 2/8] exynos: fix two warnings Daniel Kurtz
` (7 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Daniel Kurtz @ 2014-03-05 5:01 UTC (permalink / raw)
To: dri-devel, Inki Dae; +Cc: Kyungmin Park
This exynos test was added just before HAVE_INSTALL_TESTS, and so didn't
get this annotation.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
---
tests/exynos/Makefile.am | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tests/exynos/Makefile.am b/tests/exynos/Makefile.am
index bf9ad82..6703dcf 100644
--- a/tests/exynos/Makefile.am
+++ b/tests/exynos/Makefile.am
@@ -4,8 +4,13 @@ AM_CFLAGS = \
-I $(top_srcdir)/exynos \
-I $(top_srcdir)
+if HAVE_INSTALL_TESTS
+bin_PROGRAMS = \
+ exynos_fimg2d_test
+else
noinst_PROGRAMS = \
exynos_fimg2d_test
+endif
exynos_fimg2d_test_LDADD = \
$(top_builddir)/libdrm.la \
--
1.9.0.rc1.175.g0b1dcb5
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 2/8] exynos: fix two warnings
2014-03-05 5:01 [PATCH 0/8] various exynos cleanups Daniel Kurtz
2014-03-05 5:01 ` [PATCH 1/8] eyxnos: install exynos tests if HAVE_INSTALL_TESTS Daniel Kurtz
@ 2014-03-05 5:01 ` Daniel Kurtz
2014-03-05 5:01 ` [PATCH 3/8] exynos_fimg2d: fix cast from pointer to integer of different size Daniel Kurtz
` (6 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Daniel Kurtz @ 2014-03-05 5:01 UTC (permalink / raw)
To: dri-devel, Inki Dae; +Cc: Kyungmin Park
warning: assignment makes pointer from integer without a cast [enabled by default]
warning: initialization makes integer from pointer without a cast [enabled by default]
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
---
exynos/exynos_drm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/exynos/exynos_drm.c b/exynos/exynos_drm.c
index 4db755e..b7acdf5 100644
--- a/exynos/exynos_drm.c
+++ b/exynos/exynos_drm.c
@@ -294,7 +294,7 @@ void *exynos_bo_map(struct exynos_bo *bo)
return NULL;
}
- bo->vaddr = req.mapped;
+ bo->vaddr = (void *)(uintptr_t)req.mapped;
}
return bo->vaddr;
@@ -381,7 +381,7 @@ int exynos_vidi_connection(struct exynos_device *dev, uint32_t connect,
struct drm_exynos_vidi_connection req = {
.connection = connect,
.extensions = ext,
- .edid = edid,
+ .edid = (uint64_t)(uintptr_t)edid,
};
int ret;
--
1.9.0.rc1.175.g0b1dcb5
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 3/8] exynos_fimg2d: fix cast from pointer to integer of different size
2014-03-05 5:01 [PATCH 0/8] various exynos cleanups Daniel Kurtz
2014-03-05 5:01 ` [PATCH 1/8] eyxnos: install exynos tests if HAVE_INSTALL_TESTS Daniel Kurtz
2014-03-05 5:01 ` [PATCH 2/8] exynos: fix two warnings Daniel Kurtz
@ 2014-03-05 5:01 ` Daniel Kurtz
2014-03-05 5:01 ` [PATCH 4/8] exynos: remove unusable "run" target Daniel Kurtz
` (5 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Daniel Kurtz @ 2014-03-05 5:01 UTC (permalink / raw)
To: dri-devel, Inki Dae; +Cc: Kyungmin Park
Fixes two gcc [-Wpointer-to-int-cast] warnings.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
---
exynos/exynos_fimg2d.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/exynos/exynos_fimg2d.c b/exynos/exynos_fimg2d.c
index cf712a8..0b14618 100644
--- a/exynos/exynos_fimg2d.c
+++ b/exynos/exynos_fimg2d.c
@@ -158,8 +158,8 @@ static int g2d_flush(struct g2d_context *ctx)
memset(&cmdlist, 0, sizeof(struct drm_exynos_g2d_set_cmdlist));
- cmdlist.cmd = (unsigned int)&ctx->cmd[0];
- cmdlist.cmd_buf = (unsigned int)&ctx->cmd_buf[0];
+ cmdlist.cmd = (uint64_t)(uintptr_t)&ctx->cmd[0];
+ cmdlist.cmd_buf = (uint64_t)(uintptr_t)&ctx->cmd_buf[0];
cmdlist.cmd_nr = ctx->cmd_nr;
cmdlist.cmd_buf_nr = ctx->cmd_buf_nr;
cmdlist.event_type = G2D_EVENT_NOT;
--
1.9.0.rc1.175.g0b1dcb5
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 4/8] exynos: remove unusable "run" target
2014-03-05 5:01 [PATCH 0/8] various exynos cleanups Daniel Kurtz
` (2 preceding siblings ...)
2014-03-05 5:01 ` [PATCH 3/8] exynos_fimg2d: fix cast from pointer to integer of different size Daniel Kurtz
@ 2014-03-05 5:01 ` Daniel Kurtz
2014-03-05 5:01 ` [PATCH 5/8] exynos_fimg2d_test: fix drmModeRmFB Daniel Kurtz
` (4 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Daniel Kurtz @ 2014-03-05 5:01 UTC (permalink / raw)
To: dri-devel, Inki Dae; +Cc: Kyungmin Park
This looks like it was copied from kmstest, but isn't needed, and doesn't
actually work since exynos_fimg2d_test requires parameters.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
---
tests/exynos/Makefile.am | 2 --
1 file changed, 2 deletions(-)
diff --git a/tests/exynos/Makefile.am b/tests/exynos/Makefile.am
index 6703dcf..518f00b 100644
--- a/tests/exynos/Makefile.am
+++ b/tests/exynos/Makefile.am
@@ -20,5 +20,3 @@ exynos_fimg2d_test_LDADD = \
exynos_fimg2d_test_SOURCES = \
exynos_fimg2d_test.c
-run: exynos_fimg2d_test
- ./exynos_fimg2d_test
--
1.9.0.rc1.175.g0b1dcb5
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 5/8] exynos_fimg2d_test: fix drmModeRmFB
2014-03-05 5:01 [PATCH 0/8] various exynos cleanups Daniel Kurtz
` (3 preceding siblings ...)
2014-03-05 5:01 ` [PATCH 4/8] exynos: remove unusable "run" target Daniel Kurtz
@ 2014-03-05 5:01 ` Daniel Kurtz
2014-03-05 5:01 ` [PATCH 6/8] drmOpenByName: remove redundant drmAvailable check Daniel Kurtz
` (3 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Daniel Kurtz @ 2014-03-05 5:01 UTC (permalink / raw)
To: dri-devel, Inki Dae; +Cc: Kyungmin Park
The first parameter should be the drm fd, second param is the fb id.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
---
tests/exynos/exynos_fimg2d_test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/exynos/exynos_fimg2d_test.c b/tests/exynos/exynos_fimg2d_test.c
index e80455a..c6bd558 100644
--- a/tests/exynos/exynos_fimg2d_test.c
+++ b/tests/exynos/exynos_fimg2d_test.c
@@ -682,7 +682,7 @@ err_free_src:
exynos_destroy_buffer(src);
err_rm_fb:
- drmModeRmFB(fb_id, bo->handle);
+ drmModeRmFB(dev->fd, fb_id);
err_destroy_buffer:
exynos_destroy_buffer(bo);
--
1.9.0.rc1.175.g0b1dcb5
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 6/8] drmOpenByName: remove redundant drmAvailable check
2014-03-05 5:01 [PATCH 0/8] various exynos cleanups Daniel Kurtz
` (4 preceding siblings ...)
2014-03-05 5:01 ` [PATCH 5/8] exynos_fimg2d_test: fix drmModeRmFB Daniel Kurtz
@ 2014-03-05 5:01 ` Daniel Kurtz
2014-03-05 5:01 ` [PATCH 7/8] exynos: prime: use drmPrime*() helpers Daniel Kurtz
` (2 subsequent siblings)
8 siblings, 0 replies; 12+ messages in thread
From: Daniel Kurtz @ 2014-03-05 5:01 UTC (permalink / raw)
To: dri-devel, Inki Dae; +Cc: Kyungmin Park
drmOpenByName() is a static function that is only called by drmOpen().
drmOpen() already checks drmAvailable(), so the checki in
drmOpenByName() is redundant.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
---
xf86drm.c | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/xf86drm.c b/xf86drm.c
index 720952f..118022c 100644
--- a/xf86drm.c
+++ b/xf86drm.c
@@ -537,19 +537,6 @@ static int drmOpenByName(const char *name)
int fd;
drmVersionPtr version;
char * id;
-
- if (!drmAvailable()) {
- if (!drm_server_info) {
- return -1;
- }
- else {
- /* try to load the kernel module now */
- if (!drm_server_info->load_module(name)) {
- drmMsg("[drm] failed to load kernel module \"%s\"\n", name);
- return -1;
- }
- }
- }
/*
* Open the first minor number that matches the driver name and isn't
--
1.9.0.rc1.175.g0b1dcb5
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 7/8] exynos: prime: use drmPrime*() helpers
2014-03-05 5:01 [PATCH 0/8] various exynos cleanups Daniel Kurtz
` (5 preceding siblings ...)
2014-03-05 5:01 ` [PATCH 6/8] drmOpenByName: remove redundant drmAvailable check Daniel Kurtz
@ 2014-03-05 5:01 ` Daniel Kurtz
2014-03-05 5:01 ` [PATCH 8/8] exynos: removed unused fd field Daniel Kurtz
2014-03-05 5:15 ` [PATCH 0/8] various exynos cleanups Inki Dae
8 siblings, 0 replies; 12+ messages in thread
From: Daniel Kurtz @ 2014-03-05 5:01 UTC (permalink / raw)
To: dri-devel, Inki Dae; +Cc: Kyungmin Park
Reuse the common drmPrime() helper functions rather than reinventing them.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
---
exynos/exynos_drm.c | 48 ++++++++++--------------------------------------
1 file changed, 10 insertions(+), 38 deletions(-)
diff --git a/exynos/exynos_drm.c b/exynos/exynos_drm.c
index b7acdf5..5fff259 100644
--- a/exynos/exynos_drm.c
+++ b/exynos/exynos_drm.c
@@ -303,59 +303,31 @@ void *exynos_bo_map(struct exynos_bo *bo)
/*
* Export gem object to dmabuf as file descriptor.
*
- * @dev: a exynos device object.
- * @handle: gem handle to be exported into dmabuf as file descriptor.
- * @fd: file descriptor to dmabuf exported from gem handle and
- * returned by kernel side.
+ * @dev: exynos device object
+ * @handle: gem handle to export as file descriptor of dmabuf
+ * @fd: file descriptor returned from kernel
*
- * if true, return 0 else negative.
+ * @return: 0 on success, -1 on error, and errno will be set
*/
int exynos_prime_handle_to_fd(struct exynos_device *dev, uint32_t handle,
int *fd)
{
- int ret;
- struct drm_prime_handle req = {
- .handle = handle,
- };
-
- ret = drmIoctl(dev->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &req);
- if (ret) {
- fprintf(stderr, "failed to mmap[%s].\n",
- strerror(errno));
- return ret;
- }
-
- *fd = req.fd;
- return 0;
+ return drmPrimeHandleToFD(dev->fd, handle, 0, fd);
}
/*
* Import file descriptor into gem handle.
*
- * @dev: a exynos device object.
- * @fd: file descriptor exported into dmabuf.
- * @handle: gem handle to gem object imported from file descriptor
- * and returned by kernel side.
+ * @dev: exynos device object
+ * @fd: file descriptor of dmabuf to import
+ * @handle: gem handle returned from kernel
*
- * if true, return 0 else negative.
+ * @return: 0 on success, -1 on error, and errno will be set
*/
int exynos_prime_fd_to_handle(struct exynos_device *dev, int fd,
uint32_t *handle)
{
- int ret;
- struct drm_prime_handle req = {
- .fd = fd,
- };
-
- ret = drmIoctl(dev->fd, DRM_IOCTL_PRIME_FD_TO_HANDLE, &req);
- if (ret) {
- fprintf(stderr, "failed to mmap[%s].\n",
- strerror(errno));
- return ret;
- }
-
- *handle = req.handle;
- return 0;
+ return drmPrimeFDToHandle(dev->fd, fd, handle);
}
--
1.9.0.rc1.175.g0b1dcb5
^ permalink raw reply related [flat|nested] 12+ messages in thread* [PATCH 8/8] exynos: removed unused fd field
2014-03-05 5:01 [PATCH 0/8] various exynos cleanups Daniel Kurtz
` (6 preceding siblings ...)
2014-03-05 5:01 ` [PATCH 7/8] exynos: prime: use drmPrime*() helpers Daniel Kurtz
@ 2014-03-05 5:01 ` Daniel Kurtz
2014-03-05 5:15 ` [PATCH 0/8] various exynos cleanups Inki Dae
8 siblings, 0 replies; 12+ messages in thread
From: Daniel Kurtz @ 2014-03-05 5:01 UTC (permalink / raw)
To: dri-devel, Inki Dae; +Cc: Kyungmin Park
The documentation says fd holds the fd from prime import/export.
However, it isn't actually used, nor is it necessary, so let's just remove
it.
Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
---
exynos/exynos_drmif.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/exynos/exynos_drmif.h b/exynos/exynos_drmif.h
index 92f613e..c7c1d44 100644
--- a/exynos/exynos_drmif.h
+++ b/exynos/exynos_drmif.h
@@ -41,7 +41,6 @@ struct exynos_device {
* @dev: exynos device object allocated.
* @handle: a gem handle to gem object created.
* @flags: indicate memory allocation and cache attribute types.
- * @fd: file descriptor exported into dmabuf.
* @size: size to the buffer created.
* @vaddr: user space address to a gem buffer mmaped.
* @name: a gem global handle from flink request.
@@ -50,7 +49,6 @@ struct exynos_bo {
struct exynos_device *dev;
uint32_t handle;
uint32_t flags;
- int fd;
size_t size;
void *vaddr;
uint32_t name;
--
1.9.0.rc1.175.g0b1dcb5
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [PATCH 0/8] various exynos cleanups
2014-03-05 5:01 [PATCH 0/8] various exynos cleanups Daniel Kurtz
` (7 preceding siblings ...)
2014-03-05 5:01 ` [PATCH 8/8] exynos: removed unused fd field Daniel Kurtz
@ 2014-03-05 5:15 ` Inki Dae
2014-03-14 1:34 ` Daniel Kurtz
8 siblings, 1 reply; 12+ messages in thread
From: Inki Dae @ 2014-03-05 5:15 UTC (permalink / raw)
To: Daniel Kurtz; +Cc: Kyungmin Park, DRI mailing list
Hi,
Thanks you for cleanups.
2014-03-05 14:01 GMT+09:00 Daniel Kurtz <djkurtz@chromium.org>:
> Just some clean up patches, mostly for libdrm_exynos.
>
> Daniel Kurtz (8):
> eyxnos: install exynos tests if HAVE_INSTALL_TESTS
> exynos: fix two warnings
> exynos_fimg2d: fix cast from pointer to integer of different size
> exynos: remove unusable "run" target
> exynos_fimg2d_test: fix drmModeRmFB
> drmOpenByName: remove redundant drmAvailable check
> exynos: prime: use drmPrime*() helpers
> exynos: removed unused fd field
>
1 through 5, and 7 through 8,
Acked-by: Inki Dae <inki.dae@samsung.com>
Thanks,
Inki Dae
> exynos/exynos_drm.c | 52 +++++++++------------------------------
> exynos/exynos_drmif.h | 2 --
> exynos/exynos_fimg2d.c | 4 +--
> tests/exynos/Makefile.am | 7 ++++--
> tests/exynos/exynos_fimg2d_test.c | 2 +-
> xf86drm.c | 13 ----------
> 6 files changed, 20 insertions(+), 60 deletions(-)
>
> --
> 1.9.0.rc1.175.g0b1dcb5
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [PATCH 0/8] various exynos cleanups
2014-03-05 5:15 ` [PATCH 0/8] various exynos cleanups Inki Dae
@ 2014-03-14 1:34 ` Daniel Kurtz
2014-04-05 3:10 ` Daniel Kurtz
0 siblings, 1 reply; 12+ messages in thread
From: Daniel Kurtz @ 2014-03-14 1:34 UTC (permalink / raw)
To: Inki Dae; +Cc: Kyungmin Park, DRI mailing list
On Wed, Mar 5, 2014 at 1:15 PM, Inki Dae <inki.dae@samsung.com> wrote:
> Hi,
>
> Thanks you for cleanups.
>
> 2014-03-05 14:01 GMT+09:00 Daniel Kurtz <djkurtz@chromium.org>:
>> Just some clean up patches, mostly for libdrm_exynos.
>>
>> Daniel Kurtz (8):
>> eyxnos: install exynos tests if HAVE_INSTALL_TESTS
>> exynos: fix two warnings
>> exynos_fimg2d: fix cast from pointer to integer of different size
>> exynos: remove unusable "run" target
>> exynos_fimg2d_test: fix drmModeRmFB
>> drmOpenByName: remove redundant drmAvailable check
>> exynos: prime: use drmPrime*() helpers
>> exynos: removed unused fd field
>>
>
> 1 through 5, and 7 through 8,
>
> Acked-by: Inki Dae <inki.dae@samsung.com>
Inki,
Thanks for the reviews.
Can someone with commit access push the 7 ACK'ed patches.
Also, can someone please review patch number 6?
>
>
> Thanks,
> Inki Dae
>
>> exynos/exynos_drm.c | 52 +++++++++------------------------------
>> exynos/exynos_drmif.h | 2 --
>> exynos/exynos_fimg2d.c | 4 +--
>> tests/exynos/Makefile.am | 7 ++++--
>> tests/exynos/exynos_fimg2d_test.c | 2 +-
>> xf86drm.c | 13 ----------
>> 6 files changed, 20 insertions(+), 60 deletions(-)
>>
>> --
>> 1.9.0.rc1.175.g0b1dcb5
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 0/8] various exynos cleanups
2014-03-14 1:34 ` Daniel Kurtz
@ 2014-04-05 3:10 ` Daniel Kurtz
0 siblings, 0 replies; 12+ messages in thread
From: Daniel Kurtz @ 2014-04-05 3:10 UTC (permalink / raw)
To: Inki Dae; +Cc: Kyungmin Park, DRI mailing list
On Fri, Mar 14, 2014 at 9:34 AM, Daniel Kurtz <djkurtz@chromium.org> wrote:
> On Wed, Mar 5, 2014 at 1:15 PM, Inki Dae <inki.dae@samsung.com> wrote:
>> Hi,
>>
>> Thanks you for cleanups.
>>
>> 2014-03-05 14:01 GMT+09:00 Daniel Kurtz <djkurtz@chromium.org>:
>>> Just some clean up patches, mostly for libdrm_exynos.
>>>
>>> Daniel Kurtz (8):
>>> eyxnos: install exynos tests if HAVE_INSTALL_TESTS
>>> exynos: fix two warnings
>>> exynos_fimg2d: fix cast from pointer to integer of different size
>>> exynos: remove unusable "run" target
>>> exynos_fimg2d_test: fix drmModeRmFB
>>> drmOpenByName: remove redundant drmAvailable check
>>> exynos: prime: use drmPrime*() helpers
>>> exynos: removed unused fd field
>>>
>>
>> 1 through 5, and 7 through 8,
>>
>> Acked-by: Inki Dae <inki.dae@samsung.com>
>
> Inki,
> Thanks for the reviews.
>
> Can someone with commit access push the 7 ACK'ed patches.
> Also, can someone please review patch number 6?
Gentle ping...
Can someone with commit access push the 7 ACK'ed patches.
Also, can someone please review patch number 6?
>
>>
>>
>> Thanks,
>> Inki Dae
>>
>>> exynos/exynos_drm.c | 52 +++++++++------------------------------
>>> exynos/exynos_drmif.h | 2 --
>>> exynos/exynos_fimg2d.c | 4 +--
>>> tests/exynos/Makefile.am | 7 ++++--
>>> tests/exynos/exynos_fimg2d_test.c | 2 +-
>>> xf86drm.c | 13 ----------
>>> 6 files changed, 20 insertions(+), 60 deletions(-)
>>>
>>> --
>>> 1.9.0.rc1.175.g0b1dcb5
>>>
>>> _______________________________________________
>>> dri-devel mailing list
>>> dri-devel@lists.freedesktop.org
>>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 12+ messages in thread