Skip to content

Commit 90eeb3a

Browse files
committed
Merge tag 'drm-misc-fixes-2017-12-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes
regression fix for vc4 + rpm stable fix for analogix bridge * tag 'drm-misc-fixes-2017-12-07' of git://anongit.freedesktop.org/drm/drm-misc: drm/bridge: analogix dp: Fix runtime PM state in get_modes() callback drm/vc4: Fix false positive WARN() backtrace on refcount_inc() usage
2 parents 9698084 + 510353a commit 90eeb3a

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

drivers/gpu/drm/bridge/analogix/analogix_dp_core.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,9 @@ static int analogix_dp_get_modes(struct drm_connector *connector)
946946
return 0;
947947
}
948948

949+
pm_runtime_get_sync(dp->dev);
949950
edid = drm_get_edid(connector, &dp->aux.ddc);
951+
pm_runtime_put(dp->dev);
950952
if (edid) {
951953
drm_mode_connector_update_edid_property(&dp->connector,
952954
edid);

drivers/gpu/drm/vc4/vc4_bo.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,8 @@ int vc4_bo_inc_usecnt(struct vc4_bo *bo)
637637
mutex_lock(&bo->madv_lock);
638638
switch (bo->madv) {
639639
case VC4_MADV_WILLNEED:
640-
refcount_inc(&bo->usecnt);
640+
if (!refcount_inc_not_zero(&bo->usecnt))
641+
refcount_set(&bo->usecnt, 1);
641642
ret = 0;
642643
break;
643644
case VC4_MADV_DONTNEED:

0 commit comments

Comments
 (0)