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

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

Merge tag 'drm-misc-next-2019-03-28-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 5.2:

UAPI Changes:
- Remove unused DRM_DISPLAY_INFO_LEN (Ville)

Cross-subsystem Changes:
- None

Core Changes:
- Fix compilation when CONFIG_FBDEV not selected (Daniel)
- fbdev: Make skip_vt_switch default (Daniel)
- Merge fb_helper_fill_fix, fb_helper_fill_var into fb_helper_fill_info (Daniel)
- Remove unused fields in connector, display_info, and edid_quirks (Ville)

Driver Changes:
- virtio: package function args in virtio_gpu_object_params (Gerd)
- vkms: Fix potential NULL-dereference bug (Kangjie)

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

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190328183045.GA44823@art_vandelay
parents 23370918 530b2842

Documentation/gpu/kms-properties.csv

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ Owner Module/Drivers,Group,Property Name,Type,Property Values,Object attached,De 
,Virtual GPU,“suggested X”,RANGE,"Min=0, Max=0xffffffff",Connector,property to suggest an X offset for a connector

,,“suggested Y”,RANGE,"Min=0, Max=0xffffffff",Connector,property to suggest an Y offset for a connector

,Optional,"""aspect ratio""",ENUM,"{ ""None"", ""4:3"", ""16:9"" }",Connector,TDB

,Optional,"""content type""",ENUM,"{ ""No Data"", ""Graphics"", ""Photo"", ""Cinema"", ""Game"" }",Connector,TBD

i915,Generic,"""Broadcast RGB""",ENUM,"{ ""Automatic"", ""Full"", ""Limited 16:235"" }",Connector,"When this property is set to Limited 16:235 and CTM is set, the hardware will be programmed with the result of the multiplication of CTM by the limited range matrix to ensure the pixels normaly in the range 0..1.0 are remapped to the range 16/255..235/255."

,,“audio”,ENUM,"{ ""force-dvi"", ""off"", ""auto"", ""on"" }",Connector,TBD

,SDVO-TV,“mode”,ENUM,"{ ""NTSC_M"", ""NTSC_J"", ""NTSC_443"", ""PAL_B"" } etc.",Connector,TBD

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

+8 −17
Original line number Diff line number Diff line
@@ -49,12 +49,11 @@ 
static int

amdgpufb_open(struct fb_info *info, int user)

{

	struct amdgpu_fbdev *rfbdev = info->par;

	struct amdgpu_device *adev = rfbdev->adev;

	int ret = pm_runtime_get_sync(adev->ddev->dev);

	struct drm_fb_helper *fb_helper = info->par;

	int ret = pm_runtime_get_sync(fb_helper->dev->dev);

	if (ret < 0 && ret != -EACCES) {

		pm_runtime_mark_last_busy(adev->ddev->dev);

		pm_runtime_put_autosuspend(adev->ddev->dev);

		pm_runtime_mark_last_busy(fb_helper->dev->dev);

		pm_runtime_put_autosuspend(fb_helper->dev->dev);

		return ret;

	}

	return 0;
@@ -63,11 +62,10 @@ amdgpufb_open(struct fb_info *info, int user) 
static int

amdgpufb_release(struct fb_info *info, int user)

{

	struct amdgpu_fbdev *rfbdev = info->par;

	struct amdgpu_device *adev = rfbdev->adev;

	struct drm_fb_helper *fb_helper = info->par;



	pm_runtime_mark_last_busy(adev->ddev->dev);

	pm_runtime_put_autosuspend(adev->ddev->dev);

	pm_runtime_mark_last_busy(fb_helper->dev->dev);

	pm_runtime_put_autosuspend(fb_helper->dev->dev);

	return 0;

}
@@ -233,9 +231,6 @@ static int amdgpufb_create(struct drm_fb_helper *helper, 
		goto out;

	}



	info->par = rfbdev;

	info->skip_vt_switch = true;



	ret = amdgpu_display_framebuffer_init(adev->ddev, &rfbdev->rfb,

					      &mode_cmd, gobj);

	if (ret) {
@@ -248,10 +243,6 @@ static int amdgpufb_create(struct drm_fb_helper *helper, 
	/* setup helper */

	rfbdev->helper.fb = fb;



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



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



	info->fbops = &amdgpufb_ops;



	tmp = amdgpu_bo_gpu_offset(abo) - adev->gmc.vram_start;
@@ -260,7 +251,7 @@ static int amdgpufb_create(struct drm_fb_helper *helper, 
	info->screen_base = amdgpu_bo_kptr(abo);

	info->screen_size = amdgpu_bo_size(abo);



	drm_fb_helper_fill_var(info, &rfbdev->helper, sizes->fb_width, sizes->fb_height);

	drm_fb_helper_fill_info(info, &rfbdev->helper, sizes);



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

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

drivers/gpu/drm/armada/armada_fbdev.c

+1 −5
Original line number Diff line number Diff line
@@ -78,8 +78,6 @@ static int armada_fbdev_create(struct drm_fb_helper *fbh, 
		goto err_fballoc;

	}



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

	info->par = fbh;

	info->fbops = &armada_fb_ops;

	info->fix.smem_start = obj->phys_addr;

	info->fix.smem_len = obj->obj.size;
@@ -87,9 +85,7 @@ static int armada_fbdev_create(struct drm_fb_helper *fbh, 
	info->screen_base = ptr;

	fbh->fb = &dfb->fb;



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

			       dfb->fb.format->depth);

	drm_fb_helper_fill_var(info, fbh, sizes->fb_width, sizes->fb_height);

	drm_fb_helper_fill_info(info, fbh, sizes);



	DRM_DEBUG_KMS("allocated %dx%d %dbpp fb: 0x%08llx\n",

		dfb->fb.width, dfb->fb.height, dfb->fb.format->cpp[0] * 8,

drivers/gpu/drm/ast/ast_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ struct ast_framebuffer { 
};



struct ast_fbdev {

	struct drm_fb_helper helper;

	struct drm_fb_helper helper; /* must be first */

	struct ast_framebuffer afb;

	void *sysram;

	int size;

drivers/gpu/drm/ast/ast_fb.c

+1 −6
Original line number Diff line number Diff line
@@ -217,8 +217,6 @@ static int astfb_create(struct drm_fb_helper *helper, 
		ret = PTR_ERR(info);

		goto out;

	}

	info->par = afbdev;



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

	if (ret)

		goto out;
@@ -229,15 +227,12 @@ static int astfb_create(struct drm_fb_helper *helper, 
	fb = &afbdev->afb.base;

	afbdev->helper.fb = fb;



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



	info->fbops = &astfb_ops;



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

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



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

	drm_fb_helper_fill_var(info, &afbdev->helper, sizes->fb_width, sizes->fb_height);

	drm_fb_helper_fill_info(info, &afbdev->helper, sizes);



	info->screen_base = sysram;

	info->screen_size = size;