mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
UAPI Changes:
Cross-subsystem Changes:
- DMA-buf: documentation updates.
- Assorted small fixes to vga16fb
- Fix fbdev drivers to use the aperture helpers.
- Make removal of conflicting drivers work correctly without fbdev enabled.
Core Changes:
- bridge, scheduler, dp-mst: Assorted small fixes.
- Add more format helpers to fourcc, and use it to replace the cpp usage.
- Add DRM_FORMAT_Cxx, DRM_FORMAT_Rxx (single channel), and DRM_FORMAT_Dxx
("darkness", inverted single channel)
- Add packed AYUV8888 and XYUV8888 formats.
- Assorted documentation updates.
- Rename ttm_bo_init to ttm_bo_init_validate.
- Allow TTM bo's to exist without backing store.
- Convert drm selftests to kunit.
- Add managed init functions for (panel) bridge, crtc, encoder and connector.
- Fix endianness handling in various format conversion helpers.
- Make tests pass on big-endian platforms, and add test for rgb888 -> rgb565
- Move DRM_PLANE_HELPER_NO_SCALING to atomic helpers and rename, so
drm_plane_helper is no longer needed in most drivers.
- Use idr_init_base instead of idr_init.
- Rename FB and GEM CMA helpers to DMA helpers.
- Rework XRGB8888 related conversion helpers, and add drm_fb_blit() that
takes a iosys_map. Make drm_fb_memcpy take an iosys_map too.
- Move edid luminance calculation to core, and use it in i915.
Driver Changes:
- bridge/{adv7511,ti-sn65dsi86,parade-ps8640}, panel/{simple,nt35510,tc358767},
nouveau, sun4i, mipi-dsi, mgag200, bochs, arm, komeda, vmwgfx, pl111:
Assorted small fixes and doc updates.
- vc4: Rework hdmi power up, and depend on PM.
- panel/simple: Add Samsung LTL101AL01.
- ingenic: Add JZ4760(B) support, avoid a modeset when sharpness property
is unchanged, and use the new PM ops.
- Revert some amdgpu commits that cause garbaged graphics when starting
X, and reapply them with the real problem fixed.
- Completely rework vc4 init to use managed helpers.
- Rename via_drv to via_dri1, and move all stuff there only used by the
dri1 implementation in preperation for atomic modeset.
- Use regmap bulk write in ssd130x.
- Power sequence and clock updates to it6505.
- Split panel-sitrox-st7701 init sequence and rework mode programming code.
- virtio: Improve error and edge conditions handling, and convert to use managed
helpers.
- Add Samsung LTL101AL01, B120XAN01.0, R140NWF5 RH, DMT028VGHMCMI-1A T, panels.
- Add generic fbdev support to komeda.
- Split mgag200 modeset handling to make it more model-specific.
- Convert simpledrm to use atomic helpers.
- Improve udl suspend/disconnect handling.
-----BEGIN PGP SIGNATURE-----
iQIzBAABCgAdFiEEuXvWqAysSYEJGuVH/lWMcqZwE8MFAmMA59MACgkQ/lWMcqZw
E8MBihAAtttSIF8fvRIgnoFeswteB5HlXtrSOVRns+0h7mNzcmUL3yp/jV9betND
NEfBCERRIRk5vqkzm2o9P/rTG+KMYCyyCNdcvvh+rVn+HU2V9MwtJdowZqLu7Rxi
Qn59SaL6fMQanJwF8yHcii1ikqelU8TfsMXcFXt2d/yjn5D/h80tNOULEB74zIDH
Vey/xTawcqEz3Qbj2mL4VihEnzU1cziGTpZvAWU2GTdWLxxN88uA4RD2JDyvGaXG
oO6oilYT9TW+2C+0jfMUysu7RcNYuo4KD8dSVLvec+UKDKdO1pSqn40vgTZp0MBw
V0VGg/Lqg6+u33UQkxeRpdzTboD4cMjoeP0/IJdHQVMYYH449tXDgZEjXqVHdz2c
Ea8JIm36CHjqA0Ua3DT8y1qRtdrjuATJauoB6MXW8RpguqMzVuI4e9Dio77WRNYe
Lg/V5AlQEKcwxeqe6v+8K7aB4lvHZ9g0WSMFHoxYz28d2cFWDVeKgK/GCW3WWMKo
AQigRS84z3QBqK+IeTjbfZREoRFtx7NzQpzU9jQdL06XGWExhGOs8yU2OCoDNN8+
iFMBStEPHLPg27HrLV5JYeMRUBPJMnwQhAEnrSv9KqIfPD3/g2jonoGm3J57p+OI
Ag7pwg88spzP1DC7M6+UvzUnH76Dhf4hdnfQjz10c6BfS1ODPbA=
=kU/l
-----END PGP SIGNATURE-----
Merge tag 'drm-misc-next-2022-08-20-1' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for v6.1:
UAPI Changes:
Cross-subsystem Changes:
- DMA-buf: documentation updates.
- Assorted small fixes to vga16fb
- Fix fbdev drivers to use the aperture helpers.
- Make removal of conflicting drivers work correctly without fbdev enabled.
Core Changes:
- bridge, scheduler, dp-mst: Assorted small fixes.
- Add more format helpers to fourcc, and use it to replace the cpp usage.
- Add DRM_FORMAT_Cxx, DRM_FORMAT_Rxx (single channel), and DRM_FORMAT_Dxx
("darkness", inverted single channel)
- Add packed AYUV8888 and XYUV8888 formats.
- Assorted documentation updates.
- Rename ttm_bo_init to ttm_bo_init_validate.
- Allow TTM bo's to exist without backing store.
- Convert drm selftests to kunit.
- Add managed init functions for (panel) bridge, crtc, encoder and connector.
- Fix endianness handling in various format conversion helpers.
- Make tests pass on big-endian platforms, and add test for rgb888 -> rgb565
- Move DRM_PLANE_HELPER_NO_SCALING to atomic helpers and rename, so
drm_plane_helper is no longer needed in most drivers.
- Use idr_init_base instead of idr_init.
- Rename FB and GEM CMA helpers to DMA helpers.
- Rework XRGB8888 related conversion helpers, and add drm_fb_blit() that
takes a iosys_map. Make drm_fb_memcpy take an iosys_map too.
- Move edid luminance calculation to core, and use it in i915.
Driver Changes:
- bridge/{adv7511,ti-sn65dsi86,parade-ps8640}, panel/{simple,nt35510,tc358767},
nouveau, sun4i, mipi-dsi, mgag200, bochs, arm, komeda, vmwgfx, pl111:
Assorted small fixes and doc updates.
- vc4: Rework hdmi power up, and depend on PM.
- panel/simple: Add Samsung LTL101AL01.
- ingenic: Add JZ4760(B) support, avoid a modeset when sharpness property
is unchanged, and use the new PM ops.
- Revert some amdgpu commits that cause garbaged graphics when starting
X, and reapply them with the real problem fixed.
- Completely rework vc4 init to use managed helpers.
- Rename via_drv to via_dri1, and move all stuff there only used by the
dri1 implementation in preperation for atomic modeset.
- Use regmap bulk write in ssd130x.
- Power sequence and clock updates to it6505.
- Split panel-sitrox-st7701 init sequence and rework mode programming code.
- virtio: Improve error and edge conditions handling, and convert to use managed
helpers.
- Add Samsung LTL101AL01, B120XAN01.0, R140NWF5 RH, DMT028VGHMCMI-1A T, panels.
- Add generic fbdev support to komeda.
- Split mgag200 modeset handling to make it more model-specific.
- Convert simpledrm to use atomic helpers.
- Improve udl suspend/disconnect handling.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/f0c71766-61e8-19b7-763a-5fbcdefc633d@linux.intel.com
178 lines
4.1 KiB
C
178 lines
4.1 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Copyright 2019 NXP.
|
|
*/
|
|
|
|
#include <drm/drm_atomic.h>
|
|
#include <drm/drm_atomic_helper.h>
|
|
#include <drm/drm_bridge_connector.h>
|
|
#include <drm/drm_drv.h>
|
|
#include <drm/drm_fb_helper.h>
|
|
#include <drm/drm_gem_dma_helper.h>
|
|
#include <drm/drm_gem_framebuffer_helper.h>
|
|
#include <drm/drm_of.h>
|
|
#include <drm/drm_probe_helper.h>
|
|
#include <drm/drm_vblank.h>
|
|
|
|
#include "dcss-dev.h"
|
|
#include "dcss-kms.h"
|
|
|
|
DEFINE_DRM_GEM_DMA_FOPS(dcss_cma_fops);
|
|
|
|
static const struct drm_mode_config_funcs dcss_drm_mode_config_funcs = {
|
|
.fb_create = drm_gem_fb_create,
|
|
.output_poll_changed = drm_fb_helper_output_poll_changed,
|
|
.atomic_check = drm_atomic_helper_check,
|
|
.atomic_commit = drm_atomic_helper_commit,
|
|
};
|
|
|
|
static const struct drm_driver dcss_kms_driver = {
|
|
.driver_features = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
|
|
DRM_GEM_DMA_DRIVER_OPS,
|
|
.fops = &dcss_cma_fops,
|
|
.name = "imx-dcss",
|
|
.desc = "i.MX8MQ Display Subsystem",
|
|
.date = "20190917",
|
|
.major = 1,
|
|
.minor = 0,
|
|
.patchlevel = 0,
|
|
};
|
|
|
|
static const struct drm_mode_config_helper_funcs dcss_mode_config_helpers = {
|
|
.atomic_commit_tail = drm_atomic_helper_commit_tail_rpm,
|
|
};
|
|
|
|
static void dcss_kms_mode_config_init(struct dcss_kms_dev *kms)
|
|
{
|
|
struct drm_mode_config *config = &kms->base.mode_config;
|
|
|
|
drm_mode_config_init(&kms->base);
|
|
|
|
config->min_width = 1;
|
|
config->min_height = 1;
|
|
config->max_width = 4096;
|
|
config->max_height = 4096;
|
|
config->normalize_zpos = true;
|
|
|
|
config->funcs = &dcss_drm_mode_config_funcs;
|
|
config->helper_private = &dcss_mode_config_helpers;
|
|
}
|
|
|
|
static const struct drm_encoder_funcs dcss_kms_simple_encoder_funcs = {
|
|
.destroy = drm_encoder_cleanup,
|
|
};
|
|
|
|
static int dcss_kms_bridge_connector_init(struct dcss_kms_dev *kms)
|
|
{
|
|
struct drm_device *ddev = &kms->base;
|
|
struct drm_encoder *encoder = &kms->encoder;
|
|
struct drm_crtc *crtc = (struct drm_crtc *)&kms->crtc;
|
|
struct drm_panel *panel;
|
|
struct drm_bridge *bridge;
|
|
int ret;
|
|
|
|
ret = drm_of_find_panel_or_bridge(ddev->dev->of_node, 0, 0,
|
|
&panel, &bridge);
|
|
if (ret)
|
|
return ret;
|
|
|
|
if (!bridge) {
|
|
dev_err(ddev->dev, "No bridge found %d.\n", ret);
|
|
return -ENODEV;
|
|
}
|
|
|
|
encoder->possible_crtcs = drm_crtc_mask(crtc);
|
|
|
|
ret = drm_encoder_init(&kms->base, encoder,
|
|
&dcss_kms_simple_encoder_funcs,
|
|
DRM_MODE_ENCODER_NONE, NULL);
|
|
if (ret) {
|
|
dev_err(ddev->dev, "Failed initializing encoder %d.\n", ret);
|
|
return ret;
|
|
}
|
|
|
|
ret = drm_bridge_attach(encoder, bridge, NULL,
|
|
DRM_BRIDGE_ATTACH_NO_CONNECTOR);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
kms->connector = drm_bridge_connector_init(ddev, encoder);
|
|
if (IS_ERR(kms->connector)) {
|
|
dev_err(ddev->dev, "Unable to create bridge connector.\n");
|
|
return PTR_ERR(kms->connector);
|
|
}
|
|
|
|
drm_connector_attach_encoder(kms->connector, encoder);
|
|
|
|
return 0;
|
|
}
|
|
|
|
struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss)
|
|
{
|
|
struct dcss_kms_dev *kms;
|
|
struct drm_device *drm;
|
|
struct dcss_crtc *crtc;
|
|
int ret;
|
|
|
|
kms = devm_drm_dev_alloc(dcss->dev, &dcss_kms_driver,
|
|
struct dcss_kms_dev, base);
|
|
if (IS_ERR(kms))
|
|
return kms;
|
|
|
|
drm = &kms->base;
|
|
crtc = &kms->crtc;
|
|
|
|
drm->dev_private = dcss;
|
|
|
|
dcss_kms_mode_config_init(kms);
|
|
|
|
ret = drm_vblank_init(drm, 1);
|
|
if (ret)
|
|
goto cleanup_mode_config;
|
|
|
|
ret = dcss_kms_bridge_connector_init(kms);
|
|
if (ret)
|
|
goto cleanup_mode_config;
|
|
|
|
ret = dcss_crtc_init(crtc, drm);
|
|
if (ret)
|
|
goto cleanup_mode_config;
|
|
|
|
drm_mode_config_reset(drm);
|
|
|
|
drm_kms_helper_poll_init(drm);
|
|
|
|
ret = drm_dev_register(drm, 0);
|
|
if (ret)
|
|
goto cleanup_crtc;
|
|
|
|
drm_fbdev_generic_setup(drm, 32);
|
|
|
|
return kms;
|
|
|
|
cleanup_crtc:
|
|
drm_bridge_connector_disable_hpd(kms->connector);
|
|
drm_kms_helper_poll_fini(drm);
|
|
dcss_crtc_deinit(crtc, drm);
|
|
|
|
cleanup_mode_config:
|
|
drm_mode_config_cleanup(drm);
|
|
drm->dev_private = NULL;
|
|
|
|
return ERR_PTR(ret);
|
|
}
|
|
|
|
void dcss_kms_detach(struct dcss_kms_dev *kms)
|
|
{
|
|
struct drm_device *drm = &kms->base;
|
|
|
|
drm_dev_unregister(drm);
|
|
drm_bridge_connector_disable_hpd(kms->connector);
|
|
drm_kms_helper_poll_fini(drm);
|
|
drm_atomic_helper_shutdown(drm);
|
|
drm_crtc_vblank_off(&kms->crtc.base);
|
|
drm_mode_config_cleanup(drm);
|
|
dcss_crtc_deinit(&kms->crtc, drm);
|
|
drm->dev_private = NULL;
|
|
}
|