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

Commit 4e40f0f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2019-04-26' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Regular drm fixes, nothing too outstanding, I'm guessing Easter was
  slowing people down.

  i915:
   - FEC enable fix
   - BXT display lanes fix

  ttm:
   - fix reinit for reloading drivers regression

  imx:
   - DP CSC fix

  sun4i:
   - module unload/load fix

  vc4:
   - memory leak fix
   - compile fix

  dw-hdmi:
   - rockchip scdc overflow fix

  sched:
   - docs fix

  vmwgfx:
   - dma api layering fix"

* tag 'drm-fixes-2019-04-26' of git://anongit.freedesktop.org/drm/drm:
  drm/bridge: dw-hdmi: fix SCDC configuration for ddc-i2c-bus
  drm/vmwgfx: Fix dma API layer violation
  drm/vc4: Fix compilation error reported by kbuild test bot
  drm/sun4i: Unbind components before releasing DRM and memory
  drm/vc4: Fix memory leak during gpu reset.
  drm/sched: Fix description of drm_sched_stop
  drm/imx: don't skip DP channel disable for background plane
  gpu: ipu-v3: dp: fix CSC handling
  drm/ttm: fix re-init of global structures
  drm/sun4i: Fix component unbinding and component master deletion
  drm/sun4i: Set device driver data at bind time for use in unbind
  drm/sun4i: Add missing drm_atomic_helper_shutdown at driver unbind
  drm/i915: Restore correct bxt_ddi_phy_calc_lane_lat_optim_mask() calculation
  drm/i915: Do not enable FEC without DSC
  drm: bridge: dw-hdmi: Fix overflow workaround for Rockchip SoCs
parents d0473f97 6db71bea

drivers/gpu/drm/bridge/synopsys/dw-hdmi.c

+12 −4
Original line number Diff line number Diff line
@@ -1046,6 +1046,10 @@ static bool dw_hdmi_support_scdc(struct dw_hdmi *hdmi) 
	if (hdmi->version < 0x200a)

		return false;



	/* Disable if no DDC bus */

	if (!hdmi->ddc)

		return false;



	/* Disable if SCDC is not supported, or if an HF-VSDB block is absent */

	if (!display->hdmi.scdc.supported ||

	    !display->hdmi.scdc.scrambling.supported)
@@ -1684,13 +1688,13 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi, 
			 * Source Devices compliant shall set the

			 * Source Version = 1.

			 */

			drm_scdc_readb(&hdmi->i2c->adap, SCDC_SINK_VERSION,

			drm_scdc_readb(hdmi->ddc, SCDC_SINK_VERSION,

				       &bytes);

			drm_scdc_writeb(&hdmi->i2c->adap, SCDC_SOURCE_VERSION,

			drm_scdc_writeb(hdmi->ddc, SCDC_SOURCE_VERSION,

				min_t(u8, bytes, SCDC_MIN_SOURCE_VERSION));



			/* Enabled Scrambling in the Sink */

			drm_scdc_set_scrambling(&hdmi->i2c->adap, 1);

			drm_scdc_set_scrambling(hdmi->ddc, 1);



			/*

			 * To activate the scrambler feature, you must ensure
@@ -1706,7 +1710,7 @@ static void hdmi_av_composer(struct dw_hdmi *hdmi, 
			hdmi_writeb(hdmi, 0, HDMI_FC_SCRAMBLER_CTRL);

			hdmi_writeb(hdmi, (u8)~HDMI_MC_SWRSTZ_TMDSSWRST_REQ,

				    HDMI_MC_SWRSTZ);

			drm_scdc_set_scrambling(&hdmi->i2c->adap, 0);

			drm_scdc_set_scrambling(hdmi->ddc, 0);

		}

	}
@@ -1800,6 +1804,8 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi) 
	 * iteration for others.

	 * The Amlogic Meson GX SoCs (v2.01a) have been identified as needing

	 * the workaround with a single iteration.

	 * The Rockchip RK3288 SoC (v2.00a) and RK3328/RK3399 SoCs (v2.11a) have

	 * been identified as needing the workaround with a single iteration.

	 */



	switch (hdmi->version) {
@@ -1808,7 +1814,9 @@ static void dw_hdmi_clear_overflow(struct dw_hdmi *hdmi) 
		break;

	case 0x131a:

	case 0x132a:

	case 0x200a:

	case 0x201a:

	case 0x211a:

	case 0x212a:

		count = 1;

		break;

drivers/gpu/drm/i915/intel_ddi.c

+4 −2
Original line number Diff line number Diff line
@@ -3862,14 +3862,16 @@ static int intel_ddi_compute_config(struct intel_encoder *encoder, 
		ret = intel_hdmi_compute_config(encoder, pipe_config, conn_state);

	else

		ret = intel_dp_compute_config(encoder, pipe_config, conn_state);

	if (ret)

		return ret;



	if (IS_GEN9_LP(dev_priv) && ret)

	if (IS_GEN9_LP(dev_priv))

		pipe_config->lane_lat_optim_mask =

			bxt_ddi_phy_calc_lane_lat_optim_mask(pipe_config->lane_count);



	intel_ddi_compute_min_voltage_level(dev_priv, pipe_config);



	return ret;

	return 0;



}

drivers/gpu/drm/i915/intel_dp.c

+3 −3
Original line number Diff line number Diff line
@@ -1886,6 +1886,9 @@ static int intel_dp_dsc_compute_config(struct intel_dp *intel_dp, 
	int pipe_bpp;

	int ret;



	pipe_config->fec_enable = !intel_dp_is_edp(intel_dp) &&

		intel_dp_supports_fec(intel_dp, pipe_config);



	if (!intel_dp_supports_dsc(intel_dp, pipe_config))

		return -EINVAL;
@@ -2116,9 +2119,6 @@ intel_dp_compute_config(struct intel_encoder *encoder, 
	if (adjusted_mode->flags & DRM_MODE_FLAG_DBLCLK)

		return -EINVAL;



	pipe_config->fec_enable = !intel_dp_is_edp(intel_dp) &&

				  intel_dp_supports_fec(intel_dp, pipe_config);



	ret = intel_dp_compute_link_config(encoder, pipe_config, conn_state);

	if (ret < 0)

		return ret;

drivers/gpu/drm/imx/ipuv3-crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static void ipu_crtc_disable_planes(struct ipu_crtc *ipu_crtc, 
	if (disable_partial)

		ipu_plane_disable(ipu_crtc->plane[1], true);

	if (disable_full)

		ipu_plane_disable(ipu_crtc->plane[0], false);

		ipu_plane_disable(ipu_crtc->plane[0], true);

}



static void ipu_crtc_atomic_disable(struct drm_crtc *crtc,

drivers/gpu/drm/scheduler/sched_main.c

+1 −2
Original line number Diff line number Diff line
@@ -366,10 +366,9 @@ void drm_sched_increase_karma(struct drm_sched_job *bad) 
EXPORT_SYMBOL(drm_sched_increase_karma);



/**

 * drm_sched_hw_job_reset - stop the scheduler if it contains the bad job

 * drm_sched_stop - stop the scheduler

 *

 * @sched: scheduler instance

 * @bad: bad scheduler job

 *

 */

void drm_sched_stop(struct drm_gpu_scheduler *sched)