Merge tag 'drm-intel-next-fixes-2020-10-15' of... (40b99050) · Commits · 戴 / test

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2742,7 +2742,7 @@ tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, int link_clock,
		u32 n_entries, val, ln, dpcnt_mask, dpcnt_val;
		int rate = 0;

		if (type == INTEL_OUTPUT_HDMI) {
		if (type != INTEL_OUTPUT_HDMI) {
		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);

		rate = intel_dp->link_rate;

+5 −12

Original line number	Diff line number	Diff line
		@@ -4093,8 +4093,7 @@ static int skl_check_ccs_aux_surface(struct intel_plane_state *plane_state)
		int skl_check_plane_surface(struct intel_plane_state *plane_state)
		{
		const struct drm_framebuffer *fb = plane_state->hw.fb;
		int ret;
		bool needs_aux = false;
		int ret, i;

		ret = intel_plane_compute_gtt(plane_state);
		if (ret)
		@@ -4108,7 +4107,6 @@ int skl_check_plane_surface(struct intel_plane_state *plane_state)
		* it.
		*/
		if (is_ccs_modifier(fb->modifier)) {
		needs_aux = true;
		ret = skl_check_ccs_aux_surface(plane_state);
		if (ret)
		return ret;
		@@ -4116,21 +4114,16 @@ int skl_check_plane_surface(struct intel_plane_state *plane_state)

		if (intel_format_info_is_yuv_semiplanar(fb->format,
		fb->modifier)) {
		needs_aux = true;
		ret = skl_check_nv12_aux_surface(plane_state);
		if (ret)
		return ret;
		}

		if (!needs_aux) {
		int i;

		for (i = 1; i < fb->format->num_planes; i++) {
		for (i = fb->format->num_planes; i < ARRAY_SIZE(plane_state->color_plane); i++) {
		plane_state->color_plane[i].offset = ~0xfff;
		plane_state->color_plane[i].x = 0;
		plane_state->color_plane[i].y = 0;
		}
		}

		ret = skl_check_main_surface(plane_state);
		if (ret)