diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-12-08 01:17:53 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-12-08 01:17:53 +0300 |
| commit | 90eeb3aa34831ff3d031589c0c24892eb8a07e51 (patch) | |
| tree | 4e9fcad51eea2a4122761836d19af88efe586277 /drivers | |
| parent | 96980844bb4b74d2e7ce93d907670658e39a3992 (diff) | |
| parent | 510353a63796d467b41237ab4f136136f68c297d (diff) | |
| download | linux-90eeb3aa34831ff3d031589c0c24892eb8a07e51.tar.xz | |
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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_bo.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index 5dd3f1cd074a..a8905049b9da 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c @@ -946,7 +946,9 @@ static int analogix_dp_get_modes(struct drm_connector *connector) return 0; } + pm_runtime_get_sync(dp->dev); edid = drm_get_edid(connector, &dp->aux.ddc); + pm_runtime_put(dp->dev); if (edid) { drm_mode_connector_update_edid_property(&dp->connector, edid); diff --git a/drivers/gpu/drm/vc4/vc4_bo.c b/drivers/gpu/drm/vc4/vc4_bo.c index 4ae45d7dac42..2decc8e2c79f 100644 --- a/drivers/gpu/drm/vc4/vc4_bo.c +++ b/drivers/gpu/drm/vc4/vc4_bo.c @@ -637,7 +637,8 @@ int vc4_bo_inc_usecnt(struct vc4_bo *bo) mutex_lock(&bo->madv_lock); switch (bo->madv) { case VC4_MADV_WILLNEED: - refcount_inc(&bo->usecnt); + if (!refcount_inc_not_zero(&bo->usecnt)) + refcount_set(&bo->usecnt, 1); ret = 0; break; case VC4_MADV_DONTNEED: |