Cleanup includes in drm/ per IWYU style

Change-Id: I613cb6656d887aab5221be3d3b2923f1f4ba9ab9

drm/DrmAtomicStateManager.cpp

@@ -29,10 +29,16 @@
 
 #include <cassert>
 
+#include "compositor/LayerData.h"
+#include "compositor/LayerToPlaneJoiningPlan.h"
+#include "drm/DrmConnector.h"
 #include "drm/DrmCrtc.h"
 #include "drm/DrmDevice.h"
+#include "drm/DrmDisplayPipeline.h"
+#include "drm/DrmFbImporter.h"
 #include "drm/DrmPlane.h"
 #include "drm/DrmUnique.h"
+#include "utils/fd.h"
 #include "utils/log.h"
 
 namespace android::drm_hwcomposer {

drm/DrmAtomicStateManager.h

@@ -22,16 +22,30 @@
 #include <memory>
 #include <optional>
 #include <queue>
+#include <thread>
+
+#include <android-base/thread_annotations.h>
 
-#include "compositor/DisplayInfo.h"
 #include "compositor/LayerData.h"
-#include "compositor/LayerToPlaneJoiningPlan.h"
-#include "drm/DrmPlane.h"
-#include "drm/ResourceManager.h"
-#include "drm/VSyncWorker.h"
+#include "drm/DrmMode.h"
+#include "utils/fd.h"
 
 namespace android::drm_hwcomposer {
 
+template <typename T>
+class BindingOwner;
+
+class DrmFbIdHandle;
+class DrmPlane;
+
+struct DrmDisplayPipeline;
+struct LayerToPlaneJoiningPlan;
+
+enum class Colorspace;
+enum class ContentProtection;
+enum class ContentType;
+enum class HdcpContentType;
+
 struct AtomicCommitArgs {
   /* inputs. All fields are optional, but at least one has to be specified */
   bool test_only = false;

drm/DrmConnector.cpp

@@ -27,8 +27,13 @@
 #include <cstdint>
 #include <sstream>
 
-#include "DrmDevice.h"
 #include "compositor/DisplayInfo.h"
+#include "drm/DrmDevice.h"
+#include "drm/DrmEncoder.h"
+#include "drm/DrmMode.h"
+#include "drm/DrmProperty.h"
+#include "drm/DrmUnique.h"
+#include "utils/log.h"
 
 #ifndef DRM_MODE_CONNECTOR_SPI
 // NOLINTNEXTLINE(cppcoreguidelines-macro-usage)

drm/DrmConnector.h

@@ -22,15 +22,18 @@
 #include <string>
 #include <vector>
 
-#include "DrmEncoder.h"
-#include "DrmMode.h"
-#include "DrmProperty.h"
-#include "DrmUnique.h"
-#include "compositor/DisplayInfo.h"
+#include "drm/DrmDisplayPipeline.h"
+#include "drm/DrmProperty.h"
+#include "drm/DrmUnique.h"
 
 namespace android::drm_hwcomposer {
 
 class DrmDevice;
+class DrmProperty;
+class DrmMode;
+
+enum class Colorspace;
+enum class PanelOrientation;
 
 class DrmConnector : public PipelineBindable<DrmConnector> {
   friend class FakeDrmConnector;

drm/DrmCrtc.cpp

@@ -18,12 +18,14 @@
 
 #include "DrmCrtc.h"
 
-#include <utils/log.h>
 #include <xf86drmMode.h>
 
 #include <cstdint>
 
-#include "DrmDevice.h"
+#include "drm/DrmDevice.h"
+#include "drm/DrmProperty.h"
+#include "drm/DrmUnique.h"
+#include "utils/log.h"
 
 namespace android::drm_hwcomposer {
 

drm/DrmCrtc.h

@@ -20,10 +20,9 @@
 
 #include <cstdint>
 
-#include "DrmDisplayPipeline.h"
-#include "DrmMode.h"
-#include "DrmProperty.h"
-#include "DrmUnique.h"
+#include "drm/DrmDisplayPipeline.h"
+#include "drm/DrmProperty.h"
+#include "drm/DrmUnique.h"
 
 namespace android::drm_hwcomposer {
 

drm/DrmDevice.cpp

@@ -27,12 +27,17 @@
 #include <cstdint>
 #include <string>
 
-#include "drm/DrmAtomicStateManager.h"
+#include "bufferinfo/BufferInfo.h"
 #include "drm/DrmConnector.h"
+#include "drm/DrmCrtc.h"
+#include "drm/DrmEncoder.h"
+#include "drm/DrmFbImporter.h"
 #include "drm/DrmPlane.h"
+#include "drm/DrmProperty.h"
+#include "drm/DrmUnique.h"
 #include "drm/ResourceManager.h"
+#include "utils/fd.h"
 #include "utils/log.h"
-#include "utils/properties.h"
 
 namespace android::drm_hwcomposer {
 

drm/DrmDevice.h

@@ -21,16 +21,18 @@
 #include <optional>
 #include <tuple>
 
-#include "DrmConnector.h"
-#include "DrmCrtc.h"
-#include "DrmEncoder.h"
-#include "bufferinfo/BufferInfo.h"
+#include "drm/DrmUnique.h"
 #include "utils/fd.h"
 
 namespace android::drm_hwcomposer {
 
+struct BufferInfo;
+class DrmConnector;
+class DrmCrtc;
+class DrmEncoder;
 class DrmFbImporter;
 class DrmPlane;
+class DrmProperty;
 class ResourceManager;
 
 class DrmDevice {

drm/DrmDisplayPipeline.cpp

@@ -18,13 +18,13 @@
 
 #include "DrmDisplayPipeline.h"
 
-#include "DrmAtomicStateManager.h"
-#include "DrmConnector.h"
-#include "DrmCrtc.h"
-#include "DrmDevice.h"
-#include "DrmEncoder.h"
-#include "DrmPlane.h"
 #include "compositor/CompositionPlanner.h"
+#include "drm/DrmAtomicStateManager.h"
+#include "drm/DrmConnector.h"
+#include "drm/DrmCrtc.h"
+#include "drm/DrmDevice.h"
+#include "drm/DrmEncoder.h"
+#include "drm/DrmPlane.h"
 #include "utils/log.h"
 #include "utils/properties.h"
 

drm/DrmDisplayPipeline.h

@@ -22,12 +22,12 @@
 namespace android::drm_hwcomposer {
 
 class CompositionPlanner;
-class DrmConnector;
-class DrmDevice;
-class DrmPlane;
-class DrmCrtc;
-class DrmEncoder;
 class DrmAtomicStateManager;
+class DrmConnector;
+class DrmCrtc;
+class DrmDevice;
+class DrmEncoder;
+class DrmPlane;
 
 struct DrmDisplayPipeline;
 

drm/DrmDisplayPipelineTest.cpp

@@ -20,12 +20,12 @@
 #include <gtest/gtest.h>
 #include <xf86drmMode.h>
 
-#include "DrmConnector.h"
-#include "DrmCrtc.h"
-#include "DrmDevice.h"
-#include "DrmDisplayPipeline.h"
-#include "DrmEncoder.h"
-#include "DrmPlane.h"
+#include "drm/DrmConnector.h"
+#include "drm/DrmCrtc.h"
+#include "drm/DrmDevice.h"
+#include "drm/DrmDisplayPipeline.h"
+#include "drm/DrmEncoder.h"
+#include "drm/DrmPlane.h"
 
 namespace android::drm_hwcomposer {
 

drm/DrmEncoder.cpp

@@ -22,7 +22,9 @@
 
 #include <cstdint>
 
-#include "DrmDevice.h"
+#include "drm/DrmCrtc.h"
+#include "drm/DrmDevice.h"
+#include "drm/DrmUnique.h"
 #include "utils/log.h"
 
 namespace android::drm_hwcomposer {

drm/DrmEncoder.h

@@ -22,11 +22,14 @@
 #include <set>
 #include <vector>
 
-#include "DrmCrtc.h"
-#include "DrmDisplayPipeline.h"
+#include "drm/DrmDisplayPipeline.h"
+#include "drm/DrmUnique.h"
 
 namespace android::drm_hwcomposer {
 
+class DrmCrtc;
+class DrmDevice;
+
 class DrmEncoder : public PipelineBindable<DrmEncoder> {
   friend class FakeDrmEncoder;
 

drm/DrmFbImporter.cpp

@@ -29,8 +29,9 @@
 #include <cinttypes>
 #include <system_error>
 
+#include "bufferinfo/BufferInfo.h"
+#include "drm/DrmDevice.h"
 #include "utils/log.h"
-#include "utils/properties.h"
 
 namespace android::drm_hwcomposer {
 

drm/DrmFbImporter.h

@@ -23,7 +23,6 @@
 #include <map>
 
 #include "bufferinfo/BufferInfo.h"
-#include "drm/DrmDevice.h"
 #include "utils/fd.h"
 
 #ifndef DRM_FORMAT_INVALID
@@ -34,6 +33,8 @@ using GemHandle = uint32_t;
 
 namespace android::drm_hwcomposer {
 
+class DrmDevice;
+
 class DrmFbIdHandle {
  public:
   static auto CreateInstance(BufferInfo *bo, GemHandle first_gem_handle,

drm/DrmHwc.cpp

@@ -24,6 +24,9 @@
 #include <sstream>
 #include <utility>
 
+#include "drm/DrmConnector.h"
+#include "drm/DrmDisplayPipeline.h"
+#include "hwc/HwcDisplay.h"
 #include "stats/CompositionStats.h"
 #include "utils/log.h"
 #include "utils/properties.h"

drm/DrmHwc.h

@@ -16,13 +16,14 @@
 
 #pragma once
 
-#include "drm/DrmDisplayPipeline.h"
 #include "drm/ResourceManager.h"
 #include "hwc/HwcDisplay.h"
 #include "stats/CompositionStats.h"
 
 namespace android::drm_hwcomposer {
 
+struct DrmDisplayPipeline;
+
 class DrmHwc : public PipelineToFrontendBindingInterface,
                public CompositionStatsProvider {
  public:

drm/DrmMode.cpp

@@ -18,7 +18,8 @@
 
 #include <cstring>
 
-#include "DrmDevice.h"
+#include "drm/DrmDevice.h"
+#include "drm/DrmUnique.h"
 
 namespace android::drm_hwcomposer {
 

drm/DrmMode.h

@@ -22,7 +22,7 @@
 #include <cstdio>
 #include <string>
 
-#include "DrmUnique.h"
+#include "drm/DrmUnique.h"
 
 namespace android::drm_hwcomposer {
 

drm/DrmPlane.cpp

@@ -23,9 +23,10 @@
 #include <cinttypes>
 #include <cstdint>
 
-#include "DrmDevice.h"
 #include "bufferinfo/BufferInfoGetter.h"
 #include "compositor/LayerData.h"
+#include "drm/DrmCrtc.h"
+#include "drm/DrmDevice.h"
 #include "drm/DrmFbImporter.h"
 #include "utils/log.h"
 

drm/DrmPlane.h

@@ -21,15 +21,22 @@
 #include <cstdint>
 #include <vector>
 
-#include "DrmCrtc.h"
-#include "DrmProperty.h"
-#include "compositor/LayerData.h"
+#include "drm/DrmDisplayPipeline.h"
+#include "drm/DrmProperty.h"
+#include "drm/DrmUnique.h"
 
 namespace android::drm_hwcomposer {
 
+class DrmCrtc;
 class DrmDevice;
+
+struct DstRectInfo;
 struct LayerData;
 
+enum class BufferBlendMode;
+enum class BufferColorSpace;
+enum class BufferSampleRange;
+
 // NOLINTNEXTLINE(readability-identifier-naming)
 struct drm_plane_size_hint_local {
   __u16 width;

drm/DrmProperty.cpp

@@ -26,7 +26,7 @@
 #include <cstdint>
 #include <string>
 
-#include "DrmDevice.h"
+#include "utils/fd.h"
 #include "utils/log.h"
 
 namespace android::drm_hwcomposer {

drm/ResourceManager.cpp

@@ -26,10 +26,10 @@
 
 #include "backend/BackendManager.h"
 #include "bufferinfo/BufferInfoGetter.h"
-#include "drm/DrmAtomicStateManager.h"
+#include "drm/DrmConnector.h"
 #include "drm/DrmDevice.h"
 #include "drm/DrmDisplayPipeline.h"
-#include "drm/DrmPlane.h"
+#include "drm/UEventListener.h"
 #include "utils/log.h"
 #include "utils/properties.h"
 

drm/ResourceManager.h

@@ -17,18 +17,18 @@
 #pragma once
 
 #include <cstring>
+#include <map>
 #include <mutex>
 #include <set>
 
-#include "DrmDevice.h"
-#include "DrmDisplayPipeline.h"
-#include "DrmFbImporter.h"
-#include "DrmProperty.h"
-#include "UEventListener.h"
-#include "utils/properties.h"
-
 namespace android::drm_hwcomposer {
 
+enum class CtmHandling;
+class DrmConnector;
+class DrmDevice;
+struct DrmDisplayPipeline;
+class UEventListener;
+
 class PipelineToFrontendBindingInterface {
  public:
   virtual ~PipelineToFrontendBindingInterface() = default;

drm/UEventListener.cpp

@@ -20,6 +20,7 @@
 
 #include <thread>
 
+#include "utils/UEvent.h"
 #include "utils/log.h"
 
 namespace android::drm_hwcomposer {

drm/UEventListener.h

@@ -20,10 +20,10 @@
 #include <mutex>
 #include <thread>
 
-#include "utils/UEvent.h"
-
 namespace android::drm_hwcomposer {
 
+class UEvent;
+
 class UEventListener {
  public:
   ~UEventListener();

drm/VSyncWorker.cpp

@@ -27,7 +27,11 @@
 #include <cstring>
 #include <ctime>
 
+#include "drm/DrmCrtc.h"
+#include "drm/DrmDevice.h"
+#include "drm/DrmDisplayPipeline.h"
 #include "drm/ResourceManager.h"
+#include "utils/fd.h"
 #include "utils/log.h"
 
 namespace android::drm_hwcomposer {

drm/VSyncWorker.h

@@ -24,10 +24,12 @@
 
 #include <android-base/thread_annotations.h>
 
-#include "DrmDevice.h"
+#include "utils/fd.h"
 
 namespace android::drm_hwcomposer {
 
+struct DrmDisplayPipeline;
+
 class VSyncWorker {
  public:
   using VsyncTimestampCallback = std::function<void(int64_t /*timestamp*/,