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

disp: Enable MSM_EXT_DISPLAY config for dp_audio.

Browse Source 
Add support for all the configs symbols under config_options under DDK framework.

Change-Id: Iba2949175afe5f55a2e3107d2afd71e55b862d61
Signed-off-by: Varsha Suresh <quic_varssure@quicinc.com>
This commit is contained in:
Varsha Suresh
2023-07-03 10:37:50 -07:00
parent e699aa2b24
commit 6830449deb
4 changed files with 36 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
BUILD.bazel
View File

@@ -5,14 +5,6 @@ package(
"//visibility:public"], "//visibility:public"],
) )
ddk_headers(
name = "display_drivers_configs",
hdrs = glob([
"config/*.h",
]),
includes = ["config"]
)
ddk_headers( ddk_headers(
name = "linux_includes", name = "linux_includes",
hdrs = glob([ hdrs = glob([
@@ -73,7 +65,7 @@ ddk_headers(
ddk_headers( ddk_headers(
name = "display_drivers_headers", name = "display_drivers_headers",
hdrs = [":display_drivers_configs", ":linux_includes", ":uapi_headers", ":msm_headers",":dp_headers",":dsi_headers",":sde_headers",":rotator_headers"] hdrs = [ ":linux_includes", ":uapi_headers", ":msm_headers",":dp_headers",":dsi_headers",":sde_headers",":rotator_headers"]
) )
load(":target.bzl", "define_pineapple") load(":target.bzl", "define_pineapple")

10
display_driver_build.bzl
View File

@@ -1,6 +1,5 @@
load("//build/kernel/kleaf:kernel.bzl", "ddk_module", "ddk_submodule") load("//build/kernel/kleaf:kernel.bzl", "ddk_module", "ddk_submodule")
load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir") load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir")
load("//msm-kernel:target_variants.bzl", "get_all_variants")
def _register_module_to_map(module_map, name, path, config_option, srcs, config_srcs, deps, config_deps): def _register_module_to_map(module_map, name, path, config_option, srcs, config_srcs, deps, config_deps):
processed_config_srcs = {} processed_config_srcs = {}
@@ -45,7 +44,6 @@ def _get_kernel_build_options(modules, config_options):
def _get_kernel_build_module_srcs(module, options, formatter): def _get_kernel_build_module_srcs(module, options, formatter):
srcs = module.srcs + _get_config_choices(module.config_srcs, options) srcs = module.srcs + _get_config_choices(module.config_srcs, options)
print("-",module.name,",",module.config_option,",srcs =",srcs)
module_path = "{}/".format(module.path) if module.path else "" module_path = "{}/".format(module.path) if module.path else ""
return ["{}{}".format(module_path, formatter(src)) for src in srcs] return ["{}{}".format(module_path, formatter(src)) for src in srcs]
@@ -77,7 +75,7 @@ def define_target_variant_modules(target, variant, registry, modules, config_opt
for module in modules: for module in modules:
rule_name = "{}_{}".format(kernel_build, module.name) rule_name = "{}_{}".format(kernel_build, module.name)
module_srcs = _get_kernel_build_module_srcs(module, options, formatter) module_srcs = _get_kernel_build_module_srcs(module, options, formatter)
print(rule_name)
if not module_srcs: if not module_srcs:
continue continue
@@ -104,8 +102,4 @@ def define_target_variant_modules(target, variant, registry, modules, config_opt
allow_duplicate_filenames = False, allow_duplicate_filenames = False,
mode_overrides = {"**/*": "644"}, mode_overrides = {"**/*": "644"},
log = "info", log = "info",
) )
def define_consolidate_gki_modules(target, registry, modules, config_options = []):
for (targets, variant) in get_all_variants():
define_target_variant_modules(targets, variant, registry, modules, config_options)

4
msm/dp/dp_audio.c
View File

@@ -626,7 +626,7 @@ static int dp_audio_register_ext_disp(struct dp_audio_private *audio)
rc = -ENODEV; rc = -ENODEV;
goto end; goto end;
} }
#if defined(CONFIG_MSM_EXT_DISPLAY) #if IS_ENABLED(CONFIG_MSM_EXT_DISPLAY)
rc = msm_ext_disp_register_intf(audio->ext_pdev, ext); rc = msm_ext_disp_register_intf(audio->ext_pdev, ext);
if (rc) if (rc)
DP_ERR("failed to register disp\n"); DP_ERR("failed to register disp\n");
@@ -667,7 +667,7 @@ static int dp_audio_deregister_ext_disp(struct dp_audio_private *audio)
goto end; goto end;
} }
#if defined(CONFIG_MSM_EXT_DISPLAY) #if IS_ENABLED(CONFIG_MSM_EXT_DISPLAY)
rc = msm_ext_disp_deregister_intf(audio->ext_pdev, ext); rc = msm_ext_disp_deregister_intf(audio->ext_pdev, ext);
if (rc) if (rc)
DP_ERR("failed to deregister disp\n"); DP_ERR("failed to deregister disp\n");

58
target.bzl
View File

@@ -1,30 +1,34 @@
load(":display_modules.bzl", "display_driver_modules") load(":display_modules.bzl", "display_driver_modules")
load(":display_driver_build.bzl", "define_consolidate_gki_modules") load(":display_driver_build.bzl", "define_target_variant_modules")
load("//msm-kernel:target_variants.bzl", "get_all_la_variants", "get_all_le_variants", "get_all_lxc_variants")
def define_pineapple(): def define_pineapple():
define_consolidate_gki_modules( for (t, v) in get_all_la_variants() + get_all_le_variants() + get_all_lxc_variants():
target = "pineapple", define_target_variant_modules(
registry = display_driver_modules, target = t,
modules = [ variant = v,
"msm_drm", registry = display_driver_modules,
], modules = [
config_options = [ "msm_drm",
"CONFIG_DRM_MSM_SDE", ],
"CONFIG_SYNC_FILE", config_options = [
"CONFIG_DRM_MSM_DSI", "CONFIG_DRM_MSM_SDE",
"CONFIG_DRM_MSM_DP", "CONFIG_SYNC_FILE",
"CONFIG_DRM_MSM_DP_MST", "CONFIG_DRM_MSM_DSI",
"CONFIG_DSI_PARSER", "CONFIG_DRM_MSM_DP",
"CONFIG_DRM_SDE_WB", "CONFIG_DRM_MSM_DP_MST",
"CONFIG_DRM_SDE_RSC", "CONFIG_DSI_PARSER",
"CONFIG_DRM_MSM_REGISTER_LOGGING", "CONFIG_DRM_SDE_WB",
"CONFIG_QCOM_MDSS_PLL", "CONFIG_DRM_SDE_RSC",
"CONFIG_HDCP_QSEECOM", "CONFIG_DRM_MSM_REGISTER_LOGGING",
"CONFIG_DRM_SDE_VM", "CONFIG_QCOM_MDSS_PLL",
"CONFIG_QCOM_WCD939X_I2C", "CONFIG_HDCP_QSEECOM",
"CONFIG_THERMAL_OF", "CONFIG_DRM_SDE_VM",
"CONFIG_MSM_MMRM", "CONFIG_QCOM_WCD939X_I2C",
"CONFIG_QTI_HW_FENCE", "CONFIG_THERMAL_OF",
"CONFIG_QCOM_SPEC_SYNC", "CONFIG_MSM_MMRM",
], "CONFIG_QTI_HW_FENCE",
) "CONFIG_QCOM_SPEC_SYNC",
"CONFIG_MSM_EXT_DISPLAY"
],
)