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

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

drm/radeon/kms: fix vline register for second head. 



Both r100/r600 had this wrong, use the macro to extract the register
to relocate.

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

drivers/gpu/drm/radeon/r100.c

+1 −1
Original line number Diff line number Diff line
@@ -829,7 +829,7 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p) 


	header = radeon_get_ib_value(p, h_idx);

	crtc_id = radeon_get_ib_value(p, h_idx + 5);

	reg = header >> 2;

	reg = CP_PACKET0_GET_REG(header);

	mutex_lock(&p->rdev->ddev->mode_config.mutex);

	obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC);

	if (!obj) {

drivers/gpu/drm/radeon/r600_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ static int r600_cs_packet_parse_vline(struct radeon_cs_parser *p) 


	header = radeon_get_ib_value(p, h_idx);

	crtc_id = radeon_get_ib_value(p, h_idx + 2 + 7 + 1);

	reg = header >> 2;

	reg = CP_PACKET0_GET_REG(header);

	mutex_lock(&p->rdev->ddev->mode_config.mutex);

	obj = drm_mode_object_find(p->rdev->ddev, crtc_id, DRM_MODE_OBJECT_CRTC);

	if (!obj) {