Commit db3f0d8e authored by Dave Airlie's avatar Dave Airlie
Browse files

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



drm-misc-fixes for v5.12-rc4:
- Make ttm_bo_unpin() not wraparound on too many unpins.
- Fix coccicheck warning in omap.

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

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/a0e13bbb-6ba6-ff24-4db8-0e02e605de18@linux.intel.com
parents 1e28eed1 69091154

drivers/gpu/drm/omapdrm/dss/dsi.c

+4 −3
Original line number Diff line number Diff line
@@ -2149,11 +2149,12 @@ static int dsi_vc_send_short(struct dsi_data *dsi, int vc, 
			     const struct mipi_dsi_msg *msg)

{

	struct mipi_dsi_packet pkt;

	int ret;

	u32 r;



	r = mipi_dsi_create_packet(&pkt, msg);

	if (r < 0)

		return r;

	ret = mipi_dsi_create_packet(&pkt, msg);

	if (ret < 0)

		return ret;



	WARN_ON(!dsi_bus_is_locked(dsi));

include/drm/ttm/ttm_bo_api.h

+4 −2
Original line number Diff line number Diff line
@@ -612,9 +612,11 @@ static inline void ttm_bo_pin(struct ttm_buffer_object *bo) 
static inline void ttm_bo_unpin(struct ttm_buffer_object *bo)

{

	dma_resv_assert_held(bo->base.resv);

	WARN_ON_ONCE(!bo->pin_count);

	WARN_ON_ONCE(!kref_read(&bo->kref));

	if (bo->pin_count)

		--bo->pin_count;

	else

		WARN_ON_ONCE(true);

}



int ttm_mem_evict_first(struct ttm_bo_device *bdev,