diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-10-03 21:44:49 +0000 |
|---|---|---|
| committer | Android Partner Code Review <android-gerrit-partner@google.com> | 2022-10-03 21:44:49 +0000 |
| commit | 13340e7b61d888f2997165405fc2364c724b5ef2 (patch) | |
| tree | fd16c59c6c01f7d637456e1efc5bec5bbe1a7283 | |
| parent | 422e9d8486c2a48873559c822e7c0640af2dc781 (diff) | |
| parent | 454dd0ab7926b57a6ec8fa4e8d3c107d71ccf372 (diff) | |
| download | gchips-13340e7b61d888f2997165405fc2364c724b5ef2.tar.gz | |
Merge "Enable SLC for decoder streams" into android13-gs-pixel-5.15
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | bigo_of.c | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -11,11 +11,12 @@ bigwave-$(CONFIG_DEBUG_FS) += bigo_debug.o KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build M ?= $(shell pwd) -KBUILD_OPTIONS += CONFIG_BIGWAVE=m ENABLE_SLC=n +KBUILD_OPTIONS += CONFIG_BIGWAVE=m ENABLE_SLC=y include $(KERNEL_SRC)/../private/google-modules/soc/gs/Makefile.include EXTRA_CFLAGS += -I$(KERNEL_SRC)/../private/google-modules/video/gchips/include +EXTRA_CFLAGS += -DENABLE_SLC=1 modules modules_install headers_install clean: $(MAKE) -C $(KERNEL_SRC) M=$(M) \ @@ -42,7 +42,7 @@ static int bigo_of_get_resource(struct bigo_core *core) core->paddr = (phys_addr_t)res->start; #if IS_ENABLED(ENABLE_SLC) - res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ssmt_bo_pid"); + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ssmt_bw_pid"); if (IS_ERR_OR_NULL(res)) { rc = PTR_ERR(res); pr_err("Failed to find ssmt_bo register base: %d\n", rc); |