Commit 2f7b98d1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2021-04-16' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Daniel Vetter:
 "I pinged the usual suspects, only intel fixes pending"

* tag 'drm-fixes-2021-04-16' of git://anongit.freedesktop.org/drm/drm:
  drm/i915/display/vlv_dsi: Do not skip panel_pwr_cycle_delay when disabling the panel
  drm/i915: Don't zero out the Y plane's watermarks
  drm/i915/dpcd_bl: Don't try vesa interface unless specified by VBT
parents 7e25f40e 4d2e1288

drivers/gpu/drm/i915/display/intel_dp_aux_backlight.c

+0 −1
Original line number Diff line number Diff line
@@ -646,7 +646,6 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *connector) 
			break;

		case INTEL_BACKLIGHT_DISPLAY_DDI:

			try_intel_interface = true;

			try_vesa_interface = true;

			break;

		default:

			return -ENODEV;

drivers/gpu/drm/i915/display/vlv_dsi.c

+2 −2
Original line number Diff line number Diff line
@@ -992,14 +992,14 @@ static void intel_dsi_post_disable(struct intel_atomic_state *state, 
	 * FIXME As we do with eDP, just make a note of the time here

	 * and perform the wait before the next panel power on.

	 */

	intel_dsi_msleep(intel_dsi, intel_dsi->panel_pwr_cycle_delay);

	msleep(intel_dsi->panel_pwr_cycle_delay);

}



static void intel_dsi_shutdown(struct intel_encoder *encoder)

{

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(encoder);



	intel_dsi_msleep(intel_dsi, intel_dsi->panel_pwr_cycle_delay);

	msleep(intel_dsi->panel_pwr_cycle_delay);

}



static bool intel_dsi_get_hw_state(struct intel_encoder *encoder,

drivers/gpu/drm/i915/intel_pm.c

+2 −2
Original line number Diff line number Diff line
@@ -5471,12 +5471,12 @@ static int icl_build_plane_wm(struct intel_crtc_state *crtc_state, 
	struct skl_plane_wm *wm = &crtc_state->wm.skl.raw.planes[plane_id];

	int ret;



	memset(wm, 0, sizeof(*wm));



	/* Watermarks calculated in master */

	if (plane_state->planar_slave)

		return 0;



	memset(wm, 0, sizeof(*wm));



	if (plane_state->planar_linked_plane) {

		const struct drm_framebuffer *fb = plane_state->hw.fb;

		enum plane_id y_plane_id = plane_state->planar_linked_plane->id;