Commit 1ce4200d authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'topic/drm-misc-2015-08-13' of git://anongit.freedesktop.org/drm-intel into drm-next 

Final drm-misc pull for 4.3:
- fbdev emulation Kconfig option for everyone thanks to Archit. It's not
  everything yet bit this is fairly tricky since it spawns all drivers.
- vgaarb & vgaswitcheroo polish from Thierry
- some drm_irq.c cleanups (Thierry)
- struct_mutex crusade from me
- more fbdev panic handling removal
- various things all over in drm core&helpers

* tag 'topic/drm-misc-2015-08-13' of git://anongit.freedesktop.org/drm-intel: (65 commits)
  drm/atomic: Use KMS VBLANK API
  drm/irq: Document return values more consistently
  drm/irq: Make pipe unsigned and name consistent
  drm/irq: Check for valid VBLANK before dereference
  drm/irq: Remove negative CRTC index special-case
  drm/plane: Remove redundant extern
  drm/plane: Use consistent data types for format count
  vga_switcheroo: Remove unnecessary checks
  vga_switcheroo: Wrap overly long lines
  vga_switcheroo: Use pr_fmt()
  vga_switcheroo: Cleanup header comment
  vga_switcheroo: Use pr_*() instead of printk()
  vgaarb: Fix a few checkpatch errors and warnings
  vgaarb: Use vgaarb: prefix consistently in messages
  vgaarb: Stop complaining about absent devices
  drm/atomic: fix null pointer access to mode_fixup callback
  drm/i915: Use CONFIG_DRM_FBDEV_EMULATION
  drm/core: Set mode to NULL when connectors in a set drops to 0.
  drm/atomic: Call ww_acquire_done after check phase is complete
  drm/atomic: Paper over locking WARN in default_state_clear
  ...
parents e5dafc0d d4853630

drivers/gpu/drm/Kconfig

+20 −0
Original line number Diff line number Diff line
@@ -37,9 +37,29 @@ config DRM_KMS_FB_HELPER 
	select FB

	select FRAMEBUFFER_CONSOLE if !EXPERT

	select FRAMEBUFFER_CONSOLE_DETECT_PRIMARY if FRAMEBUFFER_CONSOLE

	select FB_SYS_FOPS

	select FB_SYS_FILLRECT

	select FB_SYS_COPYAREA

	select FB_SYS_IMAGEBLIT

	select FB_CFB_FILLRECT

	select FB_CFB_COPYAREA

	select FB_CFB_IMAGEBLIT

	help

	  FBDEV helpers for KMS drivers.



config DRM_FBDEV_EMULATION

	bool "Enable legacy fbdev support for your modesetting driver"

	depends on DRM

	select DRM_KMS_HELPER

	select DRM_KMS_FB_HELPER

	default y

	help

	  Choose this option if you have a need for the legacy fbdev

	  support. Note that this support also provides the linux console

	  support on top of your modesetting driver.



	  If in doubt, say "Y".



config DRM_LOAD_EDID_FIRMWARE

	bool "Allow to specify an EDID data set instead of probing for it"

	depends on DRM_KMS_HELPER

drivers/gpu/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ drm-$(CONFIG_OF) += drm_of.o 
drm_kms_helper-y := drm_crtc_helper.o drm_dp_helper.o drm_probe_helper.o \

		drm_plane_helper.o drm_dp_mst_topology.o drm_atomic_helper.o

drm_kms_helper-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o

drm_kms_helper-$(CONFIG_DRM_KMS_FB_HELPER) += drm_fb_helper.o

drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o

drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o



obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o

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

+14 −31
Original line number Diff line number Diff line
@@ -53,9 +53,9 @@ static struct fb_ops amdgpufb_ops = { 
	.owner = THIS_MODULE,

	.fb_check_var = drm_fb_helper_check_var,

	.fb_set_par = drm_fb_helper_set_par,

	.fb_fillrect = cfb_fillrect,

	.fb_copyarea = cfb_copyarea,

	.fb_imageblit = cfb_imageblit,

	.fb_fillrect = drm_fb_helper_cfb_fillrect,

	.fb_copyarea = drm_fb_helper_cfb_copyarea,

	.fb_imageblit = drm_fb_helper_cfb_imageblit,

	.fb_pan_display = drm_fb_helper_pan_display,

	.fb_blank = drm_fb_helper_blank,

	.fb_setcmap = drm_fb_helper_setcmap,
@@ -179,7 +179,6 @@ static int amdgpufb_create(struct drm_fb_helper *helper, 
	struct drm_mode_fb_cmd2 mode_cmd;

	struct drm_gem_object *gobj = NULL;

	struct amdgpu_bo *rbo = NULL;

	struct device *device = &adev->pdev->dev;

	int ret;

	unsigned long tmp;
@@ -201,9 +200,9 @@ static int amdgpufb_create(struct drm_fb_helper *helper, 
	rbo = gem_to_amdgpu_bo(gobj);



	/* okay we have an object now allocate the framebuffer */

	info = framebuffer_alloc(0, device);

	if (info == NULL) {

		ret = -ENOMEM;

	info = drm_fb_helper_alloc_fbi(helper);

	if (IS_ERR(info)) {

		ret = PTR_ERR(info);

		goto out_unref;

	}
@@ -212,14 +211,13 @@ static int amdgpufb_create(struct drm_fb_helper *helper, 
	ret = amdgpu_framebuffer_init(adev->ddev, &rfbdev->rfb, &mode_cmd, gobj);

	if (ret) {

		DRM_ERROR("failed to initialize framebuffer %d\n", ret);

		goto out_unref;

		goto out_destroy_fbi;

	}



	fb = &rfbdev->rfb.base;



	/* setup helper */

	rfbdev->helper.fb = fb;

	rfbdev->helper.fbdev = info;



	memset_io(rbo->kptr, 0x0, amdgpu_bo_size(rbo));
@@ -239,11 +237,6 @@ static int amdgpufb_create(struct drm_fb_helper *helper, 
	drm_fb_helper_fill_var(info, &rfbdev->helper, sizes->fb_width, sizes->fb_height);



	/* setup aperture base/size for vesafb takeover */

	info->apertures = alloc_apertures(1);

	if (!info->apertures) {

		ret = -ENOMEM;

		goto out_unref;

	}

	info->apertures->ranges[0].base = adev->ddev->mode_config.fb_base;

	info->apertures->ranges[0].size = adev->mc.aper_size;
@@ -251,13 +244,7 @@ static int amdgpufb_create(struct drm_fb_helper *helper, 


	if (info->screen_base == NULL) {

		ret = -ENOSPC;

		goto out_unref;

	}



	ret = fb_alloc_cmap(&info->cmap, 256, 0);

	if (ret) {

		ret = -ENOMEM;

		goto out_unref;

		goto out_destroy_fbi;

	}



	DRM_INFO("fb mappable at 0x%lX\n",  info->fix.smem_start);
@@ -269,6 +256,8 @@ static int amdgpufb_create(struct drm_fb_helper *helper, 
	vga_switcheroo_client_fb_set(adev->ddev->pdev, info);

	return 0;



out_destroy_fbi:

	drm_fb_helper_release_fbi(helper);

out_unref:

	if (rbo) {
@@ -290,17 +279,10 @@ void amdgpu_fb_output_poll_changed(struct amdgpu_device *adev) 


static int amdgpu_fbdev_destroy(struct drm_device *dev, struct amdgpu_fbdev *rfbdev)

{

	struct fb_info *info;

	struct amdgpu_framebuffer *rfb = &rfbdev->rfb;



	if (rfbdev->helper.fbdev) {

		info = rfbdev->helper.fbdev;



		unregister_framebuffer(info);

		if (info->cmap.len)

			fb_dealloc_cmap(&info->cmap);

		framebuffer_release(info);

	}

	drm_fb_helper_unregister_fbi(&rfbdev->helper);

	drm_fb_helper_release_fbi(&rfbdev->helper);



	if (rfb->obj) {

		amdgpufb_destroy_pinned_object(rfb->obj);
@@ -395,7 +377,8 @@ void amdgpu_fbdev_fini(struct amdgpu_device *adev) 
void amdgpu_fbdev_set_suspend(struct amdgpu_device *adev, int state)

{

	if (adev->mode_info.rfbdev)

		fb_set_suspend(adev->mode_info.rfbdev->helper.fbdev, state);

		drm_fb_helper_set_suspend(&adev->mode_info.rfbdev->helper,

			state);

}



int amdgpu_fbdev_total_size(struct amdgpu_device *adev)

drivers/gpu/drm/armada/armada_fbdev.c

+10 −23
Original line number Diff line number Diff line
@@ -22,9 +22,9 @@ static /*const*/ struct fb_ops armada_fb_ops = { 
	.owner		= THIS_MODULE,

	.fb_check_var	= drm_fb_helper_check_var,

	.fb_set_par	= drm_fb_helper_set_par,

	.fb_fillrect	= cfb_fillrect,

	.fb_copyarea	= cfb_copyarea,

	.fb_imageblit	= cfb_imageblit,

	.fb_fillrect	= drm_fb_helper_cfb_fillrect,

	.fb_copyarea	= drm_fb_helper_cfb_copyarea,

	.fb_imageblit	= drm_fb_helper_cfb_imageblit,

	.fb_pan_display	= drm_fb_helper_pan_display,

	.fb_blank	= drm_fb_helper_blank,

	.fb_setcmap	= drm_fb_helper_setcmap,
@@ -80,18 +80,12 @@ static int armada_fb_create(struct drm_fb_helper *fbh, 
	if (IS_ERR(dfb))

		return PTR_ERR(dfb);



	info = framebuffer_alloc(0, dev->dev);

	if (!info) {

		ret = -ENOMEM;

	info = drm_fb_helper_alloc_fbi(fbh);

	if (IS_ERR(info)) {

		ret = PTR_ERR(info);

		goto err_fballoc;

	}



	ret = fb_alloc_cmap(&info->cmap, 256, 0);

	if (ret) {

		ret = -ENOMEM;

		goto err_fbcmap;

	}



	strlcpy(info->fix.id, "armada-drmfb", sizeof(info->fix.id));

	info->par = fbh;

	info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;
@@ -101,7 +95,7 @@ static int armada_fb_create(struct drm_fb_helper *fbh, 
	info->screen_size = obj->obj.size;

	info->screen_base = ptr;

	fbh->fb = &dfb->fb;

	fbh->fbdev = info;



	drm_fb_helper_fill_fix(info, dfb->fb.pitches[0], dfb->fb.depth);

	drm_fb_helper_fill_var(info, fbh, sizes->fb_width, sizes->fb_height);
@@ -111,8 +105,6 @@ static int armada_fb_create(struct drm_fb_helper *fbh, 


	return 0;



 err_fbcmap:

	framebuffer_release(info);

 err_fballoc:

	dfb->fb.funcs->destroy(&dfb->fb);

	return ret;
@@ -171,6 +163,7 @@ int armada_fbdev_init(struct drm_device *dev) 


	return 0;

 err_fb_setup:

	drm_fb_helper_release_fbi(fbh);

	drm_fb_helper_fini(fbh);

 err_fb_helper:

	priv->fbdev = NULL;
@@ -191,14 +184,8 @@ void armada_fbdev_fini(struct drm_device *dev) 
	struct drm_fb_helper *fbh = priv->fbdev;



	if (fbh) {

		struct fb_info *info = fbh->fbdev;



		if (info) {

			unregister_framebuffer(info);

			if (info->cmap.len)

				fb_dealloc_cmap(&info->cmap);

			framebuffer_release(info);

		}

		drm_fb_helper_unregister_fbi(fbh);

		drm_fb_helper_release_fbi(fbh);



		drm_fb_helper_fini(fbh);

drivers/gpu/drm/ast/ast_fb.c

+17 −31
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void ast_fillrect(struct fb_info *info, 
			 const struct fb_fillrect *rect)

{

	struct ast_fbdev *afbdev = info->par;

	sys_fillrect(info, rect);

	drm_fb_helper_sys_fillrect(info, rect);

	ast_dirty_update(afbdev, rect->dx, rect->dy, rect->width,

			 rect->height);

}
@@ -134,7 +134,7 @@ static void ast_copyarea(struct fb_info *info, 
			 const struct fb_copyarea *area)

{

	struct ast_fbdev *afbdev = info->par;

	sys_copyarea(info, area);

	drm_fb_helper_sys_copyarea(info, area);

	ast_dirty_update(afbdev, area->dx, area->dy, area->width,

			 area->height);

}
@@ -143,7 +143,7 @@ static void ast_imageblit(struct fb_info *info, 
			  const struct fb_image *image)

{

	struct ast_fbdev *afbdev = info->par;

	sys_imageblit(info, image);

	drm_fb_helper_sys_imageblit(info, image);

	ast_dirty_update(afbdev, image->dx, image->dy, image->width,

			 image->height);

}
@@ -193,7 +193,6 @@ static int astfb_create(struct drm_fb_helper *helper, 
	struct drm_framebuffer *fb;

	struct fb_info *info;

	int size, ret;

	struct device *device = &dev->pdev->dev;

	void *sysram;

	struct drm_gem_object *gobj = NULL;

	struct ast_bo *bo = NULL;
@@ -217,40 +216,28 @@ static int astfb_create(struct drm_fb_helper *helper, 
	if (!sysram)

		return -ENOMEM;



	info = framebuffer_alloc(0, device);

	if (!info) {

		ret = -ENOMEM;

		goto out;

	info = drm_fb_helper_alloc_fbi(helper);

	if (IS_ERR(info)) {

		ret = PTR_ERR(info);

		goto err_free_vram;

	}

	info->par = afbdev;



	ret = ast_framebuffer_init(dev, &afbdev->afb, &mode_cmd, gobj);

	if (ret)

		goto out;

		goto err_release_fbi;



	afbdev->sysram = sysram;

	afbdev->size = size;



	fb = &afbdev->afb.base;

	afbdev->helper.fb = fb;

	afbdev->helper.fbdev = info;



	strcpy(info->fix.id, "astdrmfb");



	info->flags = FBINFO_DEFAULT | FBINFO_CAN_FORCE_OUTPUT;

	info->fbops = &astfb_ops;



	ret = fb_alloc_cmap(&info->cmap, 256, 0);

	if (ret) {

		ret = -ENOMEM;

		goto out;

	}



	info->apertures = alloc_apertures(1);

	if (!info->apertures) {

		ret = -ENOMEM;

		goto out;

	}

	info->apertures->ranges[0].base = pci_resource_start(dev->pdev, 0);

	info->apertures->ranges[0].size = pci_resource_len(dev->pdev, 0);
@@ -266,7 +253,11 @@ static int astfb_create(struct drm_fb_helper *helper, 
		      fb->width, fb->height);



	return 0;

out:



err_release_fbi:

	drm_fb_helper_release_fbi(helper);

err_free_vram:

	vfree(afbdev->sysram);

	return ret;

}
@@ -297,15 +288,10 @@ static const struct drm_fb_helper_funcs ast_fb_helper_funcs = { 
static void ast_fbdev_destroy(struct drm_device *dev,

			      struct ast_fbdev *afbdev)

{

	struct fb_info *info;

	struct ast_framebuffer *afb = &afbdev->afb;

	if (afbdev->helper.fbdev) {

		info = afbdev->helper.fbdev;

		unregister_framebuffer(info);

		if (info->cmap.len)

			fb_dealloc_cmap(&info->cmap);

		framebuffer_release(info);

	}



	drm_fb_helper_unregister_fbi(&afbdev->helper);

	drm_fb_helper_release_fbi(&afbdev->helper);



	if (afb->obj) {

		drm_gem_object_unreference_unlocked(afb->obj);
@@ -377,5 +363,5 @@ void ast_fbdev_set_suspend(struct drm_device *dev, int state) 
	if (!ast->fbdev)

		return;



	fb_set_suspend(ast->fbdev->helper.fbdev, state);

	drm_fb_helper_set_suspend(&ast->fbdev->helper, state);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE