Commit 5e0e7a40 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2021-06-24' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



A DMA address check for nouveau, an error code return fix for kmb, fixes
to wait for a moving fence after pinning the BO for amdgpu, nouveau and
radeon, a crtc and async page flip fix for atmel-hlcdc and a cpu hang
fix for vc4.

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

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20210624190353.wyizoil3wqrrxz5d@gilmour
parents efea0c12 d3300991

drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c

+13 −1
Original line number Diff line number Diff line
@@ -214,9 +214,21 @@ static int amdgpu_dma_buf_pin(struct dma_buf_attachment *attach) 
{

	struct drm_gem_object *obj = attach->dmabuf->priv;

	struct amdgpu_bo *bo = gem_to_amdgpu_bo(obj);

	int r;



	/* pin buffer into GTT */

	return amdgpu_bo_pin(bo, AMDGPU_GEM_DOMAIN_GTT);

	r = amdgpu_bo_pin(bo, AMDGPU_GEM_DOMAIN_GTT);

	if (r)

		return r;



	if (bo->tbo.moving) {

		r = dma_fence_wait(bo->tbo.moving, true);

		if (r) {

			amdgpu_bo_unpin(bo);

			return r;

		}

	}

	return 0;

}



/**

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c

+10 −7
Original line number Diff line number Diff line
@@ -232,7 +232,6 @@ static void atmel_hlcdc_crtc_atomic_enable(struct drm_crtc *c, 


	pm_runtime_put_sync(dev->dev);



	drm_crtc_vblank_on(c);

}



#define ATMEL_HLCDC_RGB444_OUTPUT	BIT(0)
@@ -343,8 +342,17 @@ static int atmel_hlcdc_crtc_atomic_check(struct drm_crtc *c, 


static void atmel_hlcdc_crtc_atomic_begin(struct drm_crtc *c,

					  struct drm_atomic_state *state)

{

	drm_crtc_vblank_on(c);

}



static void atmel_hlcdc_crtc_atomic_flush(struct drm_crtc *c,

					  struct drm_atomic_state *state)

{

	struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c);

	unsigned long flags;



	spin_lock_irqsave(&c->dev->event_lock, flags);



	if (c->state->event) {

		c->state->event->pipe = drm_crtc_index(c);
@@ -354,12 +362,7 @@ static void atmel_hlcdc_crtc_atomic_begin(struct drm_crtc *c, 
		crtc->event = c->state->event;

		c->state->event = NULL;

	}

}



static void atmel_hlcdc_crtc_atomic_flush(struct drm_crtc *crtc,

					  struct drm_atomic_state *state)

{

	/* TODO: write common plane control register if available */

	spin_unlock_irqrestore(&c->dev->event_lock, flags);

}



static const struct drm_crtc_helper_funcs lcdc_crtc_helper_funcs = {

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c

+1 −0
Original line number Diff line number Diff line
@@ -593,6 +593,7 @@ static int atmel_hlcdc_dc_modeset_init(struct drm_device *dev) 
	dev->mode_config.max_width = dc->desc->max_width;

	dev->mode_config.max_height = dc->desc->max_height;

	dev->mode_config.funcs = &mode_config_funcs;

	dev->mode_config.async_page_flip = true;



	return 0;

}

drivers/gpu/drm/kmb/kmb_drv.c

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ static int kmb_hw_init(struct drm_device *drm, unsigned long flags) 
	/* Allocate LCD interrupt resources */

	irq_lcd = platform_get_irq(pdev, 0);

	if (irq_lcd < 0) {

		ret = irq_lcd;

		drm_err(&kmb->drm, "irq_lcd not found");

		goto setup_fail;

	}

drivers/gpu/drm/nouveau/nouveau_bo.c

+2 −2
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ nouveau_bo_sync_for_device(struct nouveau_bo *nvbo) 
	struct ttm_tt *ttm_dma = (struct ttm_tt *)nvbo->bo.ttm;

	int i, j;



	if (!ttm_dma)

	if (!ttm_dma || !ttm_dma->dma_address)

		return;

	if (!ttm_dma->pages) {

		NV_DEBUG(drm, "ttm_dma 0x%p: pages NULL\n", ttm_dma);
@@ -582,7 +582,7 @@ nouveau_bo_sync_for_cpu(struct nouveau_bo *nvbo) 
	struct ttm_tt *ttm_dma = (struct ttm_tt *)nvbo->bo.ttm;

	int i, j;



	if (!ttm_dma)

	if (!ttm_dma || !ttm_dma->dma_address)

		return;

	if (!ttm_dma->pages) {

		NV_DEBUG(drm, "ttm_dma 0x%p: pages NULL\n", ttm_dma);