This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[0807/082331:WARNING:diagnostics_writer.cc(208)] Finished 17 tests. | |
[0807/082331:WARNING:diagnostics_writer.cc(208)] Finished Recovery for: Install type | |
[0807/082331:WARNING:diagnostics_writer.cc(208)] Finished Recovery for: Chrome version test | |
[0807/082331:WARNING:diagnostics_writer.cc(208)] Finished Recovery for: User data path | |
[0807/082331:WARNING:diagnostics_writer.cc(208)] Finished Recovery for: Local state path | |
[0807/082331:WARNING:diagnostics_writer.cc(208)] Finished Recovery for: App dictionaries directory path | |
[0807/082331:WARNING:diagnostics_writer.cc(208)] Finished Recovery for: Resources path | |
[0807/082331:WARNING:diagnostics_writer.cc(208)] Finished Recovery for: Available disk space | |
[0807/082331:WARNING:diagnostics_writer.cc(208)] Finished Recovery for: User preferences integrity | |
[0807/082331:WARNING:diagnostics_writer.cc(208)] Finished Recovery for: Local state integrity |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/ui/ozone/platform/drm/gpu/gbm_buffer.h b/ui/ozone/platform/drm/gpu/gbm_buffer.h | |
index 239e96e..2370b62 100644 | |
--- a/ui/ozone/platform/drm/gpu/gbm_buffer.h | |
+++ b/ui/ozone/platform/drm/gpu/gbm_buffer.h | |
@@ -16,7 +16,7 @@ | |
struct gbm_bo; | |
namespace gfx { | |
-class NativePixmapHandle; | |
+struct NativePixmapHandle; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/tests/kms_pwrite_crc.c b/tests/kms_pwrite_crc.c | |
index 05b9e38..419b46d 100644 | |
--- a/tests/kms_pwrite_crc.c | |
+++ b/tests/kms_pwrite_crc.c | |
@@ -50,6 +50,20 @@ typedef struct { | |
uint32_t devid; | |
} data_t; | |
+static char *dmabuf_mmap_framebuffer(int drm_fd, struct igt_fb *fb) | |
+{ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/tests/prime_crc.c b/tests/prime_crc.c | |
index dccfa3f..5357fe8 100644 | |
--- a/tests/prime_crc.c | |
+++ b/tests/prime_crc.c | |
@@ -93,6 +93,21 @@ static void mess_with_coherency(char *ptr) | |
// close(dma_buf_fd); | |
} | |
+static char *drm_mmap_framebuffer(struct igt_fb *fb) | |
+{ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit f13a04be0723afbc8188fdc8d4cc0776590e94b3 | |
Author: Daniel Thompson <[email protected]> | |
Date: Fri Jun 19 14:52:28 2015 +0100 | |
drm: prime: Honour O_RDWR during prime-handle-to-fd | |
Currently DRM_IOCTL_PRIME_HANDLE_TO_FD rejects all flags except | |
(DRM|O)_CLOEXEC making it difficult (maybe impossible) for userspace | |
to mmap() the resulting dma-buf even when this is supported by the | |
DRM driver. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
commit 47aee337cccf43f7018aa2d590c9a471cf6583f0 | |
Author: Tiago Vignatti <[email protected]> | |
Date: Fri Jul 24 20:50:30 2015 -0300 | |
WIP: Native GpuMemoryBUffer through Prime mmap only | |
no VGEM, no vendor dependent ioctls. Just dma-buf. | |
--- | |
.../chromeos/login/chrome_restart_request.cc | 1 + | |
content/browser/gpu/gpu_process_host.cc | 1 + |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c | |
index 5d0f65d..489e335 100644 | |
--- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c | |
+++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c | |
@@ -199,19 +199,21 @@ static int i915_gem_dmabuf_mmap(struct dma_buf *dma_buf, struct vm_area_struct * | |
{ | |
struct drm_i915_gem_object *obj = dma_buf_to_obj(dma_buf); | |
struct drm_device *dev = obj->base.dev; | |
+ int ret; | |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c | |
index e1790af..5526fd5 100644 | |
--- a/drivers/gpu/drm/drm_stub.c | |
+++ b/drivers/gpu/drm/drm_stub.c | |
@@ -39,6 +39,7 @@ | |
#include <drm/drmP.h> | |
#include <drm/drm_core.h> | |
+//unsigned int drm_debug = 15; /* 1 to enable debug output */ | |
unsigned int drm_debug = 0; /* 1 to enable debug output */ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c | |
index e1790af..5526fd5 100644 | |
--- a/drivers/gpu/drm/drm_stub.c | |
+++ b/drivers/gpu/drm/drm_stub.c | |
@@ -39,6 +39,7 @@ | |
#include <drm/drmP.h> | |
#include <drm/drm_core.h> | |
+//unsigned int drm_debug = 15; /* 1 to enable debug output */ | |
unsigned int drm_debug = 0; /* 1 to enable debug output */ |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c | |
index e1790af..a7737e0 100644 | |
--- a/drivers/gpu/drm/drm_stub.c | |
+++ b/drivers/gpu/drm/drm_stub.c | |
@@ -39,7 +39,8 @@ | |
#include <drm/drmP.h> | |
#include <drm/drm_core.h> | |
-unsigned int drm_debug = 0; /* 1 to enable debug output */ | |
+unsigned int drm_debug = 15; /* 1 to enable debug output */ |