Commit 50ae4ce2 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-msm-fixes-2026-03-06' of https://gitlab.freedesktop.org/drm/msm into drm-fixes 

Fixes for v7.0:

Core:
- Adjusted msm_iommu_pagetable_prealloc_allocate() allocation type

DPU:
- Fixed blue screens on Hamoa laptops by reverting the LM reservation
- Fixed the size of the LM block on several platforms
- Dropped usage of %pK (again)
- Fixed smatch warning on SSPP v13+ code
- Fixed INTF_6 interrupts on Lemans

DSI:
- Fixed DSI PHY revision on Kaanapali
- Fixed pixel clock calculation for the bonded DSI mode panels with
  compression enabled

DT bindings:
- Fixed DisplayPort description on Glymur
- Fixed model name in SM8750 MDSS schema

GPU:
- Added MODULE_DEVICE_TABLE to the GPU driver
- Fix bogus protect error on X2-85
- Fix dma_free_attrs() buffer size
- Gen8 UBWC fix for Glymur

From: Rob Clark <rob.clark@oss.qualcomm.com>
Link: https://patch.msgid.link/CACSVV00wZ95gFDLfzJ0Ywb8rsjPSjZ1aHdwE4smnyuZ=Fg-g8Q@mail.gmail.com


Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents 1f318b96 e4eb11b3

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

+20 −1
Original line number Diff line number Diff line
@@ -253,7 +253,6 @@ allOf: 
            enum:

              # these platforms support 2 streams MST on some interfaces,

              # others are SST only

              - qcom,glymur-dp

              - qcom,sc8280xp-dp

              - qcom,x1e80100-dp

    then:
@@ -310,6 +309,26 @@ allOf: 
          minItems: 6

          maxItems: 8



  - if:

      properties:

        compatible:

          contains:

            enum:

              # these platforms support 2 streams MST on some interfaces,

              # others are SST only, but all controllers have 4 ports

              - qcom,glymur-dp

    then:

      properties:

        reg:

          minItems: 9

          maxItems: 9

        clocks:

          minItems: 5

          maxItems: 6

        clocks-names:

          minItems: 5

          maxItems: 6



unevaluatedProperties: false



examples:

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

+10 −6
Original line number Diff line number Diff line
@@ -176,13 +176,17 @@ examples: 
                };

            };



            displayport-controller@ae90000 {

            displayport-controller@af54000 {

                compatible = "qcom,glymur-dp";

                reg = <0xae90000 0x200>,

                      <0xae90200 0x200>,

                      <0xae90400 0x600>,

                      <0xae91000 0x400>,

                      <0xae91400 0x400>;

                reg = <0xaf54000 0x200>,

                      <0xaf54200 0x200>,

                      <0xaf55000 0xc00>,

                      <0xaf56000 0x400>,

                      <0xaf57000 0x400>,

                      <0xaf58000 0x400>,

                      <0xaf59000 0x400>,

                      <0xaf5a000 0x600>,

                      <0xaf5b000 0x600>;



                interrupt-parent = <&mdss>;

                interrupts = <12>;

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ maintainers: 
  - Krzysztof Kozlowski <krzk@kernel.org>



description:

  SM8650 MSM Mobile Display Subsystem(MDSS), which encapsulates sub-blocks like

  SM8750 MSM Mobile Display Subsystem(MDSS), which encapsulates sub-blocks like

  DPU display controller, DSI and DP interfaces etc.



$ref: /schemas/display/msm/mdss-common.yaml#

drivers/gpu/drm/msm/adreno/a2xx_gpummu.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ static void a2xx_gpummu_destroy(struct msm_mmu *mmu) 
{

	struct a2xx_gpummu *gpummu = to_a2xx_gpummu(mmu);



	dma_free_attrs(mmu->dev, TABLE_SIZE, gpummu->table, gpummu->pt_base,

	dma_free_attrs(mmu->dev, TABLE_SIZE + 32, gpummu->table, gpummu->pt_base,

		DMA_ATTR_FORCE_CONTIGUOUS);



	kfree(gpummu);

drivers/gpu/drm/msm/adreno/a6xx_catalog.c

+1 −2
Original line number Diff line number Diff line
@@ -1759,7 +1759,7 @@ static const u32 x285_protect_regs[] = { 
	A6XX_PROTECT_NORDWR(0x27c06, 0x0000),

};



DECLARE_ADRENO_PROTECT(x285_protect, 64);

DECLARE_ADRENO_PROTECT(x285_protect, 15);



static const struct adreno_reglist_pipe a840_nonctxt_regs[] = {

	{ REG_A8XX_CP_SMMU_STREAM_ID_LPAC, 0x00000101, BIT(PIPE_NONE) },
@@ -1966,5 +1966,4 @@ static inline __always_unused void __build_asserts(void) 
	BUILD_BUG_ON(a660_protect.count > a660_protect.count_max);

	BUILD_BUG_ON(a690_protect.count > a690_protect.count_max);

	BUILD_BUG_ON(a730_protect.count > a730_protect.count_max);

	BUILD_BUG_ON(a840_protect.count > a840_protect.count_max);

}