Short summary of fixes pull:

A number of simple fixes throughout the DRM codebase.
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEchf7rIzpz2NEoWjlaA3BHVMLeiMFAmPbcJYACgkQaA3BHVML
 eiP7fgf7BVwC7M4B1eRwME4DOXsDfZ3Ku0AWWeKGe9nl1ueNuzHsG2Z0xeRdcSZV
 zinKrygo/Rg+A19/dk0f0kinVzn/vEo6wlUvse37Tzz6mo2lT87tKqMaWHScU30y
 9/GB6JmM9tAk7VdiNQKIVbgGjdhbj+TgkQb64AF4s7okwGXblZe4MFLc2TSBx4j/
 BEWVwp58pcSRxJ0OSSqFNdNlLs4MnYmQq6AQ1ZY6RZkQBB+mQ0xbMi5kY31wINAc
 aIYtEZlo4f2Us6ZUsVBslMYn7VbTNxCRP5yjJZ4LmZFqfuvqIsdYBGk5Pr7QwpxE
 ZKKRR9/5pL+810EwS+19ufUXOU6XHw==
 =2fjd
 -----END PGP SIGNATURE-----

Merge tag 'drm-misc-next-fixes-2023-02-02' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

Short summary of fixes pull:

A number of simple fixes throughout the DRM codebase.

Signed-off-by: Dave Airlie <airlied@redhat.com>

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/Y9twz2rqOP2+LjaT@linux-uq9g
This commit is contained in:
Dave Airlie 2023-02-03 13:28:21 +10:00
commit 1c0db6d84f
6 changed files with 12 additions and 15 deletions

View File

@ -6,9 +6,10 @@
# as, but not limited to, Machine-Learning and Deep-Learning acceleration
# devices
#
if DRM
menuconfig DRM_ACCEL
bool "Compute Acceleration Framework"
depends on DRM
help
Framework for device drivers of compute acceleration devices, such
as, but not limited to, Machine-Learning and Deep-Learning
@ -25,3 +26,5 @@ menuconfig DRM_ACCEL
source "drivers/accel/habanalabs/Kconfig"
source "drivers/accel/ivpu/Kconfig"
endif

View File

@ -356,7 +356,6 @@ int ivpu_shutdown(struct ivpu_device *vdev)
static const struct file_operations ivpu_fops = {
.owner = THIS_MODULE,
.mmap = drm_gem_mmap,
DRM_ACCEL_FOPS,
};

View File

@ -167,7 +167,7 @@ struct dma_fence *dma_fence_allocate_private_stub(void)
0, 0);
set_bit(DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT,
&dma_fence_stub.flags);
&fence->flags);
dma_fence_signal(fence);

View File

@ -415,7 +415,7 @@ void drm_gem_shmem_vunmap(struct drm_gem_shmem_object *shmem,
}
EXPORT_SYMBOL(drm_gem_shmem_vunmap);
static struct drm_gem_shmem_object *
static int
drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
struct drm_device *dev, size_t size,
uint32_t *handle)
@ -425,7 +425,7 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
shmem = drm_gem_shmem_create(dev, size);
if (IS_ERR(shmem))
return shmem;
return PTR_ERR(shmem);
/*
* Allocate an id of idr table where the obj is registered
@ -434,10 +434,8 @@ drm_gem_shmem_create_with_handle(struct drm_file *file_priv,
ret = drm_gem_handle_create(file_priv, &shmem->base, handle);
/* drop reference from allocate - handle holds it now. */
drm_gem_object_put(&shmem->base);
if (ret)
return ERR_PTR(ret);
return shmem;
return ret;
}
/* Update madvise status, returns true if not purged, else
@ -520,7 +518,6 @@ int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,
struct drm_mode_create_dumb *args)
{
u32 min_pitch = DIV_ROUND_UP(args->width * args->bpp, 8);
struct drm_gem_shmem_object *shmem;
if (!args->pitch || !args->size) {
args->pitch = min_pitch;
@ -533,9 +530,7 @@ int drm_gem_shmem_dumb_create(struct drm_file *file, struct drm_device *dev,
args->size = PAGE_ALIGN(args->pitch * args->height);
}
shmem = drm_gem_shmem_create_with_handle(file, dev, args->size, &args->handle);
return PTR_ERR_OR_ZERO(shmem);
return drm_gem_shmem_create_with_handle(file, dev, args->size, &args->handle);
}
EXPORT_SYMBOL_GPL(drm_gem_shmem_dumb_create);

View File

@ -719,8 +719,8 @@ static struct simpledrm_device *simpledrm_device_create(struct drm_driver *drv,
drm_dbg(dev, "using system memory framebuffer at %pr\n", mem);
screen_base = devm_memremap(dev->dev, mem->start, resource_size(mem), MEMREMAP_WC);
if (!screen_base)
return ERR_PTR(-ENOMEM);
if (IS_ERR(screen_base))
return screen_base;
iosys_map_set_vaddr(&sdev->screen_base, screen_base);
} else {

View File

@ -108,7 +108,7 @@ struct drm_client_dev {
struct drm_mode_set *modesets;
/**
* @hotplug failed:
* @hotplug_failed:
*
* Set by client hotplug helpers if the hotplugging failed
* before. It is usually not tried again.