Commit 39a207d0 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2019-06-20' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for v5.3:

UAPI Changes:
- Give each dma-buf their own inode, add DMA_BUF_SET_NAME ioctl and a show_fdinfo handler.

Cross-subsystem Changes:
- Pull in the topic/remove-fbcon-notifiers branch:
  * remove fbdev notifier usage for fbcon, as prep work to clean up the fbcon locking
  * assorted locking checks in vt/console code
  * assorted notifier and cleanups in fbdev and backlight code

Core Changes:
- Make drm_debugfs_create_files() never fail.
- add debug print to update_vblank_count.
- Add DP_DPCD_QUIRK_NO_SINK_COUNT quirk.
- Add todo item for drm_gem_objects.
- Unexport drm_gem_(un)pin/v(un)map.
- Document struct drm_cmdline_mode.
- Rewrite the command handler for mode names, and add support to specify
  rotation, reflection and overscan. With a new selftest! :)
- Fixes to drm/client for improving rotation support, and fixing variable scope.
- Small fixes to self refresh helper.

Driver Changes:
- Add rockchip RK3328 support.
- Assorted driver fixes to rockchip, vc4, rcar-du, vkms.
- Expose panfrost performance counters through unstable ioctl's, hidden
  behind a module parameter.
- Enumerate CRC sources list in vkms.
- Add a basic kms driver for the Ingenic JZ47xx SoC, which will be expanded
  soon with more advanced features.
- Suspend/resume fix for stm.

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

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/18e22ec1-adf3-3a75-34a3-9fe09a91eef5@linux.intel.com
parents 031e610a 836334fd

Documentation/devicetree/bindings/display/ingenic,lcd.txt

0 → 100644
+44 −0
Original line number Diff line number Diff line 
Ingenic JZ47xx LCD driver



Required properties:

- compatible: one of:

  * ingenic,jz4740-lcd

  * ingenic,jz4725b-lcd

- reg: LCD registers location and length

- clocks: LCD pixclock and device clock specifiers.

	   The device clock is only required on the JZ4740.

- clock-names: "lcd_pclk" and "lcd"

- interrupts: Specifies the interrupt line the LCD controller is connected to.



Example:



panel {

	compatible = "sharp,ls020b1dd01d";



	backlight = <&backlight>;

	power-supply = <&vcc>;



	port {

		panel_input: endpoint {

			remote-endpoint = <&panel_output>;

		};

	};

};





lcd: lcd-controller@13050000 {

	compatible = "ingenic,jz4725b-lcd";

	reg = <0x13050000 0x1000>;



	interrupt-parent = <&intc>;

	interrupts = <31>;



	clocks = <&cgu JZ4725B_CLK_LCD>;

	clock-names = "lcd";



	port {

		panel_output: endpoint {

			remote-endpoint = <&panel_input>;

		};

	};

};

Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ following device-specific properties. 
Required properties:



- compatible: should be one of the following:

		"rockchip,rk3228-dw-hdmi"

		"rockchip,rk3288-dw-hdmi"

		"rockchip,rk3328-dw-hdmi"

		"rockchip,rk3399-dw-hdmi"

Documentation/fb/modedb.txt

+14 −0
Original line number Diff line number Diff line
@@ -51,6 +51,20 @@ To force the VGA output to be enabled and drive a specific mode say: 
Specifying the option multiple times for different ports is possible, e.g.:

    video=LVDS-1:d video=HDMI-1:D



Options can also be passed after the mode, using commas as separator.



       Sample usage: 720x480,rotate=180 - 720x480 mode, rotated by 180 degrees



Valid options are:



  - margin_top, margin_bottom, margin_left, margin_right (integer):

    Number of pixels in the margins, typically to deal with overscan on TVs

  - reflect_x (boolean): Perform an axial symmetry on the X axis

  - reflect_y (boolean): Perform an axial symmetry on the Y axis

  - rotate (integer): Rotate the initial framebuffer by x

    degrees. Valid values are 0, 90, 180 and 270.





***** oOo ***** oOo ***** oOo ***** oOo ***** oOo ***** oOo ***** oOo *****



What is the VESA(TM) Coordinated Video Timings (CVT)?

Documentation/gpu/todo.rst

+6 −0
Original line number Diff line number Diff line
@@ -228,6 +228,12 @@ struct drm_gem_object_funcs 
GEM objects can now have a function table instead of having the callbacks on the

DRM driver struct. This is now the preferred way and drivers can be moved over.



DRM_GEM_CMA_VMAP_DRIVER_OPS, DRM_GEM_SHMEM_DRIVER_OPS already support this, but

DRM_GEM_VRAM_DRIVER_PRIME does not yet and needs to be aligned with the previous

two. We also need a 2nd version of the CMA define that doesn't require the

vmapping to be present (different hook for prime importing). Plus this needs to

be rolled out to all drivers using their own implementations, too.



Use DRM_MODESET_LOCK_ALL_* helpers instead of boilerplate

---------------------------------------------------------

arch/arm/mach-pxa/am200epd.c

+11 −2
Original line number Diff line number Diff line
@@ -347,8 +347,17 @@ int __init am200_init(void) 
{

	int ret;



	/* before anything else, we request notification for any fb

	 * creation events */

	/*

	 * Before anything else, we request notification for any fb

	 * creation events.

	 *

	 * FIXME: This is terrible and needs to be nuked. The notifier is used

	 * to get at the fb base address from the boot splash fb driver, which

	 * is then passed to metronomefb. Instaed of metronomfb or this board

	 * support file here figuring this out on their own.

	 *

	 * See also the #ifdef in fbmem.c.

	 */

	fb_register_client(&am200_fb_notif);



	pxa2xx_mfp_config(ARRAY_AND_SIZE(am200_pin_config));

CRA Git | Maintained and supported by SUSTech CRA and CCSE