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

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



-sun4i: Fix double-free in connector/encoder cleanup (Stefan)
-malidp: Make vtable static (Ben)

Cc: Ben Dooks <ben.dooks@codethink.co.uk>
Cc: Stefan Mavrodiev <stefan@olimex.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20191231152503.GA46740@art_vandelay
parents 886a0dc0 ac2917b0

drivers/gpu/drm/arm/malidp_mw.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ malidp_mw_connector_mode_valid(struct drm_connector *connector, 
	return MODE_OK;

}



const struct drm_connector_helper_funcs malidp_mw_connector_helper_funcs = {

static const struct drm_connector_helper_funcs malidp_mw_connector_helper_funcs = {

	.get_modes = malidp_mw_connector_get_modes,

	.mode_valid = malidp_mw_connector_mode_valid,

};

drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c

+0 −2
Original line number Diff line number Diff line
@@ -685,8 +685,6 @@ static void sun4i_hdmi_unbind(struct device *dev, struct device *master, 
	struct sun4i_hdmi *hdmi = dev_get_drvdata(dev);



	cec_unregister_adapter(hdmi->cec_adap);

	drm_connector_cleanup(&hdmi->connector);

	drm_encoder_cleanup(&hdmi->encoder);

	i2c_del_adapter(hdmi->i2c);

	i2c_put_adapter(hdmi->ddc_i2c);

	clk_disable_unprepare(hdmi->mod_clk);

CRA Git | Maintained and supported by SUSTech CRA and CCSE