mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2025-08-28 06:05:05 +00:00

drm-misc-next for v6.16-rc1: UAPI Changes: - Add ASAHI uapi header! - Add apple fourcc modifiers. - Add capset virtio definitions to UAPI. - Extend EXPORT_SYNC_FILE for timeline syncobjs. Cross-subsystem Changes: - Adjust DMA-BUF sg handling to not cache map on attach. - Update drm/ci, hlcdc, virtio, maintainers. - Update fbdev todo. - Allow setting dma-device for dma-buf import. - Export efi_mem_desc_lookup to make efidrm build as a module. Core Changes: - Update drm scheduler docs. - Use the correct resv object in TTM delayed destroy. - Fix compiler warning with panic qr code, and other small fixes. - drm/ci updates. - Add debugfs file for listing all bridges. - Small fixes to drm/client, ttm tests. - Add documentation to display/hdmi. - Add kunit tests for bridges. - Dont fail managed device probing if connector polling fails. - Create Kconfig.debug for drm core. - Add tests for the drm scheduler. - Add and use new access helpers for DPCPD. - Add generic and optimized conversions for format-helper. - Begin refcounting panel for improving lifetime handling. - Unify simpledrm and ofdrm sysfb, and add extra features. - Split hdmi audio in bridge to make DP audio work. Driver Changes: - Convert drivers to use devm_platform_ioremap_resource(). - Assorted small fixes to imx/legacy-bridg, gma500, pl111, nouveau, vc4, vmwgfx, ast, mxsfb, xlnx, accel/qaic, v3d, bridge/imx8qxp-ldb, ofdrm, bridge/fsl-ldb, udl, bridge/ti-sn65dsi86, bridge/anx7625, cirrus-qemu, bridge/cdns-dsi, panel/sharp, panel/himax, bridge/sil902x, renesas, imagination, various panels. - Allow attaching more display to vkms. - Add Powertip PH128800T004-ZZA01 panel. - Add rotation quirk for ZOTAC panel. - Convert bridge/tc358775 to atomic. - Remove deprecated panel calls from synaptics, novatek, samsung panels. - Refactor shmem helper page pinning and accel drivers using it. - Add dmabuf support to accel/amdxdna. - Use 4k page table format for panfrost/mediatek. - Add common powerup/down dp link helper and use it. - Assorted compiler warning fixes. - Support dma-buf import for renesas Signed-off-by: Dave Airlie <airlied@redhat.com> # Conflicts: # include/drm/drm_kunit_helpers.h From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Link: https://lore.kernel.org/r/e147ff95-697b-4067-9e2e-7cbd424e162a@linux.intel.com
201 lines
5.5 KiB
C
201 lines
5.5 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright (c) 2022 Maxime Ripard <mripard@kernel.org>
|
|
*/
|
|
|
|
#include <kunit/test.h>
|
|
|
|
#include <drm/drm_connector.h>
|
|
#include <drm/drm_edid.h>
|
|
#include <drm/drm_drv.h>
|
|
#include <drm/drm_kunit_helpers.h>
|
|
#include <drm/drm_modes.h>
|
|
#include <drm/drm_modeset_helper_vtables.h>
|
|
#include <drm/drm_probe_helper.h>
|
|
|
|
struct drm_client_modeset_test_priv {
|
|
struct drm_device *drm;
|
|
struct device *dev;
|
|
struct drm_connector connector;
|
|
};
|
|
|
|
static int drm_client_modeset_connector_get_modes(struct drm_connector *connector)
|
|
{
|
|
struct drm_display_mode *mode;
|
|
int count;
|
|
|
|
count = drm_add_modes_noedid(connector, 1920, 1200);
|
|
|
|
mode = drm_mode_analog_ntsc_480i(connector->dev);
|
|
if (!mode)
|
|
return count;
|
|
|
|
drm_mode_probed_add(connector, mode);
|
|
count += 1;
|
|
|
|
mode = drm_mode_analog_pal_576i(connector->dev);
|
|
if (!mode)
|
|
return count;
|
|
|
|
drm_mode_probed_add(connector, mode);
|
|
count += 1;
|
|
|
|
return count;
|
|
}
|
|
|
|
static const struct drm_connector_helper_funcs drm_client_modeset_connector_helper_funcs = {
|
|
.get_modes = drm_client_modeset_connector_get_modes,
|
|
};
|
|
|
|
static const struct drm_connector_funcs drm_client_modeset_connector_funcs = {
|
|
};
|
|
|
|
static int drm_client_modeset_test_init(struct kunit *test)
|
|
{
|
|
struct drm_client_modeset_test_priv *priv;
|
|
int ret;
|
|
|
|
priv = kunit_kzalloc(test, sizeof(*priv), GFP_KERNEL);
|
|
KUNIT_ASSERT_NOT_NULL(test, priv);
|
|
|
|
test->priv = priv;
|
|
|
|
priv->dev = drm_kunit_helper_alloc_device(test);
|
|
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->dev);
|
|
|
|
priv->drm = __drm_kunit_helper_alloc_drm_device(test, priv->dev,
|
|
sizeof(*priv->drm), 0,
|
|
DRIVER_MODESET);
|
|
KUNIT_ASSERT_NOT_ERR_OR_NULL(test, priv->drm);
|
|
|
|
ret = drmm_connector_init(priv->drm, &priv->connector,
|
|
&drm_client_modeset_connector_funcs,
|
|
DRM_MODE_CONNECTOR_Unknown,
|
|
NULL);
|
|
KUNIT_ASSERT_EQ(test, ret, 0);
|
|
|
|
drm_connector_helper_add(&priv->connector, &drm_client_modeset_connector_helper_funcs);
|
|
|
|
priv->connector.interlace_allowed = true;
|
|
priv->connector.doublescan_allowed = true;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void drm_test_pick_cmdline_res_1920_1080_60(struct kunit *test)
|
|
{
|
|
struct drm_client_modeset_test_priv *priv = test->priv;
|
|
struct drm_device *drm = priv->drm;
|
|
struct drm_connector *connector = &priv->connector;
|
|
struct drm_cmdline_mode *cmdline_mode = &connector->cmdline_mode;
|
|
struct drm_display_mode *expected_mode;
|
|
const struct drm_display_mode *mode;
|
|
const char *cmdline = "1920x1080@60";
|
|
int ret;
|
|
|
|
expected_mode = drm_mode_find_dmt(priv->drm, 1920, 1080, 60, false);
|
|
KUNIT_ASSERT_NOT_NULL(test, expected_mode);
|
|
|
|
ret = drm_kunit_add_mode_destroy_action(test, expected_mode);
|
|
KUNIT_ASSERT_EQ(test, ret, 0);
|
|
|
|
KUNIT_ASSERT_TRUE(test,
|
|
drm_mode_parse_command_line_for_connector(cmdline,
|
|
connector,
|
|
cmdline_mode));
|
|
|
|
mutex_lock(&drm->mode_config.mutex);
|
|
ret = drm_helper_probe_single_connector_modes(connector, 1920, 1080);
|
|
mutex_unlock(&drm->mode_config.mutex);
|
|
KUNIT_ASSERT_GT(test, ret, 0);
|
|
|
|
mode = drm_connector_pick_cmdline_mode(connector);
|
|
KUNIT_ASSERT_NOT_NULL(test, mode);
|
|
|
|
KUNIT_EXPECT_TRUE(test, drm_mode_equal(expected_mode, mode));
|
|
}
|
|
|
|
struct drm_connector_pick_cmdline_mode_test {
|
|
const char *cmdline;
|
|
struct drm_display_mode *(*func)(struct drm_device *drm);
|
|
};
|
|
|
|
#define TEST_CMDLINE(_cmdline, _fn) \
|
|
{ \
|
|
.cmdline = _cmdline, \
|
|
.func = _fn, \
|
|
}
|
|
|
|
static void drm_test_pick_cmdline_named(struct kunit *test)
|
|
{
|
|
const struct drm_connector_pick_cmdline_mode_test *params = test->param_value;
|
|
struct drm_client_modeset_test_priv *priv = test->priv;
|
|
struct drm_device *drm = priv->drm;
|
|
struct drm_connector *connector = &priv->connector;
|
|
struct drm_cmdline_mode *cmdline_mode = &connector->cmdline_mode;
|
|
const struct drm_display_mode *mode;
|
|
struct drm_display_mode *expected_mode;
|
|
const char *cmdline = params->cmdline;
|
|
int ret;
|
|
|
|
KUNIT_ASSERT_TRUE(test,
|
|
drm_mode_parse_command_line_for_connector(cmdline,
|
|
connector,
|
|
cmdline_mode));
|
|
|
|
mutex_lock(&drm->mode_config.mutex);
|
|
ret = drm_helper_probe_single_connector_modes(connector, 1920, 1080);
|
|
mutex_unlock(&drm->mode_config.mutex);
|
|
KUNIT_ASSERT_GT(test, ret, 0);
|
|
|
|
mode = drm_connector_pick_cmdline_mode(connector);
|
|
KUNIT_ASSERT_NOT_NULL(test, mode);
|
|
|
|
expected_mode = params->func(drm);
|
|
KUNIT_ASSERT_NOT_NULL(test, expected_mode);
|
|
|
|
ret = drm_kunit_add_mode_destroy_action(test, expected_mode);
|
|
KUNIT_ASSERT_EQ(test, ret, 0);
|
|
|
|
KUNIT_EXPECT_TRUE(test, drm_mode_equal(expected_mode, mode));
|
|
}
|
|
|
|
static const
|
|
struct drm_connector_pick_cmdline_mode_test drm_connector_pick_cmdline_mode_tests[] = {
|
|
TEST_CMDLINE("NTSC", drm_mode_analog_ntsc_480i),
|
|
TEST_CMDLINE("NTSC-J", drm_mode_analog_ntsc_480i),
|
|
TEST_CMDLINE("PAL", drm_mode_analog_pal_576i),
|
|
TEST_CMDLINE("PAL-M", drm_mode_analog_ntsc_480i),
|
|
};
|
|
|
|
static void
|
|
drm_connector_pick_cmdline_mode_desc(const struct drm_connector_pick_cmdline_mode_test *t,
|
|
char *desc)
|
|
{
|
|
sprintf(desc, "%s", t->cmdline);
|
|
}
|
|
|
|
KUNIT_ARRAY_PARAM(drm_connector_pick_cmdline_mode,
|
|
drm_connector_pick_cmdline_mode_tests,
|
|
drm_connector_pick_cmdline_mode_desc);
|
|
|
|
static struct kunit_case drm_test_pick_cmdline_tests[] = {
|
|
KUNIT_CASE(drm_test_pick_cmdline_res_1920_1080_60),
|
|
KUNIT_CASE_PARAM(drm_test_pick_cmdline_named,
|
|
drm_connector_pick_cmdline_mode_gen_params),
|
|
{}
|
|
};
|
|
|
|
static struct kunit_suite drm_test_pick_cmdline_test_suite = {
|
|
.name = "drm_test_pick_cmdline",
|
|
.init = drm_client_modeset_test_init,
|
|
.test_cases = drm_test_pick_cmdline_tests
|
|
};
|
|
|
|
kunit_test_suite(drm_test_pick_cmdline_test_suite);
|
|
|
|
/*
|
|
* This file is included directly by drm_client_modeset.c so we can't
|
|
* use any MODULE_* macro here.
|
|
*/
|