Commit 95b40115 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'drm-fixes-2021-12-24' of git://anongit.freedesktop.org/drm/drm 

Pull drm fixes from Dave Airlie:
 "Happy Xmas. Nothing major, one mediatek and a couple of i915 locking
  fixes. There might be a few stragglers over next week or so but I
  don't expect much before next release.

  mediatek:
   - NULL pointer check

  i915:
   - guc submission locking fixes"

* tag 'drm-fixes-2021-12-24' of git://anongit.freedesktop.org/drm/drm:
  drm/i915/guc: Only assign guc_id.id when stealing guc_id
  drm/i915/guc: Use correct context lock when callig clr_context_registered
  drm/mediatek: hdmi: Perform NULL pointer check for mtk_hdmi_conf
parents a026fa54 dbfba788

drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c

+3 −3
Original line number Diff line number Diff line
@@ -1662,11 +1662,11 @@ static int steal_guc_id(struct intel_guc *guc, struct intel_context *ce) 
		GEM_BUG_ON(intel_context_is_parent(cn));



		list_del_init(&cn->guc_id.link);

		ce->guc_id = cn->guc_id;

		ce->guc_id.id = cn->guc_id.id;



		spin_lock(&ce->guc_state.lock);

		spin_lock(&cn->guc_state.lock);

		clr_context_registered(cn);

		spin_unlock(&ce->guc_state.lock);

		spin_unlock(&cn->guc_state.lock);



		set_context_guc_id_invalid(cn);

drivers/gpu/drm/mediatek/mtk_hdmi.c

+7 −5
Original line number Diff line number Diff line
@@ -1224,12 +1224,14 @@ static int mtk_hdmi_bridge_mode_valid(struct drm_bridge *bridge, 
			return MODE_BAD;

	}



	if (hdmi->conf) {

		if (hdmi->conf->cea_modes_only && !drm_match_cea_mode(mode))

			return MODE_BAD;



		if (hdmi->conf->max_mode_clock &&

		    mode->clock > hdmi->conf->max_mode_clock)

			return MODE_CLOCK_HIGH;

	}



	if (mode->clock < 27000)

		return MODE_CLOCK_LOW;