| Message ID | 20190823121637.5861-1-masneyb@onstation.org (mailing list archive) |
|---|---|
| Headers | show |
| Series | qcom: add OCMEM support | expand |
Hi Rob C / Sean P, On Fri, Aug 23, 2019 at 05:16:30AM -0700, Brian Masney wrote: > This patch series adds support for Qualcomm's On Chip MEMory (OCMEM) > that is needed in order to support some a3xx and a4xx-based GPUs > upstream. This is based on Rob Clark's patch series that he submitted > in October 2015 and I am resubmitting updated patches with his > permission. See the individual patches for the changelog. I talked to Bjorn in person at the Embedded Linux Conference over a week ago about this series. He thinks that this series should go through your tree. I assume it's too late for the upcoming merge window, which is fine. I just want to make sure that this series gets picked up for the following merge window. I just sent out a fix for a compiler error on MIPS as a separate patch: https://lore.kernel.org/lkml/20190901213037.25889-1-masneyb@onstation.org/ Brian
Tested-by: Gabriel Francisco <frc.gabrielgmail.com> On 9/1/19 11:40 PM, Brian Masney wrote: > Hi Rob C / Sean P, > > On Fri, Aug 23, 2019 at 05:16:30AM -0700, Brian Masney wrote: >> This patch series adds support for Qualcomm's On Chip MEMory (OCMEM) >> that is needed in order to support some a3xx and a4xx-based GPUs >> upstream. This is based on Rob Clark's patch series that he submitted >> in October 2015 and I am resubmitting updated patches with his >> permission. See the individual patches for the changelog. > I talked to Bjorn in person at the Embedded Linux Conference over a > week ago about this series. He thinks that this series should go through > your tree. I assume it's too late for the upcoming merge window, which > is fine. I just want to make sure that this series gets picked up for > the following merge window. > > I just sent out a fix for a compiler error on MIPS as a separate patch: > https://lore.kernel.org/lkml/20190901213037.25889-1-masneyb@onstation.org/ > > Brian >
Tested-by: Gabriel Francisco <frc.gabriel@gmail.com> On 9/1/19 11:40 PM, Brian Masney wrote: > Hi Rob C / Sean P, > > On Fri, Aug 23, 2019 at 05:16:30AM -0700, Brian Masney wrote: >> This patch series adds support for Qualcomm's On Chip MEMory (OCMEM) >> that is needed in order to support some a3xx and a4xx-based GPUs >> upstream. This is based on Rob Clark's patch series that he submitted >> in October 2015 and I am resubmitting updated patches with his >> permission. See the individual patches for the changelog. > I talked to Bjorn in person at the Embedded Linux Conference over a > week ago about this series. He thinks that this series should go through > your tree. I assume it's too late for the upcoming merge window, which > is fine. I just want to make sure that this series gets picked up for > the following merge window. > > I just sent out a fix for a compiler error on MIPS as a separate patch: > https://lore.kernel.org/lkml/20190901213037.25889-1-masneyb@onstation.org/ > > Brian >
This patch series adds support for Qualcomm's On Chip MEMory (OCMEM) that is needed in order to support some a3xx and a4xx-based GPUs upstream. This is based on Rob Clark's patch series that he submitted in October 2015 and I am resubmitting updated patches with his permission. See the individual patches for the changelog. This was tested with the GPU on a LG Nexus 5 (hammerhead) phone and this will work on other msm8974-based systems. For a summary of what currently works upstream on the Nexus 5, see my status page at https://masneyb.github.io/nexus-5-upstream/. Changes since v6: - link to gmu-sram child node in device tree - add ranges property to ocmem example in adreno GMU example (patch 2) to match bindings in patch 1 See individual patches for changelogs for previous versions. Brian Masney (5): dt-bindings: soc: qcom: add On Chip MEMory (OCMEM) bindings dt-bindings: display: msm: gmu: add optional ocmem property soc: qcom: add OCMEM driver drm/msm/gpu: add ocmem init/cleanup functions ARM: qcom_defconfig: add ocmem support Rob Clark (2): firmware: qcom: scm: add OCMEM lock/unlock interface firmware: qcom: scm: add support to restore secure config to qcm_scm-32 .../devicetree/bindings/display/msm/gmu.txt | 51 +++ .../devicetree/bindings/sram/qcom,ocmem.yaml | 96 ++++ arch/arm/configs/qcom_defconfig | 1 + drivers/firmware/qcom_scm-32.c | 52 ++- drivers/firmware/qcom_scm-64.c | 12 + drivers/firmware/qcom_scm.c | 53 +++ drivers/firmware/qcom_scm.h | 9 + drivers/gpu/drm/msm/Kconfig | 1 + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 28 +- drivers/gpu/drm/msm/adreno/a3xx_gpu.h | 3 +- drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 25 +- drivers/gpu/drm/msm/adreno/a4xx_gpu.h | 3 +- drivers/gpu/drm/msm/adreno/adreno_gpu.c | 40 ++ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 10 + drivers/soc/qcom/Kconfig | 10 + drivers/soc/qcom/Makefile | 1 + drivers/soc/qcom/ocmem.c | 433 ++++++++++++++++++ include/linux/qcom_scm.h | 26 ++ include/soc/qcom/ocmem.h | 62 +++ 19 files changed, 871 insertions(+), 45 deletions(-) create mode 100644 Documentation/devicetree/bindings/sram/qcom,ocmem.yaml create mode 100644 drivers/soc/qcom/ocmem.c create mode 100644 include/soc/qcom/ocmem.h