samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disp: msm: dp: update include file path for upstream headers

Browse Source 
This change updates the include file path for necessary dp
and dsc headers that have moved in upstream kernel.

File path changed in upstream:
include/drm/display/drm_dp_aux_bus.h
include/drm/display/drm_dp_dual_mode_helper.h
include/drm/display/drm_dp.h
include/drm/display/drm_dp_helper.h
include/drm/display/drm_dp_mst_helper.h
include/drm/display/drm_dsc.h
include/drm/display/drm_dsc_helper.h
include/drm/display/drm_hdcp.h
include/drm/display/drm_hdcp_helper.h
include/drm/display/drm_hdmi_helper.h
include/drm/display/drm_scdc.h
include/drm/display/drm_scdc_helper.h

Change-Id: Icb9a227c7464061f68fe60cbda6d93858fa768c5
Signed-off-by: GG Hou <quic_renjhou@quicinc.com>
Signed-off-by: Nilaan Gunabalachandran <quic_ngunabal@quicinc.com>
This commit is contained in:
GG Hou
2022-07-28 14:31:09 +08:00
committed by Prabhanjan Kandula
parent 5624dc5b2e
commit 11f0929a72
13 changed files with 68 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
msm/dp/dp_audio.c
View File

@@ -6,8 +6,13 @@
#include <linux/of_platform.h>
#include <linux/soc/qcom/msm_ext_display.h>
#include <linux/version.h>
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
#include <drm/display/drm_dp_helper.h>
#else
#include <drm/drm_dp_helper.h>
#endif
#include "dp_catalog.h"
#include "dp_audio.h"

6
msm/dp/dp_aux.h
View File

@@ -8,7 +8,11 @@
#define _DP_AUX_H_
#include "dp_catalog.h"
#include "drm/drm_dp_helper.h"
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
#include <drm/display/drm_dp_helper.h>
#else
#include <drm/drm_dp_helper.h>
#endif
#include "dp_aux_bridge.h"
#define DP_STATE_NOTIFICATION_SENT BIT(0)

5
msm/dp/dp_aux_bridge.h
View File

@@ -38,8 +38,13 @@
#ifndef _DP_AUX_BRIDGE_H_
#define _DP_AUX_BRIDGE_H_
#include <linux/version.h>
#include <linux/types.h>
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
#include <drm/display/drm_dp_helper.h>
#else
#include <drm/drm_dp_helper.h>
#endif
/**
* enum dp_aux_bridge_flag - DP aux bridge capability flag

5
msm/dp/dp_catalog.h
View File

@@ -7,7 +7,12 @@
#ifndef _DP_CATALOG_H_
#define _DP_CATALOG_H_
#include <linux/version.h>
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
#include <drm/display/drm_dp_helper.h>
#else
#include <drm/drm_dp_helper.h>
#endif
#include <drm/sde_drm.h>
#include "dp_parser.h"

5
msm/dp/dp_debug.c
View File

@@ -6,7 +6,12 @@
#include <linux/debugfs.h>
#include <linux/slab.h>
#include <linux/version.h>
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
#include <drm/display/drm_dp_mst_helper.h>
#else
#include <drm/drm_dp_mst_helper.h>
#endif
#include <drm/drm_probe_helper.h>
#include "dp_power.h"

6
msm/dp/dp_hdcp2p2.c
View File

@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
*/
@@ -11,7 +12,12 @@
#include <linux/kthread.h>
#include <linux/msm_hdcp.h>
#include <linux/kfifo.h>
#include <linux/version.h>
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
#include <drm/display/drm_dp_helper.h>
#else
#include <drm/drm_dp_helper.h>
#endif
#include "sde_hdcp_2x.h"
#include "dp_debug.h"

9
msm/dp/dp_mst_drm.c
View File

@@ -29,14 +29,21 @@
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/errno.h>
#include <linux/version.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_atomic.h>
#include <drm/drm_crtc.h>
#include <drm/drm_dp_mst_helper.h>
#include <drm/drm_fixed.h>
#include <drm/drm_connector.h>
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
#include <drm/display/drm_dp_helper.h>
#include <drm/display/drm_dp_mst_helper.h>
#else
#include <drm/drm_dp_helper.h>
#include <drm/drm_dp_mst_helper.h>
#endif
#include <linux/version.h>
#include "msm_drv.h"

5
msm/dp/dp_mst_sim.c
View File

@@ -17,9 +17,14 @@
#include <linux/slab.h>
#include <linux/uaccess.h>
#include <linux/debugfs.h>
#include <linux/version.h>
#include <linux/platform_device.h>
#include <drm/drm_edid.h>
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
#include <drm/display/drm_dp_helper.h>
#else
#include <drm/drm_dp_helper.h>
#endif
#include "dp_debug.h"
#include "dp_mst_sim.h"

5
msm/dp/dp_mst_sim_helper.c
View File

@@ -38,9 +38,14 @@
#include <linux/types.h>
#include <linux/completion.h>
#include <linux/delay.h>
#include <linux/version.h>
#include <drm/drm_fixed.h>
#include <drm/drm_edid.h>
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
#include <drm/display/drm_dp_mst_helper.h>
#else
#include <drm/drm_dp_mst_helper.h>
#endif
#include "dp_mst_sim_helper.h"
#include "dp_debug.h"

5
msm/dp/dp_mst_sim_helper.h
View File

@@ -1,4 +1,5 @@
/*
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
@@ -38,7 +39,11 @@
#define _DP_MST_SIM_HELPER_H_
#include <linux/types.h>
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
#include <drm/display/drm_dp_helper.h>
#else
#include <drm/drm_dp_helper.h>
#endif
/**
* struct dp_mst_sim_port - MST port configuration

4
msm/dp/dp_panel.c
View File

@@ -8,7 +8,11 @@
#include <linux/unistd.h>
#include <drm/drm_fixed.h>
#include "dp_debug.h"
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
#include <drm/display/drm_dsc.h>
#else
#include <drm/drm_dsc.h>
#endif
#include "sde_dsc_helper.h"
#include <drm/drm_edid.h>

4
msm/msm_drv.h
View File

@@ -48,7 +48,11 @@
#include <drm/sde_drm.h>
#include <drm/drm_file.h>
#include <drm/drm_gem.h>
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
#include <drm/display/drm_dsc.h>
#else
#include <drm/drm_dsc.h>
#endif
#include <drm/drm_bridge.h>
#include "sde_power_handle.h"

6
msm/sde_hdcp_1x.c
View File

@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2010-2021, The Linux Foundation. All rights reserved.
*/
@@ -11,8 +12,13 @@
#include <linux/slab.h>
#include <linux/stat.h>
#include <linux/iopoll.h>
#include <linux/version.h>
#include <linux/msm_hdcp.h>
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0))
#include <drm/display/drm_dp_helper.h>
#else
#include <drm/drm_dp_helper.h>
#endif
#include "sde_hdcp.h"
#include "hdcp/msm_hdmi_hdcp_mgr.h"
#include "dp/dp_reg.h"