Preliminary atomic patch

ui/ozone/platform/drm/gpu/scoped_drm_types.h

Index: ui/ozone/platform/drm/gpu/scoped_drm_types.h
diff --git a/ui/ozone/platform/drm/gpu/scoped_drm_types.h b/ui/ozone/platform/drm/gpu/scoped_drm_types.h
index 31c581656d00fcbe30381cb198624b6c49b8e054..1a06f69e50bf4dd77598618e20e25d7640064cb1 100644
--- a/ui/ozone/platform/drm/gpu/scoped_drm_types.h
+++ b/ui/ozone/platform/drm/gpu/scoped_drm_types.h
@@ -16,6 +16,7 @@ typedef struct _drmModeObjectProperties drmModeObjectProperties;
 typedef struct _drmModePlane drmModePlane;
 typedef struct _drmModePlaneRes drmModePlaneRes;
 typedef struct _drmModeProperty drmModePropertyRes;
+typedef struct _drmModePropertySet drmModePropertySet;

[dnicoara, 2015/03/09 20:10:41]

struct _drmModePropertySet is never defined if we're not compiling with atomic
APIs. I think you'll need to wrap this in an #if def(OZONE_USE_ATOMIC).

[achaulk, 2015/03/09 20:23:49]

That's actually fine, the "struct foo" part also declares the struct

[dnicoara, 2015/03/09 20:42:58]

Acknowledged.

 typedef struct _drmModePropertyBlob drmModePropertyBlobRes;
 typedef struct _drmModeRes drmModeRes;
 
@@ -45,6 +46,11 @@ struct OZONE_EXPORT DrmPlaneResDeleter {
 struct OZONE_EXPORT DrmPropertyDeleter {
   void operator()(drmModePropertyRes* property) const;
 };
+#if defined(OZONE_USE_ATOMIC)
+struct OZONE_EXPORT DrmPropertySetDeleter {
+  void operator()(drmModePropertySet* property) const;
+};
+#endif  // defined(OZONE_USE_ATOMIC)
 struct OZONE_EXPORT DrmPropertyBlobDeleter {
   void operator()(drmModePropertyBlobRes* property) const;
 };
@@ -61,6 +67,10 @@ typedef scoped_ptr<drmModeObjectProperties, DrmObjectPropertiesDeleter>
 typedef scoped_ptr<drmModePlane, DrmPlaneDeleter> ScopedDrmPlanePtr;
 typedef scoped_ptr<drmModePlaneRes, DrmPlaneResDeleter> ScopedDrmPlaneResPtr;
 typedef scoped_ptr<drmModePropertyRes, DrmPropertyDeleter> ScopedDrmPropertyPtr;
+#if defined(OZONE_USE_ATOMIC)
+typedef scoped_ptr<drmModePropertySet, DrmPropertySetDeleter>
+    ScopedDrmPropertySetPtr;
+#endif  // defined(OZONE_USE_ATOMIC)
 typedef scoped_ptr<drmModePropertyBlobRes, DrmPropertyBlobDeleter>
     ScopedDrmPropertyBlobPtr;
 typedef scoped_ptr<drmModeFB, DrmFramebufferDeleter> ScopedDrmFramebufferPtr;