Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2b5adb4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux 

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  vmwgfx: integer overflow in vmw_kms_update_layout_ioctl()
  drm/radeon/kms: fix 2D tiling CS support on EG/CM
  drm/radeon/kms: fix scanout of 2D tiled buffers on EG/CM
  drm: Fix lack of CRTC disable for drm_crtc_helper_set_config(.fb=NULL)
  drm/radeon/kms: add some new pci ids
  drm/radeon/kms: Skip ACPI call to ATIF when possible
  drm/radeon/kms: Hide debugging message
  drm/radeon/kms: add some loop timeouts in pageflip code
  drm/nv50/disp: silence compiler warning
  drm/nouveau: fix oopses caused by clear being called on unpopulated ttms
  drm/nouveau: Keep RAMIN heap within the channel.
  drm/nvd0/disp: fix sor dpms typo, preventing dpms on in some situations
  drm/nvc0/gr: fix TP init for transform feedback offset queries
  drm/nouveau: add dumb ioctl support
parents 0efebaa7 bab9efc2

drivers/gpu/drm/drm_crtc_helper.c

+25 −2
Original line number Diff line number Diff line
@@ -456,6 +456,30 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, 
EXPORT_SYMBOL(drm_crtc_helper_set_mode);





static int

drm_crtc_helper_disable(struct drm_crtc *crtc)

{

	struct drm_device *dev = crtc->dev;

	struct drm_connector *connector;

	struct drm_encoder *encoder;



	/* Decouple all encoders and their attached connectors from this crtc */

	list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {

		if (encoder->crtc != crtc)

			continue;



		list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

			if (connector->encoder != encoder)

				continue;



			connector->encoder = NULL;

		}

	}



	drm_helper_disable_unused_functions(dev);

	return 0;

}



/**

 * drm_crtc_helper_set_config - set a new config from userspace

 * @crtc: CRTC to setup
@@ -510,8 +534,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set) 
				(int)set->num_connectors, set->x, set->y);

	} else {

		DRM_DEBUG_KMS("[CRTC:%d] [NOFB]\n", set->crtc->base.id);

		set->mode = NULL;

		set->num_connectors = 0;

		return drm_crtc_helper_disable(set->crtc);

	}



	dev = set->crtc->dev;

drivers/gpu/drm/nouveau/nouveau_display.c

+45 −0
Original line number Diff line number Diff line
@@ -369,3 +369,48 @@ nouveau_finish_page_flip(struct nouveau_channel *chan, 
	spin_unlock_irqrestore(&dev->event_lock, flags);

	return 0;

}



int

nouveau_display_dumb_create(struct drm_file *file_priv, struct drm_device *dev,

			    struct drm_mode_create_dumb *args)

{

	struct nouveau_bo *bo;

	int ret;



	args->pitch = roundup(args->width * (args->bpp / 8), 256);

	args->size = args->pitch * args->height;

	args->size = roundup(args->size, PAGE_SIZE);



	ret = nouveau_gem_new(dev, args->size, 0, TTM_PL_FLAG_VRAM, 0, 0, &bo);

	if (ret)

		return ret;



	ret = drm_gem_handle_create(file_priv, bo->gem, &args->handle);

	drm_gem_object_unreference_unlocked(bo->gem);

	return ret;

}



int

nouveau_display_dumb_destroy(struct drm_file *file_priv, struct drm_device *dev,

			     uint32_t handle)

{

	return drm_gem_handle_delete(file_priv, handle);

}



int

nouveau_display_dumb_map_offset(struct drm_file *file_priv,

				struct drm_device *dev,

				uint32_t handle, uint64_t *poffset)

{

	struct drm_gem_object *gem;



	gem = drm_gem_object_lookup(dev, file_priv, handle);

	if (gem) {

		struct nouveau_bo *bo = gem->driver_private;

		*poffset = bo->bo.addr_space_offset;

		drm_gem_object_unreference_unlocked(gem);

		return 0;

	}



	return -ENOENT;

}

drivers/gpu/drm/nouveau/nouveau_drv.c

+4 −0
Original line number Diff line number Diff line
@@ -433,6 +433,10 @@ static struct drm_driver driver = { 
	.gem_open_object = nouveau_gem_object_open,

	.gem_close_object = nouveau_gem_object_close,



	.dumb_create = nouveau_display_dumb_create,

	.dumb_map_offset = nouveau_display_dumb_map_offset,

	.dumb_destroy = nouveau_display_dumb_destroy,



	.name = DRIVER_NAME,

	.desc = DRIVER_DESC,

#ifdef GIT_REVISION

drivers/gpu/drm/nouveau/nouveau_drv.h

+6 −0
Original line number Diff line number Diff line
@@ -1418,6 +1418,12 @@ int nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, 
			   struct drm_pending_vblank_event *event);

int nouveau_finish_page_flip(struct nouveau_channel *,

			     struct nouveau_page_flip_state *);

int nouveau_display_dumb_create(struct drm_file *, struct drm_device *,

				struct drm_mode_create_dumb *args);

int nouveau_display_dumb_map_offset(struct drm_file *, struct drm_device *,

				    uint32_t handle, uint64_t *offset);

int nouveau_display_dumb_destroy(struct drm_file *, struct drm_device *,

				 uint32_t handle);



/* nv10_gpio.c */

int nv10_gpio_get(struct drm_device *dev, enum dcb_gpio_tag tag);

drivers/gpu/drm/nouveau/nouveau_object.c

+1 −1
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ nouveau_gpuobj_channel_init_pramin(struct nouveau_channel *chan) 
		return ret;

	}



	ret = drm_mm_init(&chan->ramin_heap, base, size);

	ret = drm_mm_init(&chan->ramin_heap, base, size - base);

	if (ret) {

		NV_ERROR(dev, "Error creating PRAMIN heap: %d\n", ret);

		nouveau_gpuobj_ref(NULL, &chan->ramin);