Skip to content

Commit 11df68c

Browse files
danvetdanvet
committed
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: Daniel Vetter <[email protected]> From: Thomas Zimmermann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents a809b92 + 8befe8f commit 11df68c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+471
-416
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1484,7 +1484,6 @@ extern const int amdgpu_max_kms_ioctl;
14841484

14851485
int amdgpu_driver_load_kms(struct amdgpu_device *adev, unsigned long flags);
14861486
void amdgpu_driver_unload_kms(struct drm_device *dev);
1487-
void amdgpu_driver_lastclose_kms(struct drm_device *dev);
14881487
int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv);
14891488
void amdgpu_driver_postclose_kms(struct drm_device *dev,
14901489
struct drm_file *file_priv);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2953,7 +2953,6 @@ static const struct drm_driver amdgpu_kms_driver = {
29532953
DRIVER_SYNCOBJ_TIMELINE,
29542954
.open = amdgpu_driver_open_kms,
29552955
.postclose = amdgpu_driver_postclose_kms,
2956-
.lastclose = amdgpu_driver_lastclose_kms,
29572956
.ioctls = amdgpu_ioctls_kms,
29582957
.num_ioctls = ARRAY_SIZE(amdgpu_ioctls_kms),
29592958
.dumb_create = amdgpu_mode_dumb_create,
@@ -2980,7 +2979,6 @@ const struct drm_driver amdgpu_partition_driver = {
29802979
DRIVER_SYNCOBJ_TIMELINE,
29812980
.open = amdgpu_driver_open_kms,
29822981
.postclose = amdgpu_driver_postclose_kms,
2983-
.lastclose = amdgpu_driver_lastclose_kms,
29842982
.ioctls = amdgpu_ioctls_kms,
29852983
.num_ioctls = ARRAY_SIZE(amdgpu_ioctls_kms),
29862984
.dumb_create = amdgpu_mode_dumb_create,

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1269,23 +1269,6 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
12691269
return 0;
12701270
}
12711271

1272-
1273-
/*
1274-
* Outdated mess for old drm with Xorg being in charge (void function now).
1275-
*/
1276-
/**
1277-
* amdgpu_driver_lastclose_kms - drm callback for last close
1278-
*
1279-
* @dev: drm dev pointer
1280-
*
1281-
* Switch vga_switcheroo state after last close (all asics).
1282-
*/
1283-
void amdgpu_driver_lastclose_kms(struct drm_device *dev)
1284-
{
1285-
drm_fb_helper_lastclose(dev);
1286-
vga_switcheroo_process_delayed_switch();
1287-
}
1288-
12891272
/**
12901273
* amdgpu_driver_open_kms - drm callback for open
12911274
*

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ void amdgpu_atombios_encoder_init_backlight(struct amdgpu_encoder *amdgpu_encode
215215
dig->bl_dev = bd;
216216

217217
bd->props.brightness = amdgpu_atombios_encoder_get_backlight_brightness(bd);
218-
bd->props.power = FB_BLANK_UNBLANK;
218+
bd->props.power = BACKLIGHT_POWER_ON;
219219
backlight_update_status(bd);
220220

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

‎drivers/gpu/drm/ast/ast_dp.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -146,18 +146,19 @@ void ast_dp_power_on_off(struct drm_device *dev, bool on)
146146
void ast_dp_link_training(struct ast_device *ast)
147147
{
148148
struct drm_device *dev = &ast->base;
149-
unsigned int i = 10;
149+
int i;
150150

151-
while (i--) {
152-
u8 vgacrdc = ast_get_index_reg(ast, AST_IO_VGACRI, 0xdc);
151+
for (i = 0; i < 10; i++) {
152+
u8 vgacrdc;
153153

154-
if (vgacrdc & AST_IO_VGACRDC_LINK_SUCCESS)
155-
break;
156154
if (i)
157155
msleep(100);
156+
157+
vgacrdc = ast_get_index_reg(ast, AST_IO_VGACRI, 0xdc);
158+
if (vgacrdc & AST_IO_VGACRDC_LINK_SUCCESS)
159+
return;
158160
}
159-
if (!i)
160-
drm_err(dev, "Link training failed\n");
161+
drm_err(dev, "Link training failed\n");
161162
}
162163

163164
void ast_dp_set_on_off(struct drm_device *dev, bool on)

‎drivers/gpu/drm/ci/container.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,14 @@ debian/x86_64_test-vk:
2828
rules:
2929
- when: never
3030

31+
debian/arm64_test-vk:
32+
rules:
33+
- when: never
34+
35+
debian/arm64_test-gl:
36+
rules:
37+
- when: never
38+
3139
fedora/x86_64_build:
3240
rules:
3341
- when: never

‎drivers/gpu/drm/ci/gitlab-ci.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
variables:
22
DRM_CI_PROJECT_PATH: &drm-ci-project-path mesa/mesa
3-
DRM_CI_COMMIT_SHA: &drm-ci-commit-sha e2b9c5a9e3e4f9b532067af8022eaef8d6fc6c00
3+
DRM_CI_COMMIT_SHA: &drm-ci-commit-sha d9849ac46623797a9f56fb9d46dc52460ac477de
44

55
UPSTREAM_REPO: https://gitlab.freedesktop.org/drm/kernel.git
66
TARGET_BRANCH: drm-next
77

88
IGT_VERSION: f13702b8e4e847c56da3ef6f0969065d686049c5
99

10-
DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/anholt/deqp-runner.git
10+
DEQP_RUNNER_GIT_URL: https://gitlab.freedesktop.org/mesa/deqp-runner.git
1111
DEQP_RUNNER_GIT_TAG: v0.15.0
1212

1313
FDO_UPSTREAM_REPO: helen.fornazier/linux # The repo where the git-archive daily runs
@@ -85,22 +85,24 @@ include:
8585
- project: *drm-ci-project-path
8686
ref: *drm-ci-commit-sha
8787
file:
88+
- '/.gitlab-ci/container/gitlab-ci.yml'
8889
- '/.gitlab-ci/farm-rules.yml'
90+
- '/.gitlab-ci/lava/lava-gitlab-ci.yml'
8991
- '/.gitlab-ci/test-source-dep.yml'
90-
- '/.gitlab-ci/container/gitlab-ci.yml'
9192
- '/.gitlab-ci/test/gitlab-ci.yml'
92-
- '/.gitlab-ci/lava/lava-gitlab-ci.yml'
93-
- '/src/microsoft/ci/gitlab-ci-inc.yml'
94-
- '/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml'
93+
- '/src/amd/ci/gitlab-ci-inc.yml'
94+
- '/src/freedreno/ci/gitlab-ci-inc.yml'
9595
- '/src/gallium/drivers/crocus/ci/gitlab-ci-inc.yml'
96-
- '/src/gallium/drivers/softpipe/ci/gitlab-ci-inc.yml'
9796
- '/src/gallium/drivers/llvmpipe/ci/gitlab-ci-inc.yml'
98-
- '/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml'
9997
- '/src/gallium/drivers/nouveau/ci/gitlab-ci-inc.yml'
98+
- '/src/gallium/drivers/softpipe/ci/gitlab-ci-inc.yml'
99+
- '/src/gallium/drivers/virgl/ci/gitlab-ci-inc.yml'
100+
- '/src/gallium/drivers/zink/ci/gitlab-ci-inc.yml'
100101
- '/src/gallium/frontends/lavapipe/ci/gitlab-ci-inc.yml'
102+
- '/src/gallium/frontends/rusticl/ci/gitlab-ci.yml'
101103
- '/src/intel/ci/gitlab-ci-inc.yml'
102-
- '/src/freedreno/ci/gitlab-ci-inc.yml'
103-
- '/src/amd/ci/gitlab-ci-inc.yml'
104+
- '/src/microsoft/ci/gitlab-ci-inc.yml'
105+
- '/src/nouveau/ci/gitlab-ci-inc.yml'
104106
- '/src/virtio/ci/gitlab-ci-inc.yml'
105107
- drivers/gpu/drm/ci/image-tags.yml
106108
- drivers/gpu/drm/ci/container.yml

‎drivers/gpu/drm/ci/image-tags.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
variables:
2-
CONTAINER_TAG: "2024-05-09-mesa-uprev"
2+
CONTAINER_TAG: "2024-08-07-mesa-uprev"
33
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
44
DEBIAN_BASE_TAG: "${CONTAINER_TAG}"
55

66
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
7-
DEBIAN_BUILD_TAG: "2024-06-10-vkms"
7+
DEBIAN_BUILD_TAG: "${CONTAINER_TAG}"
88

9-
KERNEL_ROOTFS_TAG: "2023-10-06-amd"
9+
KERNEL_ROOTFS_TAG: "${CONTAINER_TAG}"
1010

1111
DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
1212
DEBIAN_X86_64_TEST_IMAGE_GL_PATH: "debian/x86_64_test-gl"
13-
DEBIAN_X86_64_TEST_GL_TAG: "${CONTAINER_TAG}"
13+
DEBIAN_TEST_GL_TAG: "${CONTAINER_TAG}"
1414

1515
ALPINE_X86_64_LAVA_SSH_TAG: "${CONTAINER_TAG}"

‎drivers/gpu/drm/ci/lava-submit.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ PYTHONPATH=artifacts/ artifacts/lava/lava_job_submitter.py \
4444
--first-stage-init artifacts/ci-common/init-stage1.sh \
4545
--ci-project-dir "${CI_PROJECT_DIR}" \
4646
--device-type "${DEVICE_TYPE}" \
47+
--farm "${FARM}" \
4748
--dtb-filename "${DTB}" \
4849
--jwt-file "${S3_JWT_FILE}" \
4950
--kernel-image-name "${KERNEL_IMAGE_NAME}" \

‎drivers/gpu/drm/ci/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
.baremetal-igt-arm64:
7070
extends:
7171
- .baremetal-test-arm64
72-
- .use-debian/arm64_test
72+
- .use-debian/baremetal_arm64_test
7373
- .test-rules
7474
variables:
7575
FDO_CI_CONCURRENT: 10
@@ -79,7 +79,7 @@
7979
BM_CMDLINE: "ip=dhcp console=ttyMSM0,115200n8 $BM_KERNEL_EXTRA_ARGS root=/dev/nfs rw nfsrootdebug nfsroot=,tcp,nfsvers=4.2 init=/init $BM_KERNELARGS"
8080
FARM: google
8181
needs:
82-
- debian/arm64_test
82+
- debian/baremetal_arm64_test
8383
- job: testing:arm64
8484
artifacts: false
8585
- igt:arm64

0 commit comments

Comments
 (0)