Commit 040bf2a9 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-fixes-2021-12-23' of... 

Merge tag 'drm-misc-next-fixes-2021-12-23' of git://anongit.freedesktop.org/drm/drm-misc

 into drm-next

Short summary of fixes pull:

 * bridge/lvds: Fix DT bindings
 * vmwgfx: Fix several issues with the recent conversion to GEM

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YcRAH8lYbsoSCeY9@linux-uq9g.fritz.box
parents 4817c37d 5da8b49d

Documentation/devicetree/bindings/display/bridge/lvds-codec.yaml

+22 −21
Original line number Diff line number Diff line
@@ -94,7 +94,8 @@ properties: 


  power-supply: true



if:

allOf:

  - if:

      not:

        properties:

          compatible:
@@ -110,7 +111,7 @@ then: 
                  properties:

                    data-mapping: false



if:

  - if:

      not:

        properties:

          compatible:

drivers/gpu/drm/vmwgfx/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -13,6 +13,5 @@ vmwgfx-y := vmwgfx_execbuf.o vmwgfx_gmr.o vmwgfx_hashtab.o vmwgfx_kms.o vmwgfx_d 
	    vmwgfx_gem.o



vmwgfx-$(CONFIG_DRM_FBDEV_EMULATION) += vmwgfx_fb.o

vmwgfx-$(CONFIG_TRANSPARENT_HUGEPAGE) += vmwgfx_thp.o



obj-$(CONFIG_DRM_VMWGFX) := vmwgfx.o

drivers/gpu/drm/vmwgfx/vmwgfx_bo.c

+5 −3
Original line number Diff line number Diff line
@@ -568,10 +568,12 @@ static int vmw_user_bo_synccpu_release(struct drm_file *filp, 
	struct vmw_buffer_object *vmw_bo;

	int ret = vmw_user_bo_lookup(filp, handle, &vmw_bo);



	if (!ret) {

		if (!(flags & drm_vmw_synccpu_allow_cs)) {

			atomic_dec(&vmw_bo->cpu_writers);

		}

		ttm_bo_put(&vmw_bo->base);

	}



	return ret;

}

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

+0 −8
Original line number Diff line number Diff line
@@ -701,23 +701,15 @@ static int vmw_dma_masks(struct vmw_private *dev_priv) 
static int vmw_vram_manager_init(struct vmw_private *dev_priv)

{

	int ret;

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

	ret = vmw_thp_init(dev_priv);

#else

	ret = ttm_range_man_init(&dev_priv->bdev, TTM_PL_VRAM, false,

				 dev_priv->vram_size >> PAGE_SHIFT);

#endif

	ttm_resource_manager_set_used(ttm_manager_type(&dev_priv->bdev, TTM_PL_VRAM), false);

	return ret;

}



static void vmw_vram_manager_fini(struct vmw_private *dev_priv)

{

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

	vmw_thp_fini(dev_priv);

#else

	ttm_range_man_fini(&dev_priv->bdev, TTM_PL_VRAM);

#endif

}



static int vmw_setup_pci_resources(struct vmw_private *dev,

drivers/gpu/drm/vmwgfx/vmwgfx_drv.h

+0 −8
Original line number Diff line number Diff line
@@ -59,11 +59,8 @@ 
#define VMWGFX_DRIVER_MINOR 20

#define VMWGFX_DRIVER_PATCHLEVEL 0

#define VMWGFX_FIFO_STATIC_SIZE (1024*1024)

#define VMWGFX_MAX_RELOCATIONS 2048

#define VMWGFX_MAX_VALIDATIONS 2048

#define VMWGFX_MAX_DISPLAYS 16

#define VMWGFX_CMD_BOUNCE_INIT_SIZE 32768

#define VMWGFX_ENABLE_SCREEN_TARGET_OTABLE 1



#define VMWGFX_PCI_ID_SVGA2              0x0405

#define VMWGFX_PCI_ID_SVGA3              0x0406
@@ -1564,11 +1561,6 @@ void vmw_bo_dirty_unmap(struct vmw_buffer_object *vbo, 
vm_fault_t vmw_bo_vm_fault(struct vm_fault *vmf);

vm_fault_t vmw_bo_vm_mkwrite(struct vm_fault *vmf);



/* Transparent hugepage support - vmwgfx_thp.c */

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

extern int vmw_thp_init(struct vmw_private *dev_priv);

void vmw_thp_fini(struct vmw_private *dev_priv);

#endif



/**

 * VMW_DEBUG_KMS - Debug output for kernel mode-setting