Merge tag 'v5.8' into drm-next
authorDave Airlie <airlied@redhat.com>
Tue, 11 Aug 2020 01:58:31 +0000 (11:58 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 11 Aug 2020 01:58:31 +0000 (11:58 +1000)
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 <airlied@redhat.com>
16 files changed:
1  2 
MAINTAINERS
drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/bochs/bochs_kms.c
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
drivers/gpu/drm/bridge/nwl-dsi.c
drivers/gpu/drm/drm_fb_helper.c
drivers/gpu/drm/drm_gem.c
drivers/gpu/drm/drm_mipi_dbi.c
drivers/gpu/drm/drm_of.c
drivers/gpu/drm/nouveau/dispnv50/disp.c
drivers/gpu/drm/nouveau/nouveau_display.c
drivers/gpu/drm/nouveau/nouveau_fbcon.c
drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c
drivers/gpu/drm/panel/panel-simple.c
include/drm/drm_mode_config.h

diff --cc MAINTAINERS
Simple merge
Simple merge
index f45cdca9cce57106fcf2628b43102e94e5d97310,648eb23d078481069e54fa30ed42433b4f749464..a0d392c338da5241744835e0ed3d89ba14440e8b
@@@ -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);
  
Simple merge
Simple merge
index a57f5379fc08000fb071308490be4996e6557d56,ee2058ad482c492f08c2b2655ebfde8c06bb6359..d4e7c8370565ed12b3ec6ca8542457707e11b6bb
@@@ -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;
  }
  
  /**
Simple merge
Simple merge
Simple merge
Simple merge