Commit 031541c2 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

Merge drm/drm-next into drm-misc-next-fixes 



Backmerging to get a few more commits that came from drm-misc-next.
See [1]

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Link: https://lore.kernel.org/dri-devel/20240229084806.GA21616@localhost.localdomain/ # 1
parents 4a0e7b3c c6d6a82d

Documentation/admin-guide/edid.rst

+1 −34
Original line number Diff line number Diff line
@@ -24,37 +24,4 @@ restrictions later on. 
As a remedy for such situations, the kernel configuration item

CONFIG_DRM_LOAD_EDID_FIRMWARE was introduced. It allows to provide an

individually prepared or corrected EDID data set in the /lib/firmware

directory from where it is loaded via the firmware interface. The code

(see drivers/gpu/drm/drm_edid_load.c) contains built-in data sets for

commonly used screen resolutions (800x600, 1024x768, 1280x1024, 1600x1200,

1680x1050, 1920x1080) as binary blobs, but the kernel source tree does

not contain code to create these data. In order to elucidate the origin

of the built-in binary EDID blobs and to facilitate the creation of

individual data for a specific misbehaving monitor, commented sources

and a Makefile environment are given here.



To create binary EDID and C source code files from the existing data

material, simply type "make" in tools/edid/.



If you want to create your own EDID file, copy the file 1024x768.S,

replace the settings with your own data and add a new target to the

Makefile. Please note that the EDID data structure expects the timing

values in a different way as compared to the standard X11 format.



X11:

  HTimings:

    hdisp hsyncstart hsyncend htotal

  VTimings:

    vdisp vsyncstart vsyncend vtotal



EDID::



  #define XPIX hdisp

  #define XBLANK htotal-hdisp

  #define XOFFSET hsyncstart-hdisp

  #define XPULSE hsyncend-hsyncstart



  #define YPIX vdisp

  #define YBLANK vtotal-vdisp

  #define YOFFSET vsyncstart-vdisp

  #define YPULSE vsyncend-vsyncstart
 
directory from where it is loaded via the firmware interface.

Documentation/admin-guide/kernel-parameters.txt

+4 −10
Original line number Diff line number Diff line
@@ -1162,16 +1162,10 @@ 
			panels may send no or incorrect EDID data sets.

			This parameter allows to specify an EDID data sets

			in the /lib/firmware directory that are used instead.

			Generic built-in EDID data sets are used, if one of

			edid/1024x768.bin, edid/1280x1024.bin,

			edid/1680x1050.bin, or edid/1920x1080.bin is given

			and no file with the same name exists. Details and

			instructions how to build your own EDID data are

			available in Documentation/admin-guide/edid.rst. An EDID

			data set will only be used for a particular connector,

			if its name and a colon are prepended to the EDID

			name. Each connector may use a unique EDID data

			set by separating the files with a comma.  An EDID

			An EDID data set will only be used for a particular

			connector, if its name and a colon are prepended to

			the EDID name. Each connector may use a unique EDID

			data set by separating the files with a comma. An EDID

			data set with no connector name will be used for

			any connectors not explicitly specified.

Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ properties: 
              - qcom,msm8916-dsi-ctrl

              - qcom,msm8953-dsi-ctrl

              - qcom,msm8974-dsi-ctrl

              - qcom,msm8976-dsi-ctrl

              - qcom,msm8996-dsi-ctrl

              - qcom,msm8998-dsi-ctrl

              - qcom,qcm2290-dsi-ctrl
@@ -248,6 +249,7 @@ allOf: 
          contains:

            enum:

              - qcom,msm8953-dsi-ctrl

              - qcom,msm8976-dsi-ctrl

    then:

      properties:

        clocks:

Documentation/devicetree/bindings/display/msm/gmu.yaml

+1 −0
Original line number Diff line number Diff line
@@ -224,6 +224,7 @@ allOf: 
            enum:

              - qcom,adreno-gmu-730.1

              - qcom,adreno-gmu-740.1

              - qcom,adreno-gmu-750.1

    then:

      properties:

        reg:

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

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ properties: 
          The driver is parsing the compat string for Adreno to

          figure out the gpu-id and patch level.

        items:

          - pattern: '^qcom,adreno-[3-7][0-9][0-9]\.[0-9]$'

          - pattern: '^qcom,adreno-[3-7][0-9][0-9]\.[0-9]+$'

          - const: qcom,adreno

      - description: |

          The driver is parsing the compat string for Imageon to
@@ -127,7 +127,7 @@ allOf: 
      properties:

        compatible:

          contains:

            pattern: '^qcom,adreno-[3-5][0-9][0-9]\.[0-9]$'

            pattern: '^qcom,adreno-[3-5][0-9][0-9]\.[0-9]+$'



    then:

      properties:
@@ -203,7 +203,7 @@ allOf: 
        properties:

          compatible:

            contains:

              pattern: '^qcom,adreno-[67][0-9][0-9]\.[0-9]$'

              pattern: '^qcom,adreno-[67][0-9][0-9]\.[0-9]+$'



      then: # Starting with A6xx, the clocks are usually defined in the GMU node

        properties: