From: Thomas Zimmermann Date: Thu, 18 Nov 2021 08:36:39 +0000 (+0100) Subject: Merge drm/drm-next into drm-misc-next X-Git-Tag: block-5.17-2022-01-21~94^2~20^2 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a713ca234ea9d946235ac7248995c5fddfd9e523;p=linux-2.6-block.git Merge drm/drm-next into drm-misc-next Backmerging from drm/drm-next for v5.16-rc1. Signed-off-by: Thomas Zimmermann --- a713ca234ea9d946235ac7248995c5fddfd9e523 diff --cc drivers/dma-buf/dma-buf.c index 385cd037325e,6437b2e978fb..602b12d7470d --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@@ -1347,8 -1368,16 +1355,9 @@@ static int dma_buf_debug_show(struct se buf_obj->exp_name, file_inode(buf_obj->file)->i_ino, buf_obj->name ?: ""); + spin_unlock(&buf_obj->name_lock); - dma_resv_for_each_fence(&cursor, buf_obj->resv, true, fence) { - seq_printf(s, "\t%s fence: %s %s %ssignalled\n", - dma_resv_iter_is_exclusive(&cursor) ? - "Exclusive" : "Shared", - fence->ops->get_driver_name(fence), - fence->ops->get_timeline_name(fence), - dma_fence_is_signaled(fence) ? "" : "un"); - } + dma_resv_describe(buf_obj->resv, s); seq_puts(s, "\tAttached Devices:\n"); attach_count = 0; diff --cc drivers/gpu/drm/kmb/kmb_drv.c index 7e1fda9f9a3d,961ac6fb5fcf..ed2424350773 --- a/drivers/gpu/drm/kmb/kmb_drv.c +++ b/drivers/gpu/drm/kmb/kmb_drv.c @@@ -173,11 -172,10 +173,11 @@@ static int kmb_setup_mode_config(struc ret = drmm_mode_config_init(drm); if (ret) return ret; - drm->mode_config.min_width = KMB_MIN_WIDTH; - drm->mode_config.min_height = KMB_MIN_HEIGHT; - drm->mode_config.max_width = KMB_MAX_WIDTH; - drm->mode_config.max_height = KMB_MAX_HEIGHT; + drm->mode_config.min_width = KMB_FB_MIN_WIDTH; + drm->mode_config.min_height = KMB_FB_MIN_HEIGHT; + drm->mode_config.max_width = KMB_FB_MAX_WIDTH; + drm->mode_config.max_height = KMB_FB_MAX_HEIGHT; + drm->mode_config.preferred_depth = 24; drm->mode_config.funcs = &kmb_mode_config_funcs; ret = kmb_setup_crtc(drm); diff --cc drivers/gpu/drm/nouveau/dispnv50/disp.c index 23fa9ecc2296,8e28403ea9b1..ae1f41205520 --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c @@@ -1413,9 -1411,10 +1413,9 @@@ nv50_mstm_prepare(struct nv50_mstm *mst { struct nouveau_drm *drm = nouveau_drm(mstm->outp->base.base.dev); struct drm_encoder *encoder; - int ret; NV_ATOMIC(drm, "%s: mstm prepare\n", mstm->outp->base.base.name); - drm_dp_update_payload_part1(&mstm->mgr); - ret = drm_dp_update_payload_part1(&mstm->mgr, 1); ++ drm_dp_update_payload_part1(&mstm->mgr, 1); drm_for_each_encoder(encoder, mstm->outp->base.base.dev) { if (encoder->encoder_type == DRM_MODE_ENCODER_DPMST) {