Merge branch 'server-fixes' into drm-next (d2dbaaf6) · Commits · e / devices / android_kernel_sony_msm8994

drivers/gpu/drm/ast/ast_drv.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -241,6 +241,8 @@ struct ast_fbdev {
	void *sysram;		void *sysram;
	int size;		int size;
	struct ttm_bo_kmap_obj mapping;		struct ttm_bo_kmap_obj mapping;
			int x1, y1, x2, y2; /* dirty rect */
			spinlock_t dirty_lock;
	};		};

	#define to_ast_crtc(x) container_of(x, struct ast_crtc, base)		#define to_ast_crtc(x) container_of(x, struct ast_crtc, base)

drivers/gpu/drm/ast/ast_fb.c

+40 −3

Original line number	Original line	Diff line number	Diff line
	@@ -53,16 +53,52 @@ static void ast_dirty_update(struct ast_fbdev *afbdev,
	int bpp = (afbdev->afb.base.bits_per_pixel + 7)/8;		int bpp = (afbdev->afb.base.bits_per_pixel + 7)/8;
	int ret;		int ret;
	bool unmap = false;		bool unmap = false;
			bool store_for_later = false;
			int x2, y2;
			unsigned long flags;

	obj = afbdev->afb.obj;		obj = afbdev->afb.obj;
	bo = gem_to_ast_bo(obj);		bo = gem_to_ast_bo(obj);

			/*
			* try and reserve the BO, if we fail with busy
			* then the BO is being moved and we should
			* store up the damage until later.
			*/
	ret = ast_bo_reserve(bo, true);		ret = ast_bo_reserve(bo, true);
	if (ret) {		if (ret) {
	DRM_ERROR("failed to reserve fb bo\n");		if (ret != -EBUSY)
	return;		return;

			store_for_later = true;
	}		}

			x2 = x + width - 1;
			y2 = y + height - 1;
			spin_lock_irqsave(&afbdev->dirty_lock, flags);

			if (afbdev->y1 < y)
			y = afbdev->y1;
			if (afbdev->y2 > y2)
			y2 = afbdev->y2;
			if (afbdev->x1 < x)
			x = afbdev->x1;
			if (afbdev->x2 > x2)
			x2 = afbdev->x2;

			if (store_for_later) {
			afbdev->x1 = x;
			afbdev->x2 = x2;
			afbdev->y1 = y;
			afbdev->y2 = y2;
			spin_unlock_irqrestore(&afbdev->dirty_lock, flags);
			return;
			}

			afbdev->x1 = afbdev->y1 = INT_MAX;
			afbdev->x2 = afbdev->y2 = 0;
			spin_unlock_irqrestore(&afbdev->dirty_lock, flags);

	if (!bo->kmap.virtual) {		if (!bo->kmap.virtual) {
	ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &bo->kmap);		ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &bo->kmap);
	if (ret) {		if (ret) {
	@@ -72,10 +108,10 @@ static void ast_dirty_update(struct ast_fbdev *afbdev,
	}		}
	unmap = true;		unmap = true;
	}		}
	for (i = y; i < y + height; i++) {		for (i = y; i <= y2; i++) {
	/* assume equal stride for now */		/* assume equal stride for now */
	src_offset = dst_offset = i * afbdev->afb.base.pitches[0] + (x * bpp);		src_offset = dst_offset = i * afbdev->afb.base.pitches[0] + (x * bpp);
	memcpy_toio(bo->kmap.virtual + src_offset, afbdev->sysram + src_offset, width * bpp);		memcpy_toio(bo->kmap.virtual + src_offset, afbdev->sysram + src_offset, (x2 - x + 1) * bpp);

	}		}
	if (unmap)		if (unmap)
	@@ -292,6 +328,7 @@ int ast_fbdev_init(struct drm_device *dev)

	ast->fbdev = afbdev;		ast->fbdev = afbdev;
	afbdev->helper.funcs = &ast_fb_helper_funcs;		afbdev->helper.funcs = &ast_fb_helper_funcs;
			spin_lock_init(&afbdev->dirty_lock);
	ret = drm_fb_helper_init(dev, &afbdev->helper,		ret = drm_fb_helper_init(dev, &afbdev->helper,
	1, 1);		1, 1);
	if (ret) {		if (ret) {

drivers/gpu/drm/ast/ast_ttm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -316,7 +316,7 @@ int ast_bo_reserve(struct ast_bo *bo, bool no_wait)

	ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, 0);		ret = ttm_bo_reserve(&bo->bo, true, no_wait, false, 0);
	if (ret) {		if (ret) {
	if (ret != -ERESTARTSYS)		if (ret != -ERESTARTSYS && ret != -EBUSY)
	DRM_ERROR("reserve failed %p\n", bo);		DRM_ERROR("reserve failed %p\n", bo);
	return ret;		return ret;
	}		}

drivers/gpu/drm/cirrus/cirrus_drv.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -154,6 +154,8 @@ struct cirrus_fbdev {
	struct list_head fbdev_list;		struct list_head fbdev_list;
	void *sysram;		void *sysram;
	int size;		int size;
			int x1, y1, x2, y2; /* dirty rect */
			spinlock_t dirty_lock;
	};		};

	struct cirrus_bo {		struct cirrus_bo {

drivers/gpu/drm/cirrus/cirrus_fbdev.c

+37 −1

Original line number	Original line	Diff line number	Diff line
	@@ -27,16 +27,51 @@ static void cirrus_dirty_update(struct cirrus_fbdev *afbdev,
	int bpp = (afbdev->gfb.base.bits_per_pixel + 7)/8;		int bpp = (afbdev->gfb.base.bits_per_pixel + 7)/8;
	int ret;		int ret;
	bool unmap = false;		bool unmap = false;
			bool store_for_later = false;
			int x2, y2;
			unsigned long flags;

	obj = afbdev->gfb.obj;		obj = afbdev->gfb.obj;
	bo = gem_to_cirrus_bo(obj);		bo = gem_to_cirrus_bo(obj);

			/*
			* try and reserve the BO, if we fail with busy
			* then the BO is being moved and we should
			* store up the damage until later.
			*/
	ret = cirrus_bo_reserve(bo, true);		ret = cirrus_bo_reserve(bo, true);
	if (ret) {		if (ret) {
	DRM_ERROR("failed to reserve fb bo\n");		if (ret != -EBUSY)
			return;
			store_for_later = true;
			}

			x2 = x + width - 1;
			y2 = y + height - 1;
			spin_lock_irqsave(&afbdev->dirty_lock, flags);

			if (afbdev->y1 < y)
			y = afbdev->y1;
			if (afbdev->y2 > y2)
			y2 = afbdev->y2;
			if (afbdev->x1 < x)
			x = afbdev->x1;
			if (afbdev->x2 > x2)
			x2 = afbdev->x2;

			if (store_for_later) {
			afbdev->x1 = x;
			afbdev->x2 = x2;
			afbdev->y1 = y;
			afbdev->y2 = y2;
			spin_unlock_irqrestore(&afbdev->dirty_lock, flags);
	return;		return;
	}		}

			afbdev->x1 = afbdev->y1 = INT_MAX;
			afbdev->x2 = afbdev->y2 = 0;
			spin_unlock_irqrestore(&afbdev->dirty_lock, flags);

	if (!bo->kmap.virtual) {		if (!bo->kmap.virtual) {
	ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &bo->kmap);		ret = ttm_bo_kmap(&bo->bo, 0, bo->bo.num_pages, &bo->kmap);
	if (ret) {		if (ret) {
	@@ -268,6 +303,7 @@ int cirrus_fbdev_init(struct cirrus_device *cdev)

	cdev->mode_info.gfbdev = gfbdev;		cdev->mode_info.gfbdev = gfbdev;
	gfbdev->helper.funcs = &cirrus_fb_helper_funcs;		gfbdev->helper.funcs = &cirrus_fb_helper_funcs;
			spin_lock_init(&gfbdev->dirty_lock);

	ret = drm_fb_helper_init(cdev->dev, &gfbdev->helper,		ret = drm_fb_helper_init(cdev->dev, &gfbdev->helper,
	cdev->num_crtc, CIRRUSFB_CONN_LIMIT);		cdev->num_crtc, CIRRUSFB_CONN_LIMIT);