display userspace: gki uapi migration support
This change updates the makefile to include the header file location changes
on the kernel side; updates the appropriate color format names; includes sde
header files. This will also remove unsupported V4L2 formats.
Change-Id: If781edb1fd25b9e2c5131136a6a6d068682469ad
diff --git a/gralloc/gr_adreno_info.h b/gralloc/gr_adreno_info.h
index 834546b..3182a56 100644
--- a/gralloc/gr_adreno_info.h
+++ b/gralloc/gr_adreno_info.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2020, The Linux Foundation. All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -31,7 +31,7 @@
#define __GR_ADRENO_INFO_H__
#ifndef QMAA
-#include <media/msm_media_info.h>
+#include <display/media/mmm_color_fmt.h>
#endif
typedef enum {
diff --git a/gralloc/gr_utils.cpp b/gralloc/gr_utils.cpp
index 0caafb8..41ee956 100644
--- a/gralloc/gr_utils.cpp
+++ b/gralloc/gr_utils.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2020, The Linux Foundation. All rights reserved.
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -28,7 +28,7 @@
*/
#ifndef QMAA
-#include <media/msm_media_info.h>
+#include <display/media/mmm_color_fmt.h>
#endif
#include <algorithm>
@@ -349,7 +349,7 @@
break;
#ifndef QMAA
case HAL_PIXEL_FORMAT_YCbCr_420_P010_VENUS:
- size = VENUS_BUFFER_SIZE(COLOR_FMT_P010,
+ size = MMM_COLOR_FMT_BUFFER_SIZE(MMM_COLOR_FMT_P010,
width,
height);
break;
@@ -366,11 +366,11 @@
break;
case HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS:
case HAL_PIXEL_FORMAT_NV12_ENCODEABLE:
- size = VENUS_BUFFER_SIZE(COLOR_FMT_NV12, width, height);
+ size = MMM_COLOR_FMT_BUFFER_SIZE(MMM_COLOR_FMT_NV12, width, height);
break;
case HAL_PIXEL_FORMAT_YCrCb_420_SP_VENUS:
case HAL_PIXEL_FORMAT_NV21_ENCODEABLE:
- size = VENUS_BUFFER_SIZE(COLOR_FMT_NV21, width, height);
+ size = MMM_COLOR_FMT_BUFFER_SIZE(MMM_COLOR_FMT_NV21, width, height);
break;
case HAL_PIXEL_FORMAT_BLOB:
if (height != 1) {
@@ -380,7 +380,7 @@
size = (unsigned int) width;
break;
case HAL_PIXEL_FORMAT_NV12_HEIF:
- size = VENUS_BUFFER_SIZE(COLOR_FMT_NV12_512, width, height);
+ size = MMM_COLOR_FMT_BUFFER_SIZE(MMM_COLOR_FMT_NV12_512, width, height);
break;
#endif
default:ALOGE("%s: Unrecognized pixel format: 0x%x", __FUNCTION__, format);
@@ -422,20 +422,20 @@
uint64_t yOffset = 0, cOffset = 0, yMetaOffset = 0, cMetaOffset = 0;
#ifndef QMAA
- y_meta_stride = VENUS_Y_META_STRIDE(color_format, INT(width));
- y_meta_height = VENUS_Y_META_SCANLINES(color_format, INT(height));
+ y_meta_stride = MMM_COLOR_FMT_Y_META_STRIDE(color_format, INT(width));
+ y_meta_height = MMM_COLOR_FMT_Y_META_SCANLINES(color_format, INT(height));
y_meta_size = ALIGN((y_meta_stride * y_meta_height), alignment);
- y_stride = VENUS_Y_STRIDE(color_format, INT(width));
- y_height = VENUS_Y_SCANLINES(color_format, INT(height));
+ y_stride = MMM_COLOR_FMT_Y_STRIDE(color_format, INT(width));
+ y_height = MMM_COLOR_FMT_Y_SCANLINES(color_format, INT(height));
y_size = ALIGN((y_stride * y_height), alignment);
- c_meta_stride = VENUS_UV_META_STRIDE(color_format, INT(width));
- c_meta_height = VENUS_UV_META_SCANLINES(color_format, INT(height));
+ c_meta_stride = MMM_COLOR_FMT_UV_META_STRIDE(color_format, INT(width));
+ c_meta_height = MMM_COLOR_FMT_UV_META_SCANLINES(color_format, INT(height));
c_meta_size = ALIGN((c_meta_stride * c_meta_height), alignment);
- c_stride = VENUS_UV_STRIDE(color_format, INT(width));
- c_height = VENUS_UV_SCANLINES(color_format, INT(height));
+ c_stride = MMM_COLOR_FMT_UV_STRIDE(color_format, INT(width));
+ c_height = MMM_COLOR_FMT_UV_SCANLINES(color_format, INT(height));
c_size = ALIGN((c_stride * c_height), alignment);
#endif
yMetaOffset = 0;
@@ -486,9 +486,9 @@
height = (height + 1) >> 1;
#ifndef QMAA
- GetYuvUbwcSPPlaneInfo(width, height, COLOR_FMT_NV12_UBWC, &plane_info[0]);
+ GetYuvUbwcSPPlaneInfo(width, height, MMM_COLOR_FMT_NV12_UBWC, &plane_info[0]);
- GetYuvUbwcSPPlaneInfo(width, height, COLOR_FMT_NV12_UBWC, &plane_info[4]);
+ GetYuvUbwcSPPlaneInfo(width, height, MMM_COLOR_FMT_NV12_UBWC, &plane_info[4]);
#endif
}
@@ -524,11 +524,11 @@
#ifndef QMAA
case HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS:
case HAL_PIXEL_FORMAT_NV12_ENCODEABLE:
- c_height = VENUS_UV_SCANLINES(COLOR_FMT_NV12, height);
+ c_height = MMM_COLOR_FMT_UV_SCANLINES(MMM_COLOR_FMT_NV12, height);
c_size = c_stride * c_height;
break;
case HAL_PIXEL_FORMAT_NV12_HEIF:
- c_height = VENUS_UV_SCANLINES(COLOR_FMT_NV12_512, height);
+ c_height = MMM_COLOR_FMT_UV_SCANLINES(MMM_COLOR_FMT_NV12_512, height);
c_size = c_stride * c_height;
break;
case HAL_PIXEL_FORMAT_YCrCb_420_SP_ADRENO:
@@ -536,7 +536,7 @@
c_size = ALIGN(2 * ALIGN(unaligned_width / 2, 32) * ALIGN(unaligned_height / 2, 32), 4096);
break;
case HAL_PIXEL_FORMAT_YCrCb_420_SP_VENUS:
- c_height = VENUS_UV_SCANLINES(COLOR_FMT_NV21, height);
+ c_height = MMM_COLOR_FMT_UV_SCANLINES(MMM_COLOR_FMT_NV21, height);
c_size = c_stride * c_height;
break;
#endif
@@ -632,8 +632,8 @@
uint64_t field_base;
height = (height + 1) >> 1;
#ifndef QMAA
- uv_stride = VENUS_UV_STRIDE(COLOR_FMT_NV12_UBWC, INT(width));
- uv_height = VENUS_UV_SCANLINES(COLOR_FMT_NV12_UBWC, INT(height));
+ uv_stride = MMM_COLOR_FMT_UV_STRIDE(MMM_COLOR_FMT_NV12_UBWC, INT(width));
+ uv_height = MMM_COLOR_FMT_UV_SCANLINES(MMM_COLOR_FMT_NV12_UBWC, INT(height));
#endif
uv_size = ALIGN((uv_stride * uv_height), alignment);
field_base = hnd->base + plane_info[1].offset + uv_size;
@@ -750,18 +750,18 @@
case HAL_PIXEL_FORMAT_NV12_ENCODEABLE:
case HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS:
case HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS_UBWC:
- *aligned_w = VENUS_Y_STRIDE(COLOR_FMT_NV12_UBWC, width);
- *aligned_h = VENUS_Y_SCANLINES(COLOR_FMT_NV12_UBWC, height);
+ *aligned_w = MMM_COLOR_FMT_Y_STRIDE(MMM_COLOR_FMT_NV12_UBWC, width);
+ *aligned_h = MMM_COLOR_FMT_Y_SCANLINES(MMM_COLOR_FMT_NV12_UBWC, height);
break;
case HAL_PIXEL_FORMAT_YCbCr_420_TP10_UBWC:
// The macro returns the stride which is 4/3 times the width, hence * 3/4
- *aligned_w = (VENUS_Y_STRIDE(COLOR_FMT_NV12_BPP10_UBWC, width) * 3) / 4;
- *aligned_h = VENUS_Y_SCANLINES(COLOR_FMT_NV12_BPP10_UBWC, height);
+ *aligned_w = (MMM_COLOR_FMT_Y_STRIDE(MMM_COLOR_FMT_NV12_BPP10_UBWC, width) * 3) / 4;
+ *aligned_h = MMM_COLOR_FMT_Y_SCANLINES(MMM_COLOR_FMT_NV12_BPP10_UBWC, height);
break;
case HAL_PIXEL_FORMAT_YCbCr_420_P010_UBWC:
// The macro returns the stride which is 2 times the width, hence / 2
- *aligned_w = (VENUS_Y_STRIDE(COLOR_FMT_P010_UBWC, width) / 2);
- *aligned_h = VENUS_Y_SCANLINES(COLOR_FMT_P010_UBWC, height);
+ *aligned_w = (MMM_COLOR_FMT_Y_STRIDE(MMM_COLOR_FMT_P010_UBWC, width) / 2);
+ *aligned_h = MMM_COLOR_FMT_Y_SCANLINES(MMM_COLOR_FMT_P010_UBWC, height);
break;
#endif
default:
@@ -838,13 +838,13 @@
case HAL_PIXEL_FORMAT_NV12_ENCODEABLE:
case HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS:
case HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS_UBWC:
- size = VENUS_BUFFER_SIZE(COLOR_FMT_NV12_UBWC, width, height);
+ size = MMM_COLOR_FMT_BUFFER_SIZE(MMM_COLOR_FMT_NV12_UBWC, width, height);
break;
case HAL_PIXEL_FORMAT_YCbCr_420_TP10_UBWC:
- size = VENUS_BUFFER_SIZE(COLOR_FMT_NV12_BPP10_UBWC, width, height);
+ size = MMM_COLOR_FMT_BUFFER_SIZE(MMM_COLOR_FMT_NV12_BPP10_UBWC, width, height);
break;
case HAL_PIXEL_FORMAT_YCbCr_420_P010_UBWC:
- size = VENUS_BUFFER_SIZE(COLOR_FMT_P010_UBWC, width, height);
+ size = MMM_COLOR_FMT_BUFFER_SIZE(MMM_COLOR_FMT_P010_UBWC, width, height);
break;
#endif
default:
@@ -1052,23 +1052,23 @@
break;
#ifndef QMAA
case HAL_PIXEL_FORMAT_YCbCr_420_P010_VENUS:
- aligned_w = INT(VENUS_Y_STRIDE(COLOR_FMT_P010, width) / 2);
- aligned_h = INT(VENUS_Y_SCANLINES(COLOR_FMT_P010, height));
+ aligned_w = INT(MMM_COLOR_FMT_Y_STRIDE(MMM_COLOR_FMT_P010, width) / 2);
+ aligned_h = INT(MMM_COLOR_FMT_Y_SCANLINES(MMM_COLOR_FMT_P010, height));
break;
case HAL_PIXEL_FORMAT_YCbCr_420_SP_VENUS:
case HAL_PIXEL_FORMAT_NV12_ENCODEABLE:
- aligned_w = INT(VENUS_Y_STRIDE(COLOR_FMT_NV12, width));
- aligned_h = INT(VENUS_Y_SCANLINES(COLOR_FMT_NV12, height));
+ aligned_w = INT(MMM_COLOR_FMT_Y_STRIDE(MMM_COLOR_FMT_NV12, width));
+ aligned_h = INT(MMM_COLOR_FMT_Y_SCANLINES(MMM_COLOR_FMT_NV12, height));
break;
case HAL_PIXEL_FORMAT_YCrCb_420_SP_VENUS:
- aligned_w = INT(VENUS_Y_STRIDE(COLOR_FMT_NV21, width));
- aligned_h = INT(VENUS_Y_SCANLINES(COLOR_FMT_NV21, height));
+ aligned_w = INT(MMM_COLOR_FMT_Y_STRIDE(MMM_COLOR_FMT_NV21, width));
+ aligned_h = INT(MMM_COLOR_FMT_Y_SCANLINES(MMM_COLOR_FMT_NV21, height));
break;
case HAL_PIXEL_FORMAT_BLOB:
break;
case HAL_PIXEL_FORMAT_NV12_HEIF:
- aligned_w = INT(VENUS_Y_STRIDE(COLOR_FMT_NV12_512, width));
- aligned_h = INT(VENUS_Y_SCANLINES(COLOR_FMT_NV12_512, height));
+ aligned_w = INT(MMM_COLOR_FMT_Y_STRIDE(MMM_COLOR_FMT_NV12_512, width));
+ aligned_h = INT(MMM_COLOR_FMT_Y_SCANLINES(MMM_COLOR_FMT_NV12_512, height));
break;
#endif
default:
@@ -1419,7 +1419,7 @@
plane_info[6].step = plane_info[7].step = 0;
} else {
*plane_count = 4;
- GetYuvUbwcSPPlaneInfo(width, height, COLOR_FMT_NV12_UBWC, plane_info);
+ GetYuvUbwcSPPlaneInfo(width, height, MMM_COLOR_FMT_NV12_UBWC, plane_info);
plane_info[0].h_subsampling = 0;
plane_info[0].v_subsampling = 0;
plane_info[0].step = 1;
@@ -1444,7 +1444,7 @@
case HAL_PIXEL_FORMAT_YCbCr_420_TP10_UBWC:
*plane_count = 4;
- GetYuvUbwcSPPlaneInfo(width, height, COLOR_FMT_NV12_BPP10_UBWC, plane_info);
+ GetYuvUbwcSPPlaneInfo(width, height, MMM_COLOR_FMT_NV12_BPP10_UBWC, plane_info);
GetYuvSubSamplingFactor(format, &h_subsampling, &v_subsampling);
plane_info[0].h_subsampling = 0;
plane_info[0].v_subsampling = 0;
@@ -1459,7 +1459,7 @@
case HAL_PIXEL_FORMAT_YCbCr_420_P010_UBWC:
*plane_count = 4;
- GetYuvUbwcSPPlaneInfo(width, height, COLOR_FMT_P010_UBWC, plane_info);
+ GetYuvUbwcSPPlaneInfo(width, height, MMM_COLOR_FMT_P010_UBWC, plane_info);
GetYuvSubSamplingFactor(format, &h_subsampling, &v_subsampling);
plane_info[0].h_subsampling = 0;
plane_info[0].v_subsampling = 0;
@@ -1474,13 +1474,13 @@
case HAL_PIXEL_FORMAT_YCbCr_420_P010_VENUS:
*plane_count = 2;
- y_stride = VENUS_Y_STRIDE(COLOR_FMT_P010, width);
- c_stride = VENUS_UV_STRIDE(COLOR_FMT_P010, width);
- y_height = VENUS_Y_SCANLINES(COLOR_FMT_P010, height);
+ y_stride = MMM_COLOR_FMT_Y_STRIDE(MMM_COLOR_FMT_P010, width);
+ c_stride = MMM_COLOR_FMT_UV_STRIDE(MMM_COLOR_FMT_P010, width);
+ y_height = MMM_COLOR_FMT_Y_SCANLINES(MMM_COLOR_FMT_P010, height);
y_size = y_stride * y_height;
yOffset = 0;
cOffset = y_size;
- c_height = VENUS_UV_SCANLINES(COLOR_FMT_P010, INT(height));
+ c_height = MMM_COLOR_FMT_UV_SCANLINES(MMM_COLOR_FMT_P010, INT(height));
c_size = c_stride * c_height;
GetYuvSubSamplingFactor(format, &h_subsampling, &v_subsampling);
diff --git a/libdrmutils/drm_interface.h b/libdrmutils/drm_interface.h
index 23c44fe..09fa548 100644
--- a/libdrmutils/drm_interface.h
+++ b/libdrmutils/drm_interface.h
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
+* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -39,7 +39,8 @@
#include "xf86drm.h"
#include "xf86drmMode.h"
#include <drm/msm_drm.h>
-#include <drm/msm_drm_pp.h>
+#include <display/drm/msm_drm_pp.h>
+#include <display/drm/sde_drm.h>
namespace sde_drm {
diff --git a/libhistogram/histogram_collector.cpp b/libhistogram/histogram_collector.cpp
index f7da3b4..d9cf339 100644
--- a/libhistogram/histogram_collector.cpp
+++ b/libhistogram/histogram_collector.cpp
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2018 The Android Open Source Project
+ * Copyright (c) 2020 The Linux Foundation. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,8 +33,7 @@
#include <unordered_map>
#include <vector>
-#include <drm/msm_drm.h>
-#include <drm/msm_drm_pp.h>
+#include <display/drm/msm_drm_pp.h>
#include <xf86drm.h>
#include <xf86drmMode.h>
diff --git a/libhistogram/ringbuffer.h b/libhistogram/ringbuffer.h
index 8a4fb72..b9d81a1 100644
--- a/libhistogram/ringbuffer.h
+++ b/libhistogram/ringbuffer.h
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2018 The Android Open Source Project
+ * Copyright (c) 2020 The Linux Foundation. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,8 +16,7 @@
*/
#pragma once
-#include <drm/msm_drm.h>
-#include <drm/msm_drm_pp.h>
+#include <display/drm/msm_drm_pp.h>
#include <sys/types.h>
#include <unistd.h>
#include <utils/Timers.h>
diff --git a/sde-drm/drm_connector.cpp b/sde-drm/drm_connector.cpp
index aeb9d7c..200dd58 100644
--- a/sde-drm/drm_connector.cpp
+++ b/sde-drm/drm_connector.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2019, The Linux Foundation. All rights reserved.
+* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -30,7 +30,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <drm.h>
-#include <drm/sde_drm.h>
+#include <display/drm/sde_drm.h>
#include <drm/msm_drm.h>
#include <drm_logger.h>
#include <errno.h>
diff --git a/sde-drm/drm_crtc.cpp b/sde-drm/drm_crtc.cpp
index 5056aff..1760337 100644
--- a/sde-drm/drm_crtc.cpp
+++ b/sde-drm/drm_crtc.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2019, The Linux Foundation. All rights reserved.
+* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -30,7 +30,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <drm.h>
-#include <drm/sde_drm.h>
+#include <display/drm/sde_drm.h>
#include <drm_logger.h>
#include <drm/drm_fourcc.h>
#include <string.h>
diff --git a/sde-drm/drm_encoder.cpp b/sde-drm/drm_encoder.cpp
index 01b341b..ed2d8bf 100644
--- a/sde-drm/drm_encoder.cpp
+++ b/sde-drm/drm_encoder.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2019, The Linux Foundation. All rights reserved.
+* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -30,7 +30,7 @@
#include <stdint.h>
#include <stdlib.h>
#include <drm.h>
-#include <drm/sde_drm.h>
+#include <display/drm/sde_drm.h>
#include <drm_logger.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/sde-drm/drm_plane.cpp b/sde-drm/drm_plane.cpp
index 459ba67..4075ad6 100644
--- a/sde-drm/drm_plane.cpp
+++ b/sde-drm/drm_plane.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2019, The Linux Foundation. All rights reserved.
+* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -35,7 +35,7 @@
// version drm/drm.h
#include <drm_logger.h>
#include <drm/drm_fourcc.h>
-#include <drm/sde_drm.h>
+#include <display/drm/sde_drm.h>
#include <cstring>
#include <map>
diff --git a/sde-drm/drm_plane.h b/sde-drm/drm_plane.h
index 25b25da..b3bd9df 100644
--- a/sde-drm/drm_plane.h
+++ b/sde-drm/drm_plane.h
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2019, The Linux Foundation. All rights reserved.
+* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -30,7 +30,7 @@
#ifndef __DRM_PLANE_H__
#define __DRM_PLANE_H__
-#include <drm/sde_drm.h>
+#include <display/drm/sde_drm.h>
#include <drm_interface.h>
#include <xf86drm.h>
#include <xf86drmMode.h>
diff --git a/sde-drm/drm_pp_manager.cpp b/sde-drm/drm_pp_manager.cpp
index a4a2411..59df48b 100644
--- a/sde-drm/drm_pp_manager.cpp
+++ b/sde-drm/drm_pp_manager.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2019, The Linux Foundation. All rights reserved.
+* Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -30,7 +30,7 @@
#ifdef PP_DRM_ENABLE
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include <drm/msm_drm_pp.h>
+#include <display/drm/msm_drm_pp.h>
#endif
#include <drm_logger.h>
#include <cstring>
diff --git a/sdm/libs/core/drm/hw_color_manager_drm.cpp b/sdm/libs/core/drm/hw_color_manager_drm.cpp
index af9e145..9a2ec67 100644
--- a/sdm/libs/core/drm/hw_color_manager_drm.cpp
+++ b/sdm/libs/core/drm/hw_color_manager_drm.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
+* Copyright (c) 2017-2018, 2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -35,7 +35,7 @@
#include <vector>
#ifdef PP_DRM_ENABLE
-#include <drm/msm_drm_pp.h>
+#include <display/drm/msm_drm_pp.h>
#endif
#include <utils/debug.h>
#include "hw_color_manager_drm.h"
diff --git a/sdm/libs/core/drm/hw_device_drm.cpp b/sdm/libs/core/drm/hw_device_drm.cpp
index 7dd8f7b..b90008f 100644
--- a/sdm/libs/core/drm/hw_device_drm.cpp
+++ b/sdm/libs/core/drm/hw_device_drm.cpp
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
+* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -49,7 +49,7 @@
#include <utils/debug.h>
#include <utils/formats.h>
#include <utils/sys.h>
-#include <drm/sde_drm.h>
+#include <display/drm/sde_drm.h>
#include <private/color_params.h>
#include <utils/rect.h>
#include <utils/utils.h>
diff --git a/sdm/libs/core/drm/hw_info_drm.cpp b/sdm/libs/core/drm/hw_info_drm.cpp
index 6cacda3..9e872dc 100644
--- a/sdm/libs/core/drm/hw_info_drm.cpp
+++ b/sdm/libs/core/drm/hw_info_drm.cpp
@@ -33,7 +33,7 @@
#include <drm_master.h>
#include <drm_res_mgr.h>
#include <fcntl.h>
-#include <media/msm_sde_rotator.h>
+#include <display/media/msm_sde_rotator.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -556,46 +556,18 @@
void HWInfoDRM::GetSDMFormat(uint32_t v4l2_format, LayerBufferFormat *sdm_format) {
switch (v4l2_format) {
case SDE_PIX_FMT_ARGB_8888: *sdm_format = kFormatARGB8888; break;
- case SDE_PIX_FMT_RGBA_8888: *sdm_format = kFormatRGBA8888; break;
case SDE_PIX_FMT_BGRA_8888: *sdm_format = kFormatBGRA8888; break;
- case SDE_PIX_FMT_RGBX_8888: *sdm_format = kFormatRGBX8888; break;
case SDE_PIX_FMT_BGRX_8888: *sdm_format = kFormatBGRX8888; break;
- case SDE_PIX_FMT_RGBA_5551: *sdm_format = kFormatRGBA5551; break;
- case SDE_PIX_FMT_RGBA_4444: *sdm_format = kFormatRGBA4444; break;
case SDE_PIX_FMT_RGB_888: *sdm_format = kFormatRGB888; break;
case SDE_PIX_FMT_BGR_888: *sdm_format = kFormatBGR888; break;
case SDE_PIX_FMT_RGB_565: *sdm_format = kFormatRGB565; break;
- case SDE_PIX_FMT_BGR_565: *sdm_format = kFormatBGR565; break;
case SDE_PIX_FMT_Y_CB_CR_H2V2: *sdm_format = kFormatYCbCr420Planar; break;
case SDE_PIX_FMT_Y_CR_CB_H2V2: *sdm_format = kFormatYCrCb420Planar; break;
- case SDE_PIX_FMT_Y_CR_CB_GH2V2: *sdm_format = kFormatYCrCb420PlanarStride16; break;
case SDE_PIX_FMT_Y_CBCR_H2V2: *sdm_format = kFormatYCbCr420SemiPlanar; break;
case SDE_PIX_FMT_Y_CRCB_H2V2: *sdm_format = kFormatYCrCb420SemiPlanar; break;
- case SDE_PIX_FMT_Y_CBCR_H1V2: *sdm_format = kFormatYCbCr422H1V2SemiPlanar; break;
- case SDE_PIX_FMT_Y_CRCB_H1V2: *sdm_format = kFormatYCrCb422H1V2SemiPlanar; break;
case SDE_PIX_FMT_Y_CBCR_H2V1: *sdm_format = kFormatYCbCr422H2V1SemiPlanar; break;
case SDE_PIX_FMT_Y_CRCB_H2V1: *sdm_format = kFormatYCrCb422H2V1SemiPlanar; break;
case SDE_PIX_FMT_YCBYCR_H2V1: *sdm_format = kFormatYCbCr422H2V1Packed; break;
- case SDE_PIX_FMT_Y_CBCR_H2V2_VENUS: *sdm_format = kFormatYCbCr420SemiPlanarVenus; break;
- case SDE_PIX_FMT_Y_CRCB_H2V2_VENUS: *sdm_format = kFormatYCrCb420SemiPlanarVenus; break;
- case SDE_PIX_FMT_RGBA_8888_UBWC: *sdm_format = kFormatRGBA8888Ubwc; break;
- case SDE_PIX_FMT_RGBX_8888_UBWC: *sdm_format = kFormatRGBX8888Ubwc; break;
- case SDE_PIX_FMT_RGB_565_UBWC: *sdm_format = kFormatBGR565Ubwc; break;
- case SDE_PIX_FMT_Y_CBCR_H2V2_UBWC: *sdm_format = kFormatYCbCr420SPVenusUbwc; break;
- case SDE_PIX_FMT_RGBA_1010102: *sdm_format = kFormatRGBA1010102; break;
- case SDE_PIX_FMT_ARGB_2101010: *sdm_format = kFormatARGB2101010; break;
- case SDE_PIX_FMT_RGBX_1010102: *sdm_format = kFormatRGBX1010102; break;
- case SDE_PIX_FMT_XRGB_2101010: *sdm_format = kFormatXRGB2101010; break;
- case SDE_PIX_FMT_BGRA_1010102: *sdm_format = kFormatBGRA1010102; break;
- case SDE_PIX_FMT_ABGR_2101010: *sdm_format = kFormatABGR2101010; break;
- case SDE_PIX_FMT_BGRX_1010102: *sdm_format = kFormatBGRX1010102; break;
- case SDE_PIX_FMT_XBGR_2101010: *sdm_format = kFormatXBGR2101010; break;
- case SDE_PIX_FMT_RGBA_1010102_UBWC: *sdm_format = kFormatRGBA1010102Ubwc; break;
- case SDE_PIX_FMT_RGBX_1010102_UBWC: *sdm_format = kFormatRGBX1010102Ubwc; break;
- case SDE_PIX_FMT_Y_CBCR_H2V2_P010: *sdm_format = kFormatYCbCr420P010; break;
- case SDE_PIX_FMT_Y_CBCR_H2V2_TP10_UBWC: *sdm_format = kFormatYCbCr420TP10Ubwc; break;
- case SDE_PIX_FMT_Y_CBCR_H2V2_P010_UBWC: *sdm_format = kFormatYCbCr420P010Ubwc; break;
- case SDE_PIX_FMT_Y_CBCR_H2V2_P010_VENUS: *sdm_format = kFormatYCbCr420P010Venus; break;
default: *sdm_format = kFormatInvalid;
}
}
diff --git a/sdm/libs/core/drm/hw_scale_drm.h b/sdm/libs/core/drm/hw_scale_drm.h
index 6f96eca..1b7e935 100644
--- a/sdm/libs/core/drm/hw_scale_drm.h
+++ b/sdm/libs/core/drm/hw_scale_drm.h
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
+* Copyright (c) 2016-2017, 2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -36,7 +36,7 @@
// The 3 headers above are a workaround to prevent kernel drm.h from being used that has the
// "virtual" keyword used for a variable. In future replace libdrm version drm.h with kernel
// version drm/drm.h
-#include <drm/sde_drm.h>
+#include <display/drm/sde_drm.h>
#include <private/hw_info_types.h>
namespace sdm {
diff --git a/sdm/libs/core/drm/hw_virtual_drm.h b/sdm/libs/core/drm/hw_virtual_drm.h
index 7912d88..d8a359b 100644
--- a/sdm/libs/core/drm/hw_virtual_drm.h
+++ b/sdm/libs/core/drm/hw_virtual_drm.h
@@ -1,5 +1,5 @@
/*
-Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
+Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
@@ -32,7 +32,7 @@
#include "hw_device_drm.h"
#include <drm/msm_drm.h>
-#include <drm/sde_drm.h>
+#include <display/drm/sde_drm.h>
#include <vector>
namespace sdm {
diff --git a/sdm/libs/core/fb/hw_info.h b/sdm/libs/core/fb/hw_info.h
index 9838f81..edbf803 100644
--- a/sdm/libs/core/fb/hw_info.h
+++ b/sdm/libs/core/fb/hw_info.h
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2015 - 2018, The Linux Foundation. All rights reserved.
+* Copyright (c) 2015 - 2018, 2020, The Linux Foundation. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are permitted
* provided that the following conditions are met:
@@ -28,7 +28,6 @@
#include <core/sdm_types.h>
#include <core/core_interface.h>
#include <private/hw_info_types.h>
-#include <linux/msm_mdp.h>
#include <bitset>
#include "hw_info_interface.h"