Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 320d8c3d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2017-03-31' of git://anongit.freedesktop.org/git/drm-misc into drm-next 

drm-misc for 4.12:

Core:
- Removed some fb subsampling dimension checks from core (Ville)
- Some MST slot cleanup (Dhinakaran)
- Extracted drm_debugfs.h & drm_ioctl.h from drmP.h (Daniel)
- Added drm_atomic_helper_shutdown() to compliment suspend/resume counterparts
  (Daniel)
- Pipe context through legacy modeset to remove legacy_backoff nasties (Daniel)
- Cleanups around vblank as well as allowing lockless counter reads (Chris W.)
- VGA Switcheroo added to MAINTAINERS with Lukas Wunner as reviewer (Lukas)

Drivers:
- Enhancements to rockchip driver probe (Jeffy) and dsi (Chris Z.)
- Thunderbolt external GPU awareness added (Lukas)

* tag 'drm-misc-next-2017-03-31' of git://anongit.freedesktop.org/git/drm-misc: (63 commits)
  apple-gmux: Don't switch external DP port on 2011+ MacBook Pros
  drm/nouveau: Don't register Thunderbolt eGPU with vga_switcheroo
  drm/amdgpu: Don't register Thunderbolt eGPU with vga_switcheroo
  drm/radeon: Don't register Thunderbolt eGPU with vga_switcheroo
  PCI: Recognize Thunderbolt devices
  MAINTAINERS: Add Lukas Wunner as reviewer for vga_switcheroo
  drm: Fix locking gotcha in page_flip ioctl
  drm: Clarify the role of plane_state argument to drm_simple update().
  drm: Clear e after kfree in drm_mode_page_flip_ioctl
  drm: Convert cmpxchg(bool) back to a two step operation
  drm/bridge: ti-tfp410: support hpd via gpio
  drm: use .hword to represent 16-bit numbers
  Revert unrelated part of "drm: simplify the locking in the GETCRTC ioctl"
  drm: Fixup failure paths in drm_atomic_helper_set_config
  drm: Peek at the current counter/timestamp for vblank queries
  drm: Refactor vblank sequence number comparison
  drm: vblank cannot be enabled if dev->irq_enabled is false
  drm: Mark up accesses of vblank->enabled outside of its spinlock
  drm: Make the decision to keep vblank irq enabled earlier
  drm/atomic-helper: Remove the backoff hack from set_config
  ...
parents 7558ab66 b121b051

Documentation/EDID/edid.S

+3 −3
Original line number Diff line number Diff line
@@ -59,9 +59,9 @@ 
/* Fixed header pattern */

header:		.byte	0x00,0xff,0xff,0xff,0xff,0xff,0xff,0x00



mfg_id:		.word	swap16(mfgname2id(MFG_LNX1, MFG_LNX2, MFG_LNX3))

mfg_id:		.hword	swap16(mfgname2id(MFG_LNX1, MFG_LNX2, MFG_LNX3))



prod_code:	.word	0

prod_code:	.hword	0



/* Serial number. 32 bits, little endian. */

serial_number:	.long	SERIAL
@@ -177,7 +177,7 @@ std_vres: .byte (XY_RATIO<<6)+VFREQ-60 


descriptor1:

/* Pixel clock in 10 kHz units. (0.-655.35 MHz, little-endian) */

clock:		.word	CLOCK/10

clock:		.hword	CLOCK/10



/* Horizontal active pixels 8 lsbits (0-4095) */

x_act_lsb:	.byte	XPIX&0xff

Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Required properties: 
- interrupts: Represent the controller's interrupt to the CPU(s).

- clocks, clock-names: Phandles to the controller's pll reference

  clock(ref) and APB clock(pclk). For RK3399, a phy config clock

  (phy_cfg) is additional required. As described in [1].

  (phy_cfg) and a grf clock(grf) are required. As described in [1].

- rockchip,grf: this soc should set GRF regs to mux vopl/vopb.

- ports: contain a port node with endpoint definitions as defined in [2].

  For vopb,set the reg = <0> and set the reg = <1> for vopl.

Documentation/gpu/drm-uapi.rst

+12 −0
Original line number Diff line number Diff line
@@ -207,6 +207,18 @@ Display CRC Support 
.. kernel-doc:: drivers/gpu/drm/drm_debugfs_crc.c

   :doc: CRC ABI



.. kernel-doc:: drivers/gpu/drm/drm_debugfs_crc.c

   :export:



Debugfs Support

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



.. kernel-doc:: include/drm/drm_debugfs.h

   :internal:



.. kernel-doc:: drivers/gpu/drm/drm_debugfs.c

   :export:



VBlank event handling

=====================

Documentation/gpu/introduction.rst

+25 −0
Original line number Diff line number Diff line
@@ -60,3 +60,28 @@ checkpatch or sparse. We welcome such contributions. 


Anyone looking to kick it up a notch can find a list of janitorial tasks on

the :ref:`TODO list <todo>`.



Contribution Process

====================



Mostly the DRM subsystem works like any other kernel subsystem, see :ref:`the

main process guidelines and documentation <process_index>` for how things work.

Here we just document some of the specialities of the GPU subsystem.



Feature Merge Deadlines

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



All feature work must be in the linux-next tree by the -rc6 release of the

current release cycle, otherwise they must be postponed and can't reach the next

merge window. All patches must have landed in the drm-next tree by latest -rc7,

but if your branch is not in linux-next then this must have happened by -rc6

already.



After that point only bugfixes (like after the upstream merge window has closed

with the -rc1 release) are allowed. No new platform enabling or new drivers are

allowed.



This means that there's a blackout-period of about one month where feature work

can't be merged. The recommended way to deal with that is having a -next tree

that's always open, but making sure to not feed it into linux-next during the

blackout period. As an example, drm-misc works like that.

Documentation/gpu/kms-properties.csv

+0 −5
Original line number Diff line number Diff line 
Owner Module/Drivers,Group,Property Name,Type,Property Values,Object attached,Description/Restrictions

,,“scaling mode”,ENUM,"{ ""None"", ""Full"", ""Center"", ""Full aspect"" }",Connector,"Supported by: amdgpu, gma500, i915, nouveau and radeon."

,Connector,“EDID”,BLOB | IMMUTABLE,0,Connector,Contains id of edid blob ptr object.

,,“DPMS”,ENUM,"{ “On”, “Standby”, “Suspend”, “Off” }",Connector,Contains DPMS operation mode value.

,,“PATH”,BLOB | IMMUTABLE,0,Connector,Contains topology path to a connector.

,,“TILE”,BLOB | IMMUTABLE,0,Connector,Contains tiling information for a connector.

,,“CRTC_ID”,OBJECT,DRM_MODE_OBJECT_CRTC,Connector,CRTC that connector is attached to (atomic)

,DVI-I,“subconnector”,ENUM,"{ “Unknown”, “DVI-D”, “DVI-A” }",Connector,TBD

,,“select subconnector”,ENUM,"{ “Automatic”, “DVI-D”, “DVI-A” }",Connector,TBD

,TV,“subconnector”,ENUM,"{ ""Unknown"", ""Composite"", ""SVIDEO"", ""Component"", ""SCART"" }",Connector,TBD