Commit bfe632f6 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2022-09-01' of... 

Merge tag 'drm-intel-fixes-2022-09-01' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Fix for a null pointer dereference (Lukasz)
- HDMI related quirk for ECS Liva Q2 with GLK graphics (Diego)
- Skip wm/ddb readout for disabled pipes (Ville)

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YxC3GmSOpDiZTdIJ@intel.com
parents d7df5e28 0211c2a0

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

+9 −7
Original line number Diff line number Diff line
@@ -404,15 +404,17 @@ static int tgl_get_bw_info(struct drm_i915_private *dev_priv, const struct intel 
		int clpchgroup;

		int j;



		if (i < num_groups - 1)

			bi_next = &dev_priv->max_bw[i + 1];



		clpchgroup = (sa->deburst * qi.deinterleave / num_channels) << i;



		if (i < num_groups - 1 && clpchgroup < clperchgroup)

			bi_next->num_planes = (ipqdepth - clpchgroup) / clpchgroup + 1;

		if (i < num_groups - 1) {

			bi_next = &dev_priv->max_bw[i + 1];



			if (clpchgroup < clperchgroup)

				bi_next->num_planes = (ipqdepth - clpchgroup) /

						       clpchgroup + 1;

			else

				bi_next->num_planes = 0;

		}



		bi->num_qgv_points = qi.num_points;

		bi->num_psf_gv_points = qi.num_psf_points;

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

+3 −0
Original line number Diff line number Diff line
@@ -191,6 +191,9 @@ static struct intel_quirk intel_quirks[] = { 
	/* ASRock ITX*/

	{ 0x3185, 0x1849, 0x2212, quirk_increase_ddi_disabled_time },

	{ 0x3184, 0x1849, 0x2212, quirk_increase_ddi_disabled_time },

	/* ECS Liva Q2 */

	{ 0x3185, 0x1019, 0xa94d, quirk_increase_ddi_disabled_time },

	{ 0x3184, 0x1019, 0xa94d, quirk_increase_ddi_disabled_time },

};



void intel_init_quirks(struct drm_i915_private *i915)

drivers/gpu/drm/i915/intel_pm.c

+7 −1
Original line number Diff line number Diff line
@@ -6561,6 +6561,9 @@ void skl_wm_get_hw_state(struct drm_i915_private *dev_priv) 
		enum plane_id plane_id;

		u8 slices;



		memset(&crtc_state->wm.skl.optimal, 0,

		       sizeof(crtc_state->wm.skl.optimal));

		if (crtc_state->hw.active)

			skl_pipe_wm_get_hw_state(crtc, &crtc_state->wm.skl.optimal);

		crtc_state->wm.skl.raw = crtc_state->wm.skl.optimal;
@@ -6572,6 +6575,9 @@ void skl_wm_get_hw_state(struct drm_i915_private *dev_priv) 
			struct skl_ddb_entry *ddb_y =

				&crtc_state->wm.skl.plane_ddb_y[plane_id];



			if (!crtc_state->hw.active)

				continue;



			skl_ddb_get_hw_plane_state(dev_priv, crtc->pipe,

						   plane_id, ddb, ddb_y);