diff options
| author | Chirag Khurana <ckhurana@codeaurora.org> | 2021-08-19 00:29:24 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2021-08-20 00:34:15 -0700 |
| commit | 7902fd455547cde800a5a0ee87484474abd25cc4 (patch) | |
| tree | b0a53882c744533b32444d0c9f42b00e03266f01 | |
| parent | 9cc7717c320771b5997d17c04817568a4b100807 (diff) | |
libdrmutils: include sde_drm.h to enable RMFB2 ioctl
DRM_IOCTL_MSM_RMFB2 ioctl is defined in sde-drm.h
for kernel 5.4. Without its presence upstream
DRM_IOCTL_MODE_RMFB ioctl is used which leads to
commit failures during layer set's geometry change.
DRM_IOCTL_MODE_RMFB ioctl results in resetting
of crtc value for planes. They don't get same crtc
value reassigned on next commit from userspace
since it assumes it to be already set in kernel.
Change-Id: I8c036749aaa8b285b565b41359868edecf5588fe
| -rw-r--r-- | libdrmutils/drm_master.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libdrmutils/drm_master.cpp b/libdrmutils/drm_master.cpp index f0d14b1b..6b27db9c 100644 --- a/libdrmutils/drm_master.cpp +++ b/libdrmutils/drm_master.cpp @@ -1,5 +1,5 @@ /* -* Copyright (c) 2017 - 2018, The Linux Foundation. All rights reserved. +* Copyright (c) 2017 - 2018, 2021, 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 @@ -37,6 +37,9 @@ // that doesn't use keyword "virtual" for a variable name. Not doing so leads to the kernel version // of drm.h being included causing compilation to fail #include <drm/msm_drm.h> +#ifdef KERNEL_5_4 +#include <drm/sde_drm.h> +#endif #include <algorithm> #include <iterator> |