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

Commit 5fd5d2b7 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

Merge tag 'drm-misc-fixes-2019-08-02' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



drm-misc-fixes for v5.3-rc3:
- Fix some build errors in drm/bridge.
- Do not build i810 on CONFIG_PREEMPTION.
- Fix cache sync on arm in vgem.
- Allow mapping fb in drm_client only when required, and use it to fix bochs fbdev.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/af0dc371-16e0-cee8-0d71-4824d44aa973@linux.intel.com
parents ab35c8a5 58540594

drivers/gpu/drm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ config DRM_R128 
config DRM_I810

	tristate "Intel I810"

	# !PREEMPT because of missing ioctl locking

	depends on DRM && AGP && AGP_INTEL && (!PREEMPT || BROKEN)

	depends on DRM && AGP && AGP_INTEL && (!PREEMPTION || BROKEN)

	help

	  Choose this option if you have an Intel I810 graphics card.  If M is

	  selected, the module will be called i810.  AGP support is required

drivers/gpu/drm/bochs/bochs_kms.c

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ int bochs_kms_init(struct bochs_device *bochs) 
	bochs->dev->mode_config.fb_base = bochs->fb_base;

	bochs->dev->mode_config.preferred_depth = 24;

	bochs->dev->mode_config.prefer_shadow = 0;

	bochs->dev->mode_config.prefer_shadow_fbdev = 1;

	bochs->dev->mode_config.quirk_addfb_prefer_host_byte_order = true;



	bochs->dev->mode_config.funcs = &bochs_mode_funcs;

drivers/gpu/drm/bridge/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ config DRM_DUMB_VGA_DAC 
config DRM_LVDS_ENCODER

	tristate "Transparent parallel to LVDS encoder support"

	depends on OF

	select DRM_KMS_HELPER

	select DRM_PANEL_BRIDGE

	help

	  Support for transparent parallel to LVDS encoders that don't require
@@ -116,9 +117,10 @@ config DRM_THINE_THC63LVD1024 


config DRM_TOSHIBA_TC358764

	tristate "TC358764 DSI/LVDS bridge"

	depends on DRM && DRM_PANEL

	depends on OF

	select DRM_MIPI_DSI

	select DRM_KMS_HELPER

	select DRM_PANEL

	help

	  Toshiba TC358764 DSI/LVDS bridge driver.

drivers/gpu/drm/drm_client.c

+49 −11
Original line number Diff line number Diff line
@@ -254,7 +254,6 @@ drm_client_buffer_create(struct drm_client_dev *client, u32 width, u32 height, u 
	struct drm_device *dev = client->dev;

	struct drm_client_buffer *buffer;

	struct drm_gem_object *obj;

	void *vaddr;

	int ret;



	buffer = kzalloc(sizeof(*buffer), GFP_KERNEL);
@@ -281,6 +280,36 @@ drm_client_buffer_create(struct drm_client_dev *client, u32 width, u32 height, u 


	buffer->gem = obj;



	return buffer;



err_delete:

	drm_client_buffer_delete(buffer);



	return ERR_PTR(ret);

}



/**

 * drm_client_buffer_vmap - Map DRM client buffer into address space

 * @buffer: DRM client buffer

 *

 * This function maps a client buffer into kernel address space. If the

 * buffer is already mapped, it returns the mapping's address.

 *

 * Client buffer mappings are not ref'counted. Each call to

 * drm_client_buffer_vmap() should be followed by a call to

 * drm_client_buffer_vunmap(); or the client buffer should be mapped

 * throughout its lifetime.

 *

 * Returns:

 *	The mapped memory's address

 */

void *drm_client_buffer_vmap(struct drm_client_buffer *buffer)

{

	void *vaddr;



	if (buffer->vaddr)

		return buffer->vaddr;



	/*

	 * FIXME: The dependency on GEM here isn't required, we could

	 * convert the driver handle to a dma-buf instead and use the
@@ -289,21 +318,30 @@ drm_client_buffer_create(struct drm_client_dev *client, u32 width, u32 height, u 
	 * fd_install step out of the driver backend hooks, to make that

	 * final step optional for internal users.

	 */

	vaddr = drm_gem_vmap(obj);

	if (IS_ERR(vaddr)) {

		ret = PTR_ERR(vaddr);

		goto err_delete;

	}

	vaddr = drm_gem_vmap(buffer->gem);

	if (IS_ERR(vaddr))

		return vaddr;



	buffer->vaddr = vaddr;



	return buffer;



err_delete:

	drm_client_buffer_delete(buffer);

	return vaddr;

}

EXPORT_SYMBOL(drm_client_buffer_vmap);



	return ERR_PTR(ret);

/**

 * drm_client_buffer_vunmap - Unmap DRM client buffer

 * @buffer: DRM client buffer

 *

 * This function removes a client buffer's memory mapping. Calling this

 * function is only required by clients that manage their buffer mappings

 * by themselves.

 */

void drm_client_buffer_vunmap(struct drm_client_buffer *buffer)

{

	drm_gem_vunmap(buffer->gem, buffer->vaddr);

	buffer->vaddr = NULL;

}

EXPORT_SYMBOL(drm_client_buffer_vunmap);



static void drm_client_buffer_rmfb(struct drm_client_buffer *buffer)

{

drivers/gpu/drm/drm_fb_helper.c

+40 −11
Original line number Diff line number Diff line
@@ -403,6 +403,7 @@ static void drm_fb_helper_dirty_work(struct work_struct *work) 
	struct drm_clip_rect *clip = &helper->dirty_clip;

	struct drm_clip_rect clip_copy;

	unsigned long flags;

	void *vaddr;



	spin_lock_irqsave(&helper->dirty_lock, flags);

	clip_copy = *clip;
@@ -412,10 +413,20 @@ static void drm_fb_helper_dirty_work(struct work_struct *work) 


	/* call dirty callback only when it has been really touched */

	if (clip_copy.x1 < clip_copy.x2 && clip_copy.y1 < clip_copy.y2) {



		/* Generic fbdev uses a shadow buffer */

		if (helper->buffer)

		if (helper->buffer) {

			vaddr = drm_client_buffer_vmap(helper->buffer);

			if (IS_ERR(vaddr))

				return;

			drm_fb_helper_dirty_blit_real(helper, &clip_copy);

		helper->fb->funcs->dirty(helper->fb, NULL, 0, 0, &clip_copy, 1);

		}

		if (helper->fb->funcs->dirty)

			helper->fb->funcs->dirty(helper->fb, NULL, 0, 0,

						 &clip_copy, 1);



		if (helper->buffer)

			drm_client_buffer_vunmap(helper->buffer);

	}

}
@@ -604,6 +615,16 @@ void drm_fb_helper_unlink_fbi(struct drm_fb_helper *fb_helper) 
}

EXPORT_SYMBOL(drm_fb_helper_unlink_fbi);



static bool drm_fbdev_use_shadow_fb(struct drm_fb_helper *fb_helper)

{

	struct drm_device *dev = fb_helper->dev;

	struct drm_framebuffer *fb = fb_helper->fb;



	return dev->mode_config.prefer_shadow_fbdev ||

	       dev->mode_config.prefer_shadow ||

	       fb->funcs->dirty;

}



static void drm_fb_helper_dirty(struct fb_info *info, u32 x, u32 y,

				u32 width, u32 height)

{
@@ -611,7 +632,7 @@ static void drm_fb_helper_dirty(struct fb_info *info, u32 x, u32 y, 
	struct drm_clip_rect *clip = &helper->dirty_clip;

	unsigned long flags;



	if (!helper->fb->funcs->dirty)

	if (!drm_fbdev_use_shadow_fb(helper))

		return;



	spin_lock_irqsave(&helper->dirty_lock, flags);
@@ -2178,6 +2199,7 @@ int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper, 
	struct drm_framebuffer *fb;

	struct fb_info *fbi;

	u32 format;

	void *vaddr;



	DRM_DEBUG_KMS("surface width(%d), height(%d) and bpp(%d)\n",

		      sizes->surface_width, sizes->surface_height,
@@ -2200,16 +2222,10 @@ int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper, 
	fbi->fbops = &drm_fbdev_fb_ops;

	fbi->screen_size = fb->height * fb->pitches[0];

	fbi->fix.smem_len = fbi->screen_size;

	fbi->screen_buffer = buffer->vaddr;

	/* Shamelessly leak the physical address to user-space */

#if IS_ENABLED(CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM)

	if (drm_leak_fbdev_smem && fbi->fix.smem_start == 0)

		fbi->fix.smem_start =

			page_to_phys(virt_to_page(fbi->screen_buffer));

#endif



	drm_fb_helper_fill_info(fbi, fb_helper, sizes);



	if (fb->funcs->dirty) {

	if (drm_fbdev_use_shadow_fb(fb_helper)) {

		struct fb_ops *fbops;

		void *shadow;
@@ -2231,6 +2247,19 @@ int drm_fb_helper_generic_probe(struct drm_fb_helper *fb_helper, 
		fbi->fbdefio = &drm_fbdev_defio;



		fb_deferred_io_init(fbi);

	} else {

		/* buffer is mapped for HW framebuffer */

		vaddr = drm_client_buffer_vmap(fb_helper->buffer);

		if (IS_ERR(vaddr))

			return PTR_ERR(vaddr);



		fbi->screen_buffer = vaddr;

		/* Shamelessly leak the physical address to user-space */

#if IS_ENABLED(CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM)

		if (drm_leak_fbdev_smem && fbi->fix.smem_start == 0)

			fbi->fix.smem_start =

				page_to_phys(virt_to_page(fbi->screen_buffer));

#endif

	}



	return 0;