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

Merge tag 'drm-misc-next-2022-07-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for $kernel-version:

UAPI Changes:

Cross-subsystem Changes:

Core Changes:

 * crtc: Remove unnessary include statements from drm_crtc.h, plus
   fallout in drivers

 * edid: More use of struct drm_edid; implement HF-EEODB extension

Driver Changes:

 * bridge:
   * anx7625: Implement HDP timeout via callback; Cleanups
   * fsl-ldb: Drop DE flip; Modesetting fixes
   * imx: Depend on ARCH_MXC
   * sil8620: Fix off-by-one
   * ti-sn65dsi86: Convert to atomic modesetting

 * ingenic: Fix display at maximum resolution

 * panel:
   * simple: Add support for HannStar HSD101PWW2, plus DT bindings; Add
     support for ETML0700Y5DHA, plus DT bindings

 * rockchip: Fixes

 * vc4: Cleanups

 * vmwgfx: Cleanups

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YsaHq1pvE699NtOM@linux-uq9g
parents 6db5e0c8 3915f8bd

Documentation/devicetree/bindings/display/panel/panel-simple.yaml

+4 −0
Original line number Diff line number Diff line
@@ -141,6 +141,8 @@ properties: 
        # Emerging Display Technology Corp. WVGA TFT Display with capacitive touch

      - edt,etm0700g0dh6

      - edt,etm0700g0edh6

        # Emerging Display Technology Corp. LVDS WSVGA TFT Display with capacitive touch

      - edt,etml0700y5dha

        # Emerging Display Technology Corp. 5.7" VGA TFT LCD panel with

        # capacitive touch

      - edt,etmv570g2dhu
@@ -162,6 +164,8 @@ properties: 
      - hannstar,hsd070pww1

        # HannStar Display Corp. HSD100PXN1 10.1" XGA LVDS panel

      - hannstar,hsd100pxn1

        # HannStar Display Corp. HSD101PWW2 10.1" WXGA (1280x800) LVDS panel

      - hannstar,hsd101pww2

        # Hitachi Ltd. Corporation 9" WVGA (800x480) TFT LCD panel

      - hit,tx23d38vm0caa

        # InfoVision Optoelectronics M133NWF4 R0 13.3" FHD (1920x1080) TFT LCD panel

Documentation/devicetree/bindings/display/panel/sharp,lq101r1sx01.yaml

+6 −1
Original line number Diff line number Diff line
@@ -30,7 +30,12 @@ allOf: 


properties:

  compatible:

    const: sharp,lq101r1sx01

    oneOf:

      - items:

          - const: sharp,lq101r1sx03

          - const: sharp,lq101r1sx01

      - items:

          - const: sharp,lq101r1sx01



  reg: true

  power-supply: true

drivers/gpu/drm/arm/display/komeda/komeda_pipeline.c

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
 * Author: James.Qian.Wang <james.qian.wang@arm.com>

 *

 */

#include <linux/of.h>



#include <drm/drm_print.h>



#include "komeda_dev.h"

drivers/gpu/drm/armada/armada_510.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */

#include <linux/clk.h>

#include <linux/io.h>

#include <linux/of.h>

#include <drm/drm_probe_helper.h>

#include "armada_crtc.h"

#include "armada_drm.h"

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 */



#include <linux/clk.h>

#include <linux/media-bus-format.h>

#include <linux/mfd/atmel-hlcdc.h>

#include <linux/pinctrl/consumer.h>

#include <linux/pm.h>