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

Commit c61b49c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-v4.7-rc1' of git://people.freedesktop.org/~airlied/linux 

Pull drm fixes from Dave Airlie:

 - one IMX built-in regression fix

 - a set of amdgpu fixes, mostly powerplay and polaris GPU stuff

 - a set of i915 fixes all over, many cc'ed to stable.

   The i915 batch contain support for DP++ dongle detection, which is
   used to fix some regressions in the HDMI color depth area

* tag 'drm-fixes-v4.7-rc1' of git://people.freedesktop.org/~airlied/linux: (44 commits)
  drm/amd: add Kconfig dependency for ACP on DRM_AMDGPU
  drm/amdgpu: Fix hdmi deep color support.
  drm/amdgpu: fix bug in fence driver fini
  drm/i915: Stop automatically retiring requests after a GPU hang
  drm/i915: Unify intel_ring_begin()
  drm/i915: Ignore stale wm register values on resume on ilk-bdw (v2)
  drm/i915/psr: Try to program link training times correctly
  drm/imx: Match imx-ipuv3-crtc components using device node in platform data
  drm/i915/bxt: Adjusting the error in horizontal timings retrieval
  drm/i915: Don't leave old junk in ilk active watermarks on readout
  drm/i915: s/DPPL/DPLL/ for SKL DPLLs
  drm/i915: Fix gen8 semaphores id for legacy mode
  drm/i915: Set crtc_state->lane_count for HDMI
  drm/i915/BXT: Retrieving the horizontal timing for DSI
  drm/i915: Protect gen7 irq_seqno_barrier with uncore lock
  drm/i915: Re-enable GGTT earlier during resume on pre-gen6 platforms
  drm/i915: Determine DP++ type 1 DVI adaptor presence based on VBT
  drm/i915: Enable/disable TMDS output buffers in DP++ adaptor as needed
  drm/i915: Respect DP++ adaptor TMDS clock limit
  drm: Add helper for DP++ adaptors
  ...
parents 1e8143db 7fa1d27b

Documentation/DocBook/gpu.tmpl

+6 −0
Original line number Diff line number Diff line
@@ -1626,6 +1626,12 @@ void intel_crt_init(struct drm_device *dev) 
!Pdrivers/gpu/drm/drm_dp_helper.c dp helpers

!Iinclude/drm/drm_dp_helper.h

!Edrivers/gpu/drm/drm_dp_helper.c

    </sect2>

    <sect2>

      <title>Display Port Dual Mode Adaptor Helper Functions Reference</title>

!Pdrivers/gpu/drm/drm_dp_dual_mode_helper.c dp dual mode helpers

!Iinclude/drm/drm_dp_dual_mode_helper.h

!Edrivers/gpu/drm/drm_dp_dual_mode_helper.c

    </sect2>

    <sect2>

      <title>Display Port MST Helper Functions Reference</title>

drivers/gpu/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ drm-$(CONFIG_AGP) += drm_agpsupport.o 


drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_probe_helper.o \

		drm_plane_helper.o drm_dp_mst_topology.o drm_atomic_helper.o \

		drm_kms_helper_common.o

		drm_kms_helper_common.o drm_dp_dual_mode_helper.o



drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o

drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o

drivers/gpu/drm/amd/acp/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ menu "ACP (Audio CoProcessor) Configuration" 


config DRM_AMD_ACP

       bool "Enable AMD Audio CoProcessor IP support"

       depends on DRM_AMDGPU

       select MFD_CORE

       select PM_GENERIC_DOMAINS if PM

       help

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+2 −0
Original line number Diff line number Diff line
@@ -602,6 +602,8 @@ int amdgpu_sync_wait(struct amdgpu_sync *sync); 
void amdgpu_sync_free(struct amdgpu_sync *sync);

int amdgpu_sync_init(void);

void amdgpu_sync_fini(void);

int amdgpu_fence_slab_init(void);

void amdgpu_fence_slab_fini(void);



/*

 * GART structures, functions & helpers

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

+5 −5
Original line number Diff line number Diff line
@@ -194,6 +194,7 @@ int amdgpu_connector_get_monitor_bpc(struct drm_connector *connector) 
				bpc = 8;

				DRM_DEBUG("%s: HDMI deep color 10 bpc exceeds max tmds clock. Using %d bpc.\n",

					  connector->name, bpc);

			}

		} else if (bpc > 8) {

			/* max_tmds_clock missing, but hdmi spec mandates it for deep color. */

			DRM_DEBUG("%s: Required max tmds clock for HDMI deep color missing. Using 8 bpc.\n",
@@ -201,7 +202,6 @@ int amdgpu_connector_get_monitor_bpc(struct drm_connector *connector) 
			bpc = 8;

		}

	}

	}



	if ((amdgpu_deep_color == 0) && (bpc > 8)) {

		DRM_DEBUG("%s: Deep color disabled. Set amdgpu module param deep_color=1 to enable.\n",