aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-09-10 19:41:13 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2019-09-10 19:41:13 -0700
commit3ffcd68d585db7c4373b70ba76460696b037c8de (patch)
treec4e752ff713f035b50cfd70a6e2a359144d67dec
parent789faabf9f165a74a916ed8c1a356688a23e8cad (diff)
parent86456039f36de3f3507fd1a064cefb695167f148 (diff)
Merge "drm/msm/shd: add dsi_display base in shd_display" into LV.AU.0.0.1_rb1.11LV.AU.0.0.1-13310-gen3meta.0
-rw-r--r--drivers/gpu/drm/msm/shd/shd_drm.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/shd/shd_drm.h b/drivers/gpu/drm/msm/shd/shd_drm.h
index 03aa95e511d8..e1f40f05f3c5 100644
--- a/drivers/gpu/drm/msm/shd/shd_drm.h
+++ b/drivers/gpu/drm/msm/shd/shd_drm.h
@@ -20,6 +20,7 @@
#include <drm/drm_crtc.h>
#include <drm/drm_crtc_helper.h>
#include "msm_drv.h"
+#include "dsi_display.h"
struct shd_mode_info {
int x_offset;
@@ -51,6 +52,7 @@ struct shd_display_base {
};
struct shd_display {
+ struct dsi_display dsi_base;
struct drm_device *drm_dev;
const char *name;