Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+10
-8
+3
-3
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+3
-3
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
···
1662
1662
GEM_BUG_ON(intel_context_is_parent(cn));
1663
1663
1664
1664
list_del_init(&cn->guc_id.link);
1665
-
ce->guc_id = cn->guc_id;
1665
+
ce->guc_id.id = cn->guc_id.id;
1666
1666
1667
-
spin_lock(&ce->guc_state.lock);
1667
+
spin_lock(&cn->guc_state.lock);
1668
1668
clr_context_registered(cn);
1669
-
spin_unlock(&ce->guc_state.lock);
1669
+
spin_unlock(&cn->guc_state.lock);
1670
1670
1671
1671
set_context_guc_id_invalid(cn);
1672
1672
+7
-5
drivers/gpu/drm/mediatek/mtk_hdmi.c
+7
-5
drivers/gpu/drm/mediatek/mtk_hdmi.c
···
1224
1224
return MODE_BAD;
1225
1225
}
1226
1226
1227
-
if (hdmi->conf->cea_modes_only && !drm_match_cea_mode(mode))
1228
-
return MODE_BAD;
1227
+
if (hdmi->conf) {
1228
+
if (hdmi->conf->cea_modes_only && !drm_match_cea_mode(mode))
1229
+
return MODE_BAD;
1229
1230
1230
-
if (hdmi->conf->max_mode_clock &&
1231
-
mode->clock > hdmi->conf->max_mode_clock)
1232
-
return MODE_CLOCK_HIGH;
1231
+
if (hdmi->conf->max_mode_clock &&
1232
+
mode->clock > hdmi->conf->max_mode_clock)
1233
+
return MODE_CLOCK_HIGH;
1234
+
}
1233
1235
1234
1236
if (mode->clock < 27000)
1235
1237
return MODE_CLOCK_LOW;