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

Commit 9ec7ccc8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-for-v4.16-rc7' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:
 "A bunch of fixes all over the place (core, i915, amdgpu, imx, sun4i,
  ast, tegra, vmwgfx), nothing too serious or worrying at this stage.

   - one uapi fix to stop multi-planar images with getfb

   - Sun4i error path and clock fixes

   - udl driver mmap offset fix

   - i915 DP MST and GPU reset fixes

   - vmwgfx mutex and black screen fixes

   - imx array underflow fix and vblank fix

   - amdgpu: display fixes

   - exynos devicetree fix

   - ast mode fix"

* tag 'drm-fixes-for-v4.16-rc7' of git://people.freedesktop.org/~airlied/linux: (29 commits)
  drm/ast: Fixed 1280x800 Display Issue
  drm: udl: Properly check framebuffer mmap offsets
  drm/i915: Specify which engines to reset following semaphore/event lockups
  drm/vmwgfx: Fix a destoy-while-held mutex problem.
  drm/vmwgfx: Fix black screen and device errors when running without fbdev
  drm: Reject getfb for multi-plane framebuffers
  drm/amd/display: Add one to EDID's audio channel count when passing to DC
  drm/amd/display: We shouldn't set format_default on plane as atomic driver
  drm/amd/display: Fix FMT truncation programming
  drm/amd/display: Allow truncation to 10 bits
  drm/sun4i: hdmi: Fix another error handling path in 'sun4i_hdmi_bind()'
  drm/sun4i: hdmi: Fix an error handling path in 'sun4i_hdmi_bind()'
  drm/i915/dp: Write to SET_POWER dpcd to enable MST hub.
  drm/amd/display: fix dereferencing possible ERR_PTR()
  drm/amd/display: Refine disable VGA
  drm/tegra: Shutdown on driver unbind
  drm/tegra: dsi: Don't disable regulator on ->exit()
  drm/tegra: dc: Detach IOMMU group from domain only once
  dt-bindings: exynos: Document #sound-dai-cells property of the HDMI node
  drm/imx: move arming of the vblank event to atomic_flush
  ...
parents e7d7743f 5a9f698f

Documentation/devicetree/bindings/display/exynos/exynos_hdmi.txt

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ Required properties: 
- ddc: phandle to the hdmi ddc node

- phy: phandle to the hdmi phy node

- samsung,syscon-phandle: phandle for system controller node for PMU.

- #sound-dai-cells: should be 0.



Required properties for Exynos 4210, 4212, 5420 and 5433:

- clocks: list of clock IDs from SoC clock driver.

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

+6 −3
Original line number Diff line number Diff line
@@ -2063,9 +2063,12 @@ void amdgpu_device_fini(struct amdgpu_device *adev) 


	DRM_INFO("amdgpu: finishing device.\n");

	adev->shutdown = true;

	if (adev->mode_info.mode_config_initialized)

	if (adev->mode_info.mode_config_initialized){

		if (!amdgpu_device_has_dc_support(adev))

			drm_crtc_force_disable_all(adev->ddev);



		else

			drm_atomic_helper_shutdown(adev->ddev);

	}

	amdgpu_ib_pool_fini(adev);

	amdgpu_fence_driver_fini(adev);

	amdgpu_fbdev_fini(adev);

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+3 −2
Original line number Diff line number Diff line
@@ -3134,8 +3134,6 @@ static int amdgpu_dm_plane_init(struct amdgpu_display_manager *dm, 


	switch (aplane->base.type) {

	case DRM_PLANE_TYPE_PRIMARY:

		aplane->base.format_default = true;



		res = drm_universal_plane_init(

				dm->adev->ddev,

				&aplane->base,
@@ -4794,6 +4792,9 @@ static int dm_atomic_check_plane_state_fb(struct drm_atomic_state *state, 
			return -EDEADLK;



		crtc_state = drm_atomic_get_crtc_state(plane_state->state, crtc);

		if (IS_ERR(crtc_state))

			return PTR_ERR(crtc_state);



		if (crtc->primary == plane && crtc_state->active) {

			if (!plane_state->fb)

				return -EINVAL;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ enum dc_edid_status dm_helpers_parse_edid_caps( 
		struct cea_sad *sad = &sads[i];



		edid_caps->audio_modes[i].format_code = sad->format;

		edid_caps->audio_modes[i].channel_count = sad->channels;

		edid_caps->audio_modes[i].channel_count = sad->channels + 1;

		edid_caps->audio_modes[i].sample_rate = sad->freq;

		edid_caps->audio_modes[i].sample_size = sad->byte2;

	}

drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h

+7 −1
Original line number Diff line number Diff line
@@ -496,6 +496,9 @@ struct dce_hwseq_registers { 
	HWS_SF(, DOMAIN7_PG_STATUS, DOMAIN7_PGFSM_PWR_STATUS, mask_sh), \

	HWS_SF(, DC_IP_REQUEST_CNTL, IP_REQUEST_EN, mask_sh), \

	HWS_SF(, D1VGA_CONTROL, D1VGA_MODE_ENABLE, mask_sh),\

	HWS_SF(, D2VGA_CONTROL, D2VGA_MODE_ENABLE, mask_sh),\

	HWS_SF(, D3VGA_CONTROL, D3VGA_MODE_ENABLE, mask_sh),\

	HWS_SF(, D4VGA_CONTROL, D4VGA_MODE_ENABLE, mask_sh),\

	HWS_SF(, VGA_TEST_CONTROL, VGA_TEST_ENABLE, mask_sh),\

	HWS_SF(, VGA_TEST_CONTROL, VGA_TEST_RENDER_START, mask_sh),\

	HWS_SF(, LVTMA_PWRSEQ_CNTL, LVTMA_BLON, mask_sh), \
@@ -591,7 +594,10 @@ struct dce_hwseq_registers { 
	type DENTIST_DISPCLK_WDIVIDER; \

	type VGA_TEST_ENABLE; \

	type VGA_TEST_RENDER_START; \

	type D1VGA_MODE_ENABLE;

	type D1VGA_MODE_ENABLE; \

	type D2VGA_MODE_ENABLE; \

	type D3VGA_MODE_ENABLE; \

	type D4VGA_MODE_ENABLE;



struct dce_hwseq_shift {

	HWSEQ_REG_FIELD_LIST(uint8_t)