commit 0f5abd797b74aa27a80ddf84218a6457a203dcb8
author Alexandru Gheorghe <alexandru-cosmin.gheorghe@arm.com> Tue May 01 14:37:10 2018 +0100
committer Alexandru Gheorghe <alexandru-cosmin.gheorghe@arm.com> Fri Jul 13 15:36:23 2018 +0100
tree 4ef6bd84e555ac33aa9545097dd77ea5b4a939af
parent 81a295ccf4f822acc4edece9df87c551f8d5927e

drm_hwcomposer: Rename DrmResources to DrmDevice

DrmDevice is a better name to reflect the fact that DrmResources/
DrmDevice can handle just one dri node.

Suggested here [1] by Sean Paul.
[1] https://lists.freedesktop.org/archives/dri-devel/2018-April/173290.html

Signed-off-by: Alexandru Gheorghe <alexandru-cosmin.gheorghe@arm.com>

drmhwctwo.h

diff --git a/drmhwctwo.h b/drmhwctwo.h
index 82a9768..33c688c 100644
--- a/drmhwctwo.h
+++ b/drmhwctwo.h
@@ -16,7 +16,7 @@
 
 #include "drmdisplaycompositor.h"
 #include "drmhwcomposer.h"
-#include "drmresources.h"
+#include "drmdevice.h"
 #include "platform.h"
 #include "vsyncworker.h"
 
@@ -135,7 +135,7 @@
 
   class HwcDisplay {
    public:
-    HwcDisplay(DrmResources *drm, std::shared_ptr<Importer> importer,
+    HwcDisplay(DrmDevice *drm, std::shared_ptr<Importer> importer,
                hwc2_display_t handle, HWC2::DisplayType type);
     HwcDisplay(const HwcDisplay &) = delete;
     HWC2::Error Init(std::vector<DrmPlane *> *planes);
@@ -188,7 +188,7 @@
     HWC2::Error CreateComposition(bool test);
     void AddFenceToRetireFence(int fd);
 
-    DrmResources *drm_;
+    DrmDevice *drm_;
     DrmDisplayCompositor compositor_;
     std::shared_ptr<Importer> importer_;
     std::unique_ptr<Planner> planner_;
@@ -261,7 +261,7 @@
   HWC2::Error RegisterCallback(int32_t descriptor, hwc2_callback_data_t data,
                                hwc2_function_pointer_t function);
 
-  DrmResources drm_;
+  DrmDevice drm_;
   std::shared_ptr<Importer> importer_;  // Shared with HwcDisplay
   std::map<hwc2_display_t, HwcDisplay> displays_;
   std::map<HWC2::Callback, HwcCallback> callbacks_;