Commit cd3a2e8b authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/mgag200: Only set VIDRST bits in CRTC modesetting 



The VRSTEN and HRSTEN bits control whether a CRTC synchronizes its
display signal with an external source on the VIDRST pin. The G200WB
and G200EW3 models synchronize with a BMC chip, but different external
video encoders, such as the Matrox Maven, can also be attached to the
pin.

Only set VRSTEN and HRSTEN bits in the CRTC mode-setting code, so the
bits are independent from the BMC. Add the field set_vidrst to the CRTC
state for this purpose. Off by default, control the CRTC VIDRST setting
from the CRTC's atomic_check helper.

v3:
- don't clear bits unnecessary (Jocelyn)
v2:
- keep logic entirely in CRTC (Jocelyn)

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240711072415.11831-2-tzimmermann@suse.de
parent 0b91c6da

drivers/gpu/drm/mgag200/mgag200_bmc.c

+0 −5
Original line number Diff line number Diff line
@@ -77,11 +77,6 @@ void mgag200_bmc_enable_vidrst(struct mga_device *mdev) 
{

	u8 tmp;



	/* Ensure that the vrsten and hrsten are set */

	WREG8(MGAREG_CRTCEXT_INDEX, 1);

	tmp = RREG8(MGAREG_CRTCEXT_DATA);

	WREG8(MGAREG_CRTCEXT_DATA, tmp | 0x88);



	/* Assert rstlvl2 */

	WREG8(DAC_INDEX, MGA1064_REMHEADCTL2);

	tmp = RREG8(DAC_DATA);

drivers/gpu/drm/mgag200/mgag200_drv.h

+4 −1
Original line number Diff line number Diff line
@@ -179,6 +179,8 @@ struct mgag200_crtc_state { 
	const struct drm_format_info *format;



	struct mgag200_pll_values pixpllc;



	bool set_vidrst;

};



static inline struct mgag200_crtc_state *to_mgag200_crtc_state(struct drm_crtc_state *base)
@@ -430,7 +432,8 @@ void mgag200_crtc_atomic_destroy_state(struct drm_crtc *crtc, struct drm_crtc_st 
	.atomic_duplicate_state = mgag200_crtc_atomic_duplicate_state, \

	.atomic_destroy_state = mgag200_crtc_atomic_destroy_state



void mgag200_set_mode_regs(struct mga_device *mdev, const struct drm_display_mode *mode);

void mgag200_set_mode_regs(struct mga_device *mdev, const struct drm_display_mode *mode,

			   bool set_vidrst);

void mgag200_set_format_regs(struct mga_device *mdev, const struct drm_format_info *format);

void mgag200_enable_display(struct mga_device *mdev);

void mgag200_init_registers(struct mga_device *mdev);

drivers/gpu/drm/mgag200/mgag200_g200er.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static void mgag200_g200er_crtc_helper_atomic_enable(struct drm_crtc *crtc, 
		funcs->disable_vidrst(mdev);



	mgag200_set_format_regs(mdev, format);

	mgag200_set_mode_regs(mdev, adjusted_mode);

	mgag200_set_mode_regs(mdev, adjusted_mode, mgag200_crtc_state->set_vidrst);



	if (funcs->pixpllc_atomic_update)

		funcs->pixpllc_atomic_update(crtc, old_state);

drivers/gpu/drm/mgag200/mgag200_g200ev.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static void mgag200_g200ev_crtc_helper_atomic_enable(struct drm_crtc *crtc, 
		funcs->disable_vidrst(mdev);



	mgag200_set_format_regs(mdev, format);

	mgag200_set_mode_regs(mdev, adjusted_mode);

	mgag200_set_mode_regs(mdev, adjusted_mode, mgag200_crtc_state->set_vidrst);



	if (funcs->pixpllc_atomic_update)

		funcs->pixpllc_atomic_update(crtc, old_state);

drivers/gpu/drm/mgag200/mgag200_g200se.c

+1 −1
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ static void mgag200_g200se_crtc_helper_atomic_enable(struct drm_crtc *crtc, 
		funcs->disable_vidrst(mdev);



	mgag200_set_format_regs(mdev, format);

	mgag200_set_mode_regs(mdev, adjusted_mode);

	mgag200_set_mode_regs(mdev, adjusted_mode, mgag200_crtc_state->set_vidrst);



	if (funcs->pixpllc_atomic_update)

		funcs->pixpllc_atomic_update(crtc, old_state);