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

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



 * drm/panel: simple: Fix assignments from panel_dpi_probe()
 * drm/privacy-screen: Cleanups
 * drm/rockchip: Fix HDMI error cleanup; Fix RK3399 VOP register fields
 * drm/vc4: HDMI fixes; Cleanups
 * fbdev: Add fbdev core module with Daniel as maintainer; Cleanups

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

From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YgTf1Zsflzq3JSFo@linux-uq9g
parents dfd42fac 9da1e9ab

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -7575,6 +7575,12 @@ S: Maintained 
W:	http://floatingpoint.sourceforge.net/emulator/index.html

F:	arch/x86/math-emu/









FRAMEBUFFER CORE









M:	Daniel Vetter <daniel@ffwll.ch>









F:	drivers/video/fbdev/core/









S:	Odd Fixes









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

















FRAMEBUFFER LAYER









M:	Helge Deller <deller@gmx.de>









L:	linux-fbdev@vger.kernel.org
































drivers/gpu/drm/drm_privacy_screen.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -269,7 +269,7 @@ EXPORT_SYMBOL(drm_privacy_screen_get_state);







 *









 * The notifier is called with no locks held. The new hw_state and sw_state









 * can be retrieved using the drm_privacy_screen_get_state() function.









 * A pointer to the drm_privacy_screen's struct is passed as the void *data









 * A pointer to the drm_privacy_screen's struct is passed as the ``void *data``









 * argument of the notifier_block's notifier_call.









 *









 * The notifier will NOT be called when changes are made through
































drivers/gpu/drm/panel/panel-simple.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -588,6 +588,7 @@ static int panel_simple_probe(struct device *dev, const struct panel_desc *desc)







		err = panel_dpi_probe(dev, panel);









		if (err)









			goto free_ddc;









		desc = panel->desc;









	} else {









		if (!of_get_display_timing(dev->of_node, "panel-timing", &dt))









			panel_simple_parse_panel_timing_node(dev, panel, &dt);
































drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c



+7
−7






























Original line number
Diff line number
Diff line







@@ -529,13 +529,6 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,







		return ret;









	}



















	ret = clk_prepare_enable(hdmi->vpll_clk);









	if (ret) {









		DRM_DEV_ERROR(hdmi->dev, "Failed to enable HDMI vpll: %d\n",









			      ret);









		return ret;









	}



















	hdmi->phy = devm_phy_optional_get(dev, "hdmi");









	if (IS_ERR(hdmi->phy)) {









		ret = PTR_ERR(hdmi->phy);








@@ -544,6 +537,13 @@ static int dw_hdmi_rockchip_bind(struct device *dev, struct device *master,







		return ret;









	}



















	ret = clk_prepare_enable(hdmi->vpll_clk);









	if (ret) {









		DRM_DEV_ERROR(hdmi->dev, "Failed to enable HDMI vpll: %d\n",









			      ret);









		return ret;









	}



















	drm_encoder_helper_add(encoder, &dw_hdmi_rockchip_encoder_helper_funcs);









	drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_TMDS);










































drivers/gpu/drm/rockchip/rockchip_vop_reg.c



+5
−3






























Original line number
Diff line number
Diff line







@@ -902,6 +902,7 @@ static const struct vop_win_phy rk3399_win01_data = {







	.enable = VOP_REG(RK3288_WIN0_CTRL0, 0x1, 0),









	.format = VOP_REG(RK3288_WIN0_CTRL0, 0x7, 1),









	.rb_swap = VOP_REG(RK3288_WIN0_CTRL0, 0x1, 12),









	.x_mir_en = VOP_REG(RK3288_WIN0_CTRL0, 0x1, 21),









	.y_mir_en = VOP_REG(RK3288_WIN0_CTRL0, 0x1, 22),









	.act_info = VOP_REG(RK3288_WIN0_ACT_INFO, 0x1fff1fff, 0),









	.dsp_info = VOP_REG(RK3288_WIN0_DSP_INFO, 0x0fff0fff, 0),








@@ -912,6 +913,7 @@ static const struct vop_win_phy rk3399_win01_data = {







	.uv_vir = VOP_REG(RK3288_WIN0_VIR, 0x3fff, 16),









	.src_alpha_ctl = VOP_REG(RK3288_WIN0_SRC_ALPHA_CTRL, 0xff, 0),









	.dst_alpha_ctl = VOP_REG(RK3288_WIN0_DST_ALPHA_CTRL, 0xff, 0),









	.channel = VOP_REG(RK3288_WIN0_CTRL2, 0xff, 0),









};



















/*








@@ -922,11 +924,11 @@ static const struct vop_win_phy rk3399_win01_data = {







static const struct vop_win_data rk3399_vop_win_data[] = {









	{ .base = 0x00, .phy = &rk3399_win01_data,









	  .type = DRM_PLANE_TYPE_PRIMARY },









	{ .base = 0x40, .phy = &rk3288_win01_data,









	{ .base = 0x40, .phy = &rk3368_win01_data,









	  .type = DRM_PLANE_TYPE_OVERLAY },









	{ .base = 0x00, .phy = &rk3288_win23_data,









	{ .base = 0x00, .phy = &rk3368_win23_data,









	  .type = DRM_PLANE_TYPE_OVERLAY },









	{ .base = 0x50, .phy = &rk3288_win23_data,









	{ .base = 0x50, .phy = &rk3368_win23_data,









	  .type = DRM_PLANE_TYPE_CURSOR },









};