Commit 156e60bc authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-next-2018-09-27' of git://anongit.freedesktop.org/drm/drm-misc into drm-next 



drm-misc-next for 4.20:

UAPI Changes:
- None

Cross-subsystem Changes:
- MAINTAINERS: Move udl, mxsfb, and fsl-dcu into drm-misc (Stefan, Sean)

Core Changes:
- syncobj: Check condition before returning timeout in schedule() (Chris)

Driver Changes:
- various: First wave of drm_fbdev_generic_setup() conversions (Noralf)
- bochs/virtio: More format byte-order improvements (Gerd)
- mxsfb: A couple fixes + add runtime pm support (Leonard)
- virtio: Add vmap support for prime objects (Ezequiel)

Cc: Stefan Agner <stefan@agner.ch>
Cc: Sean Paul <sean@poorly.run>
Cc: Noralf Trønnes <noralf@tronnes.org>
Cc: Gerd Hoffman <kraxel@redhat.com>
Cc: Leonard Crestez <leonard.crestez@nxp.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ezequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20180927093950.GA180365@art_vandelay
parents bf78296a c2b70ffc

Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt

+2 −0
Original line number Diff line number Diff line
@@ -376,6 +376,8 @@ Required properties: 
    * allwinner,sun8i-a83t-de2-mixer-0

    * allwinner,sun8i-a83t-de2-mixer-1

    * allwinner,sun8i-h3-de2-mixer-0

    * allwinner,sun8i-r40-de2-mixer-0

    * allwinner,sun8i-r40-de2-mixer-1

    * allwinner,sun8i-v3s-de2-mixer

    * allwinner,sun50i-a64-de2-mixer-0

    * allwinner,sun50i-a64-de2-mixer-1

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -4721,8 +4721,11 @@ F: drivers/gpu/drm/tdfx/ 


DRM DRIVER FOR USB DISPLAYLINK VIDEO ADAPTERS

M:	Dave Airlie <airlied@redhat.com>

R:	Sean Paul <sean@poorly.run>

L:	dri-devel@lists.freedesktop.org

S:	Odd Fixes

F:	drivers/gpu/drm/udl/

T:	git git://anongit.freedesktop.org/drm/drm-misc



DRM DRIVER FOR VMWARE VIRTUAL GPU

M:	"VMware Graphics" <linux-graphics-maintainer@vmware.com>
@@ -4822,6 +4825,7 @@ F: drivers/gpu/drm/fsl-dcu/ 
F:	Documentation/devicetree/bindings/display/fsl,dcu.txt

F:	Documentation/devicetree/bindings/display/fsl,tcon.txt

F:	Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt

T:	git git://anongit.freedesktop.org/drm/drm-misc



DRM DRIVERS FOR FREESCALE IMX

M:	Philipp Zabel <p.zabel@pengutronix.de>
@@ -9906,9 +9910,12 @@ F: drivers/media/tuners/mxl5007t.* 


MXSFB DRM DRIVER

M:	Marek Vasut <marex@denx.de>

M:	Stefan Agner <stefan@agner.ch>

L:	dri-devel@lists.freedesktop.org

S:	Supported

F:	drivers/gpu/drm/mxsfb/

F:	Documentation/devicetree/bindings/display/mxsfb.txt

T:	git git://anongit.freedesktop.org/drm/drm-misc



MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)

M:	Chris Lee <christopher.lee@cspi.com>

drivers/gpu/drm/arm/hdlcd_drv.c

+2 −9
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ setup_fail: 


static const struct drm_mode_config_funcs hdlcd_mode_config_funcs = {

	.fb_create = drm_gem_fb_create,

	.output_poll_changed = drm_fb_helper_output_poll_changed,

	.atomic_check = drm_atomic_helper_check,

	.atomic_commit = drm_atomic_helper_commit,

};
@@ -233,7 +232,6 @@ static struct drm_driver hdlcd_driver = { 
	.driver_features = DRIVER_HAVE_IRQ | DRIVER_GEM |

			   DRIVER_MODESET | DRIVER_PRIME |

			   DRIVER_ATOMIC,

	.lastclose = drm_fb_helper_lastclose,

	.irq_handler = hdlcd_irq,

	.irq_preinstall = hdlcd_irq_preinstall,

	.irq_postinstall = hdlcd_irq_postinstall,
@@ -308,19 +306,15 @@ static int hdlcd_drm_bind(struct device *dev) 
	drm_mode_config_reset(drm);

	drm_kms_helper_poll_init(drm);



	ret = drm_fb_cma_fbdev_init(drm, 32, 0);

	if (ret)

		goto err_fbdev;



	ret = drm_dev_register(drm, 0);

	if (ret)

		goto err_register;



	drm_fbdev_generic_setup(drm, 32);



	return 0;



err_register:

	drm_fb_cma_fbdev_fini(drm);

err_fbdev:

	drm_kms_helper_poll_fini(drm);

err_vblank:

	pm_runtime_disable(drm->dev);
@@ -346,7 +340,6 @@ static void hdlcd_drm_unbind(struct device *dev) 
	struct hdlcd_drm_private *hdlcd = drm->dev_private;



	drm_dev_unregister(drm);

	drm_fb_cma_fbdev_fini(drm);

	drm_kms_helper_poll_fini(drm);

	component_unbind_all(dev, drm);

	of_node_put(hdlcd->crtc.port);

drivers/gpu/drm/arm/malidp_drv.c

+2 −9
Original line number Diff line number Diff line
@@ -260,7 +260,6 @@ static const struct drm_mode_config_helper_funcs malidp_mode_config_helpers = { 


static const struct drm_mode_config_funcs malidp_mode_config_funcs = {

	.fb_create = drm_gem_fb_create,

	.output_poll_changed = drm_fb_helper_output_poll_changed,

	.atomic_check = drm_atomic_helper_check,

	.atomic_commit = drm_atomic_helper_commit,

};
@@ -450,7 +449,6 @@ static int malidp_debugfs_init(struct drm_minor *minor) 
static struct drm_driver malidp_driver = {

	.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC |

			   DRIVER_PRIME,

	.lastclose = drm_fb_helper_lastclose,

	.gem_free_object_unlocked = drm_gem_cma_free_object,

	.gem_vm_ops = &drm_gem_cma_vm_ops,

	.dumb_create = malidp_dumb_create,
@@ -762,22 +760,18 @@ static int malidp_bind(struct device *dev) 


	drm_mode_config_reset(drm);



	ret = drm_fb_cma_fbdev_init(drm, 32, 0);

	if (ret)

		goto fbdev_fail;



	drm_kms_helper_poll_init(drm);



	ret = drm_dev_register(drm, 0);

	if (ret)

		goto register_fail;



	drm_fbdev_generic_setup(drm, 32);



	return 0;



register_fail:

	drm_fb_cma_fbdev_fini(drm);

	drm_kms_helper_poll_fini(drm);

fbdev_fail:

	pm_runtime_get_sync(dev);

vblank_fail:

	malidp_se_irq_fini(hwdev);
@@ -814,7 +808,6 @@ static void malidp_unbind(struct device *dev) 
	struct malidp_hw_device *hwdev = malidp->dev;



	drm_dev_unregister(drm);

	drm_fb_cma_fbdev_fini(drm);

	drm_kms_helper_poll_fini(drm);

	pm_runtime_get_sync(dev);

	drm_crtc_vblank_off(&malidp->crtc);

drivers/gpu/drm/bochs/bochs.h

+3 −1
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ struct bochs_device { 
	void __iomem   *fb_map;

	unsigned long  fb_base;

	unsigned long  fb_size;

	unsigned long  qext_size;



	/* mode */

	u16 xres;
@@ -121,7 +122,8 @@ int bochs_hw_init(struct drm_device *dev); 
void bochs_hw_fini(struct drm_device *dev);



void bochs_hw_setmode(struct bochs_device *bochs,

		      struct drm_display_mode *mode);

		      struct drm_display_mode *mode,

		      const struct drm_format_info *format);

void bochs_hw_setbase(struct bochs_device *bochs,

		      int x, int y, u64 addr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE