From: Dave Airlie Date: Tue, 11 Aug 2020 01:58:31 +0000 (+1000) Subject: Merge tag 'v5.8' into drm-next X-Git-Tag: v5.9-rc1~51^2~4 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/c44264f9f729fd63bd6a81a6ac5cd6cd49af09e5 Merge tag 'v5.8' into drm-next I need to backmerge 5.8 as I've got a bunch of fixes sitting on an rc7 base that I want to land. Signed-off-by: Dave Airlie --- c44264f9f729fd63bd6a81a6ac5cd6cd49af09e5 diff --cc drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index f45cdca9cce5,648eb23d0784..a0d392c338da --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@@ -1280,9 -1223,8 +1280,10 @@@ static int adv7511_probe(struct i2c_cli goto err_unregister_cec; adv7511->bridge.funcs = &adv7511_bridge_funcs; + adv7511->bridge.ops = DRM_BRIDGE_OP_DETECT | DRM_BRIDGE_OP_EDID + | DRM_BRIDGE_OP_HPD; adv7511->bridge.of_node = dev->of_node; + adv7511->bridge.type = DRM_MODE_CONNECTOR_HDMIA; drm_bridge_add(&adv7511->bridge); diff --cc drivers/gpu/drm/drm_gem.c index a57f5379fc08,ee2058ad482c..d4e7c8370565 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@@ -913,7 -901,9 +909,9 @@@ drm_gem_open_ioctl(struct drm_device *d args->handle = handle; args->size = obj->size; - return 0; + err: - drm_gem_object_put_unlocked(obj); ++ drm_gem_object_put(obj); + return ret; } /**