Commit 11df68c2 authored by Simona Vetter's avatar Simona Vetter
Browse files

Merge tag 'drm-misc-next-2024-08-16' of... 

Merge tag 'drm-misc-next-2024-08-16' of https://gitlab.freedesktop.org/drm/misc/kernel

 into drm-next

drm-misc-next for v6.12:

Core Changes:

ci:
- Update dependencies

docs:
- Cleanups

edid:
- Improve debug logging
- Clean up interface

fbdev emulation:
- Remove old fbdev hooks
- Update documentation

panic:
- Cleanups

Driver Changes:

amdgpu:
- Remove usage of old fbdev hooks
- Use backlight constants

ast:
- Fix timeout loop for DP link training

hisilicon:
- hibmc: Cleanups

mipi-dsi:
- Improve error handling
- startek-kd070fhfid015: Use new error handling

nouveau:
- Remove usage of old fbdev hooks

panel:
- Use backlight constants

radeon:
- Use backlight constants

rockchip:
- Improve DP sink-capability reporting
- Cleanups
- dw_hdmi: Support 4k@60Hz; Cleanups
- vop: Support RGB display on Rockchip RK3066; Support 4096px width

tilcdc:
- Use backlight constants

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240816084109.GA229316@localhost.localdomain
parents a809b92e 8befe8fa

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+0 −1
Original line number Diff line number Diff line
@@ -1484,7 +1484,6 @@ extern const int amdgpu_max_kms_ioctl; 


int amdgpu_driver_load_kms(struct amdgpu_device *adev, unsigned long flags);

void amdgpu_driver_unload_kms(struct drm_device *dev);

void amdgpu_driver_lastclose_kms(struct drm_device *dev);

int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv);

void amdgpu_driver_postclose_kms(struct drm_device *dev,

				 struct drm_file *file_priv);

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

+0 −2
Original line number Diff line number Diff line
@@ -2953,7 +2953,6 @@ static const struct drm_driver amdgpu_kms_driver = { 
	    DRIVER_SYNCOBJ_TIMELINE,

	.open = amdgpu_driver_open_kms,

	.postclose = amdgpu_driver_postclose_kms,

	.lastclose = amdgpu_driver_lastclose_kms,

	.ioctls = amdgpu_ioctls_kms,

	.num_ioctls = ARRAY_SIZE(amdgpu_ioctls_kms),

	.dumb_create = amdgpu_mode_dumb_create,
@@ -2980,7 +2979,6 @@ const struct drm_driver amdgpu_partition_driver = { 
	    DRIVER_SYNCOBJ_TIMELINE,

	.open = amdgpu_driver_open_kms,

	.postclose = amdgpu_driver_postclose_kms,

	.lastclose = amdgpu_driver_lastclose_kms,

	.ioctls = amdgpu_ioctls_kms,

	.num_ioctls = ARRAY_SIZE(amdgpu_ioctls_kms),

	.dumb_create = amdgpu_mode_dumb_create,

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

+0 −17
Original line number Diff line number Diff line
@@ -1269,23 +1269,6 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) 
	return 0;

}





/*

 * Outdated mess for old drm with Xorg being in charge (void function now).

 */

/**

 * amdgpu_driver_lastclose_kms - drm callback for last close

 *

 * @dev: drm dev pointer

 *

 * Switch vga_switcheroo state after last close (all asics).

 */

void amdgpu_driver_lastclose_kms(struct drm_device *dev)

{

	drm_fb_helper_lastclose(dev);

	vga_switcheroo_process_delayed_switch();

}



/**

 * amdgpu_driver_open_kms - drm callback for open

 *

drivers/gpu/drm/amd/amdgpu/atombios_encoders.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ void amdgpu_atombios_encoder_init_backlight(struct amdgpu_encoder *amdgpu_encode 
	dig->bl_dev = bd;



	bd->props.brightness = amdgpu_atombios_encoder_get_backlight_brightness(bd);

	bd->props.power = FB_BLANK_UNBLANK;

	bd->props.power = BACKLIGHT_POWER_ON;

	backlight_update_status(bd);



	DRM_INFO("amdgpu atom DIG backlight initialized\n");

drivers/gpu/drm/ast/ast_dp.c

+8 −7
Original line number Diff line number Diff line
@@ -146,17 +146,18 @@ void ast_dp_power_on_off(struct drm_device *dev, bool on) 
void ast_dp_link_training(struct ast_device *ast)

{

	struct drm_device *dev = &ast->base;

	unsigned int i = 10;

	int i;



	while (i--) {

		u8 vgacrdc = ast_get_index_reg(ast, AST_IO_VGACRI, 0xdc);

	for (i = 0; i < 10; i++) {

		u8 vgacrdc;



		if (vgacrdc & AST_IO_VGACRDC_LINK_SUCCESS)

			break;

		if (i)

			msleep(100);



		vgacrdc = ast_get_index_reg(ast, AST_IO_VGACRI, 0xdc);

		if (vgacrdc & AST_IO_VGACRDC_LINK_SUCCESS)

			return;

	}

	if (!i)

	drm_err(dev, "Link training failed\n");

}