Commit c815e4e7 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-msm-next-2024-05-07' of https://gitlab.freedesktop.org/drm/msm into drm-next 



Updates for v6.10

Core:
- Switched to generating register header files during build process
  instead of shipping pre-generated headers
- Merged DPU and MDP4 format databases.

DP:
- Stop using compat string to distinguish DP and eDP cases
- Added support for X Elite platform (X1E80100)
- Reworked DP aux/audio support
- Added SM6350 DP to the bindings (no driver changes, using SM8350
  as a fallback compat)

GPU:
- a7xx perfcntr reg fixes
- MAINTAINERS updates
- a750 devcoredump support

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGtpw6dNR9JBikFTQ=TCpt-9FeFW+SGjXWv+Jv3emm0Pbg@mail.gmail.com
parents f03eee5f b587f413

Documentation/devicetree/bindings/display/msm/dp-controller.yaml

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ properties: 
          - qcom,sm8650-dp

      - items:

          - enum:

              - qcom,sm6350-dp

              - qcom,sm8150-dp

              - qcom,sm8250-dp

              - qcom,sm8450-dp

Documentation/devicetree/bindings/display/msm/qcom,sm6350-mdss.yaml

+9 −0
Original line number Diff line number Diff line
@@ -53,6 +53,15 @@ patternProperties: 
      compatible:

        const: qcom,sm6350-dpu



  "^displayport-controller@[0-9a-f]+$":

    type: object

    additionalProperties: true



    properties:

      compatible:

        contains:

          const: qcom,sm6350-dp



  "^dsi@[0-9a-f]+$":

    type: object

    additionalProperties: true

MAINTAINERS

+19 −1
Original line number Diff line number Diff line
@@ -6816,7 +6816,25 @@ T: git https://gitlab.freedesktop.org/drm/misc/kernel.git 
F:	Documentation/devicetree/bindings/display/panel/panel-mipi-dbi-spi.yaml

F:	drivers/gpu/drm/tiny/panel-mipi-dbi.c









DRM DRIVER FOR MSM ADRENO GPU









DRM DRIVER for Qualcomm Adreno GPUs









M:	Rob Clark <robdclark@gmail.com>









R:	Sean Paul <sean@poorly.run>









R:	Konrad Dybcio <konrad.dybcio@linaro.org>









L:	linux-arm-msm@vger.kernel.org









L:	dri-devel@lists.freedesktop.org









L:	freedreno@lists.freedesktop.org









S:	Maintained









B:	https://gitlab.freedesktop.org/drm/msm/-/issues









T:	git https://gitlab.freedesktop.org/drm/msm.git









F:	Documentation/devicetree/bindings/display/msm/gpu.yaml









F:	drivers/gpu/drm/msm/adreno/









F:	drivers/gpu/drm/msm/msm_gpu.*









F:	drivers/gpu/drm/msm/msm_gpu_devfreq.*









F:	drivers/gpu/drm/msm/msm_ringbuffer.*









F:	drivers/gpu/drm/msm/registers/adreno/









F:	include/uapi/drm/msm_drm.h

















DRM DRIVER for Qualcomm display hardware









M:	Rob Clark <robdclark@gmail.com>









M:	Abhinav Kumar <quic_abhinavk@quicinc.com>









M:	Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
































drivers/gpu/drm/msm/.gitignore
0 → 100644



+1
−0






























Original line number
Diff line number
Diff line









generated/
























drivers/gpu/drm/msm/Kconfig



+8
−0






























Original line number
Diff line number
Diff line







@@ -54,6 +54,14 @@ config DRM_MSM_GPU_SUDO







	  Only use this if you are a driver developer.  This should *not*









	  be enabled for production kernels.  If unsure, say N.



















config DRM_MSM_VALIDATE_XML









	bool "Validate XML register files against schema"









	depends on DRM_MSM && EXPERT









	depends on $(success,$(PYTHON3) -c "import lxml")









	help









	  Validate XML files with register definitions against rules-fd schema.









	  This option is mostly targeting DRM MSM developers. If unsure, say N.



















config DRM_MSM_MDSS









	bool









	depends on DRM_MSM