Merge tag 'drm-next-2019-09-18' of git://anongit.freedesktop.org/drm/drm
Pull drm updates from Dave Airlie:
"This is the main pull request for 5.4-rc1 merge window. I don't think
there is anything outstanding so next week should just be fixes, but
we'll see if I missed anything. I landed some fixes earlier in the
week but got delayed writing summary and sending it out, due to a mix
of sick kid and jetlag!
There are some fixes pending, but I'd rather get the main merge out of
the way instead of delaying it longer.
It's also pretty large in commit count and new amd header file size.
The largest thing is four new amdgpu products (navi12/14, arcturus and
renoir APU support).
Otherwise it's pretty much lots of work across the board, i915 has
started landing tigerlake support, lots of icelake fixes and lots of
locking reworking for future gpu support, lots of header file rework
(drmP.h is nearly gone), some old legacy hacks (DRM_WAIT_ON) have been
put into the places they are needed.
uapi:
- content protection type property for HDCP
core:
- rework include dependencies
- lots of drmP.h removals
- link rate calculation robustness fix
- make fb helper map only when required
- add connector->DDC adapter link
- DRM_WAIT_ON removed
- drop DRM_AUTH usage from drivers
dma-buf:
- reservation object fence helper
dma-fence:
- shrink dma_fence struct
- merge signal functions
- store timestamps in dma_fence
- selftests
ttm:
- embed drm_get_object struct into ttm_buffer_object
- release_notify callback
bridges:
- sii902x - audio graph card support
- tc358767 - aux data handling rework
- ti-snd64dsi86 - debugfs support, DSI mode flags support
panels:
- Support for GiantPlus GPM940B0, Sharp LQ070Y3DG3B, Ortustech
COM37H3M, Novatek NT39016, Sharp LS020B1DD01D, Raydium RM67191, Boe
Himax8279d, Sharp LD-D5116Z01B
- TI nspire, NEC NL8048HL11, LG Philips LB035Q02, Sharp LS037V7DW01,
Sony ACX565AKM, Toppoly TD028TTEC1 Toppoly TD043MTEA1
i915:
- Initial tigerlake platform support
- Locking simplification work, general all over refactoring.
- Selftests
- HDCP debug info improvements
- DSI properties
- Icelake display PLL fixes, colorspace fixes, bandwidth fixes, DSI
suspend/resume
- GuC fixes
- Perf fixes
- ElkhartLake enablement
- DP MST fixes
- GVT - command parser enhancements
amdgpu:
- add wipe memory on release flag for buffer creation
- Navi12/14 support (may be marked experimental)
- Arcturus support
- Renoir APU support
- mclk DPM for Navi
- DC display fixes
- Raven scatter/gather support
- RAS support for GFX
- Navi12 + Arcturus power features
- GPU reset for Picasso
- smu11 i2c controller support
amdkfd:
- navi12/14 support
- Arcturus support
radeon:
- kexec fix
nouveau:
- improved display color management
- detect lack of GPU power cables
vmwgfx:
- evicition priority support
- remove unused security feature
msm:
- msm8998 display support
- better async commit support for cursor updates
etnaviv:
- per-process address space support
- performance counter fixes
- softpin support
mcde:
- DCS transfers fix
exynos:
- drmP.h cleanup
lima:
- reduce logging
kirin:
- misc clenaups
komeda:
- dual-link support
- DT memory regions
hisilicon:
- misc fixes
imx:
- IPUv3 image converter fixes
- 32-bit RGB V4L2 pixel format support
ingenic:
- more support for panel related cases
mgag200:
- cursor support fix
panfrost:
- export GPU features register to userspace
- gpu heap allocations
- per-fd address space support
pl111:
- CLD pads wiring support removed from DT
rockchip:
- rework to use DRM PSR helpers
- fix bug in VOP_WIN_GET macro
- DSI DT binding rework
sun4i:
- improve support for color encoding and range
- DDC enabled GPIO
tinydrm:
- rework SPI support
- improve MIPI-DBI support
- moved to drm/tiny
vkms:
- rework CRC tracking
dw-hdmi:
- get_eld and i2s improvements
gm12u320:
- misc fixes
meson:
- global code cleanup
- vpu feature detect
omap:
- alpha/pixel blend mode properties
rcar-du:
- misc fixes"
* tag 'drm-next-2019-09-18' of git://anongit.freedesktop.org/drm/drm: (2112 commits)
drm/nouveau/bar/gm20b: Avoid BAR1 teardown during init
drm/nouveau: Fix ordering between TTM and GEM release
drm/nouveau/prime: Extend DMA reservation object lock
drm/nouveau: Fix fallout from reservation object rework
drm/nouveau/kms/nv50-: Don't create MSTMs for eDP connectors
drm/i915: Use NOEVICT for first pass on attemping to pin a GGTT mmap
drm/i915: to make vgpu ppgtt notificaiton as atomic operation
drm/i915: Flush the existing fence before GGTT read/write
drm/i915: Hold irq-off for the entire fake lock period
drm/i915/gvt: update RING_START reg of vGPU when the context is submitted to i915
drm/i915/gvt: update vgpu workload head pointer correctly
drm/mcde: Fix DSI transfers
drm/msm: Use the correct dma_sync calls harder
drm/msm: remove unlikely() from WARN_ON() conditions
drm/msm/dsi: Fix return value check for clk_get_parent
drm/msm: add atomic traces
drm/msm/dpu: async commit support
drm/msm: async commit support
drm/msm: split power control from prepare/complete_commit
drm/msm: add kms->flush_commit()
...
This commit is contained in:
Linus Torvalds
@@ -6,21 +6,23 @@
|
||||
* Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
*/
|
||||
|
||||
#include <drm/drmP.h>
|
||||
#include <linux/component.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/of_graph.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/reset.h>
|
||||
|
||||
#include <drm/drm_atomic.h>
|
||||
#include <drm/drm_atomic_helper.h>
|
||||
#include <drm/drm_crtc.h>
|
||||
#include <drm/drm_fb_cma_helper.h>
|
||||
#include <drm/drm_fourcc.h>
|
||||
#include <drm/drm_gem_cma_helper.h>
|
||||
#include <drm/drm_plane_helper.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
|
||||
#include <linux/component.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/of_graph.h>
|
||||
#include <linux/reset.h>
|
||||
|
||||
#include "sun4i_backend.h"
|
||||
#include "sun4i_drv.h"
|
||||
#include "sun4i_frontend.h"
|
||||
|
||||
@@ -6,12 +6,6 @@
|
||||
* Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
*/
|
||||
|
||||
#include <drm/drmP.h>
|
||||
#include <drm/drm_atomic_helper.h>
|
||||
#include <drm/drm_crtc.h>
|
||||
#include <drm/drm_modes.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
|
||||
#include <linux/clk-provider.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/of_address.h>
|
||||
@@ -21,6 +15,13 @@
|
||||
|
||||
#include <video/videomode.h>
|
||||
|
||||
#include <drm/drm_atomic_helper.h>
|
||||
#include <drm/drm_crtc.h>
|
||||
#include <drm/drm_modes.h>
|
||||
#include <drm/drm_print.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
#include <drm/drm_vblank.h>
|
||||
|
||||
#include "sun4i_backend.h"
|
||||
#include "sun4i_crtc.h"
|
||||
#include "sun4i_drv.h"
|
||||
|
||||
@@ -8,16 +8,19 @@
|
||||
|
||||
#include <linux/component.h>
|
||||
#include <linux/kfifo.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of_graph.h>
|
||||
#include <linux/of_reserved_mem.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <drm/drmP.h>
|
||||
#include <drm/drm_atomic_helper.h>
|
||||
#include <drm/drm_drv.h>
|
||||
#include <drm/drm_fb_cma_helper.h>
|
||||
#include <drm/drm_fb_helper.h>
|
||||
#include <drm/drm_gem_cma_helper.h>
|
||||
#include <drm/drm_of.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
#include <drm/drm_vblank.h>
|
||||
|
||||
#include "sun4i_drv.h"
|
||||
#include "sun4i_frontend.h"
|
||||
@@ -38,7 +41,7 @@ static int drm_sun4i_gem_dumb_create(struct drm_file *file_priv,
|
||||
DEFINE_DRM_GEM_CMA_FOPS(sun4i_drv_fops);
|
||||
|
||||
static struct drm_driver sun4i_drv_driver = {
|
||||
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | DRIVER_ATOMIC,
|
||||
.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,
|
||||
|
||||
/* Generic Operations */
|
||||
.fops = &sun4i_drv_fops,
|
||||
|
||||
@@ -9,7 +9,6 @@
|
||||
#include <drm/drm_atomic.h>
|
||||
#include <drm/drm_atomic_helper.h>
|
||||
#include <drm/drm_gem_framebuffer_helper.h>
|
||||
#include <drm/drmP.h>
|
||||
|
||||
#include "sun4i_drv.h"
|
||||
#include "sun4i_framebuffer.h"
|
||||
|
||||
@@ -3,9 +3,6 @@
|
||||
* Copyright (C) 2017 Free Electrons
|
||||
* Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
*/
|
||||
#include <drm/drmP.h>
|
||||
#include <drm/drm_gem_cma_helper.h>
|
||||
#include <drm/drm_fb_cma_helper.h>
|
||||
|
||||
#include <linux/clk.h>
|
||||
#include <linux/component.h>
|
||||
@@ -16,6 +13,13 @@
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/reset.h>
|
||||
|
||||
#include <drm/drm_device.h>
|
||||
#include <drm/drm_fb_cma_helper.h>
|
||||
#include <drm/drm_fourcc.h>
|
||||
#include <drm/drm_framebuffer.h>
|
||||
#include <drm/drm_gem_cma_helper.h>
|
||||
#include <drm/drm_plane.h>
|
||||
|
||||
#include "sun4i_drv.h"
|
||||
#include "sun4i_frontend.h"
|
||||
|
||||
|
||||
@@ -5,23 +5,24 @@
|
||||
* Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
*/
|
||||
|
||||
#include <drm/drmP.h>
|
||||
#include <drm/drm_atomic_helper.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
#include <drm/drm_edid.h>
|
||||
#include <drm/drm_encoder.h>
|
||||
#include <drm/drm_of.h>
|
||||
#include <drm/drm_panel.h>
|
||||
|
||||
#include <linux/clk.h>
|
||||
#include <linux/component.h>
|
||||
#include <linux/iopoll.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/reset.h>
|
||||
|
||||
#include <drm/drm_atomic_helper.h>
|
||||
#include <drm/drm_edid.h>
|
||||
#include <drm/drm_encoder.h>
|
||||
#include <drm/drm_of.h>
|
||||
#include <drm/drm_panel.h>
|
||||
#include <drm/drm_print.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
|
||||
#include "sun4i_backend.h"
|
||||
#include "sun4i_crtc.h"
|
||||
#include "sun4i_drv.h"
|
||||
@@ -639,9 +640,10 @@ static int sun4i_hdmi_bind(struct device *dev, struct device *master,
|
||||
|
||||
drm_connector_helper_add(&hdmi->connector,
|
||||
&sun4i_hdmi_connector_helper_funcs);
|
||||
ret = drm_connector_init(drm, &hdmi->connector,
|
||||
&sun4i_hdmi_connector_funcs,
|
||||
DRM_MODE_CONNECTOR_HDMIA);
|
||||
ret = drm_connector_init_with_ddc(drm, &hdmi->connector,
|
||||
&sun4i_hdmi_connector_funcs,
|
||||
DRM_MODE_CONNECTOR_HDMIA,
|
||||
hdmi->ddc_i2c);
|
||||
if (ret) {
|
||||
dev_err(dev,
|
||||
"Couldn't initialise the HDMI connector\n");
|
||||
|
||||
@@ -7,9 +7,8 @@
|
||||
*/
|
||||
|
||||
#include <drm/drm_atomic_helper.h>
|
||||
#include <drm/drm_plane_helper.h>
|
||||
#include <drm/drm_gem_framebuffer_helper.h>
|
||||
#include <drm/drmP.h>
|
||||
#include <drm/drm_plane_helper.h>
|
||||
|
||||
#include "sun4i_backend.h"
|
||||
#include "sun4i_frontend.h"
|
||||
|
||||
@@ -6,10 +6,10 @@
|
||||
|
||||
#include <linux/clk.h>
|
||||
|
||||
#include <drm/drmP.h>
|
||||
#include <drm/drm_atomic_helper.h>
|
||||
#include <drm/drm_of.h>
|
||||
#include <drm/drm_panel.h>
|
||||
#include <drm/drm_print.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
|
||||
#include "sun4i_crtc.h"
|
||||
|
||||
@@ -8,10 +8,10 @@
|
||||
|
||||
#include <linux/clk.h>
|
||||
|
||||
#include <drm/drmP.h>
|
||||
#include <drm/drm_atomic_helper.h>
|
||||
#include <drm/drm_of.h>
|
||||
#include <drm/drm_panel.h>
|
||||
#include <drm/drm_print.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
|
||||
#include "sun4i_crtc.h"
|
||||
|
||||
@@ -6,7 +6,15 @@
|
||||
* Maxime Ripard <maxime.ripard@free-electrons.com>
|
||||
*/
|
||||
|
||||
#include <drm/drmP.h>
|
||||
#include <linux/component.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/of_irq.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/reset.h>
|
||||
|
||||
#include <drm/drm_atomic_helper.h>
|
||||
#include <drm/drm_connector.h>
|
||||
#include <drm/drm_crtc.h>
|
||||
@@ -14,18 +22,12 @@
|
||||
#include <drm/drm_modes.h>
|
||||
#include <drm/drm_of.h>
|
||||
#include <drm/drm_panel.h>
|
||||
#include <drm/drm_print.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
#include <drm/drm_vblank.h>
|
||||
|
||||
#include <uapi/drm/drm_mode.h>
|
||||
|
||||
#include <linux/component.h>
|
||||
#include <linux/ioport.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/of_irq.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/reset.h>
|
||||
|
||||
#include "sun4i_crtc.h"
|
||||
#include "sun4i_dotclock.h"
|
||||
#include "sun4i_drv.h"
|
||||
@@ -479,7 +481,7 @@ static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon,
|
||||
const struct drm_display_mode *mode)
|
||||
{
|
||||
struct drm_connector *connector = sun4i_tcon_get_connector(encoder);
|
||||
struct drm_display_info display_info = connector->display_info;
|
||||
const struct drm_display_info *info = &connector->display_info;
|
||||
unsigned int bp, hsync, vsync;
|
||||
u8 clk_delay;
|
||||
u32 val = 0;
|
||||
@@ -540,7 +542,7 @@ static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon,
|
||||
if (mode->flags & DRM_MODE_FLAG_PVSYNC)
|
||||
val |= SUN4I_TCON0_IO_POL_VSYNC_POSITIVE;
|
||||
|
||||
if (display_info.bus_flags & DRM_BUS_FLAG_DE_LOW)
|
||||
if (info->bus_flags & DRM_BUS_FLAG_DE_LOW)
|
||||
val |= SUN4I_TCON0_IO_POL_DE_NEGATIVE;
|
||||
|
||||
/*
|
||||
@@ -558,10 +560,10 @@ static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon,
|
||||
* Following code is a way to avoid quirks all around TCON
|
||||
* and DOTCLOCK drivers.
|
||||
*/
|
||||
if (display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE)
|
||||
if (info->bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE)
|
||||
clk_set_phase(tcon->dclk, 240);
|
||||
|
||||
if (display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE)
|
||||
if (info->bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE)
|
||||
clk_set_phase(tcon->dclk, 0);
|
||||
|
||||
regmap_update_bits(tcon->regs, SUN4I_TCON0_IO_POL_REG,
|
||||
|
||||
@@ -8,14 +8,16 @@
|
||||
|
||||
#include <linux/clk.h>
|
||||
#include <linux/component.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/reset.h>
|
||||
|
||||
#include <drm/drmP.h>
|
||||
#include <drm/drm_atomic_helper.h>
|
||||
#include <drm/drm_of.h>
|
||||
#include <drm/drm_panel.h>
|
||||
#include <drm/drm_print.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
|
||||
#include "sun4i_crtc.h"
|
||||
|
||||
@@ -9,19 +9,20 @@
|
||||
#include <linux/clk.h>
|
||||
#include <linux/component.h>
|
||||
#include <linux/crc-ccitt.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of_address.h>
|
||||
#include <linux/phy/phy-mipi-dphy.h>
|
||||
#include <linux/phy/phy.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/pm_runtime.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/reset.h>
|
||||
#include <linux/slab.h>
|
||||
|
||||
#include <linux/phy/phy.h>
|
||||
#include <linux/phy/phy-mipi-dphy.h>
|
||||
|
||||
#include <drm/drmP.h>
|
||||
#include <drm/drm_atomic_helper.h>
|
||||
#include <drm/drm_mipi_dsi.h>
|
||||
#include <drm/drm_panel.h>
|
||||
#include <drm/drm_print.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
|
||||
#include "sun4i_crtc.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Copyright (C) Jernej Skrabec <jernej.skrabec@siol.net>
|
||||
*/
|
||||
|
||||
#include <drm/drmP.h>
|
||||
#include <drm/drm_print.h>
|
||||
|
||||
#include "sun8i_csc.h"
|
||||
#include "sun8i_mixer.h"
|
||||
@@ -18,16 +18,59 @@ static const u32 ccsc_base[2][2] = {
|
||||
* First tree values in each line are multiplication factor and last
|
||||
* value is constant, which is added at the end.
|
||||
*/
|
||||
static const u32 yuv2rgb[] = {
|
||||
0x000004A8, 0x00000000, 0x00000662, 0xFFFC845A,
|
||||
0x000004A8, 0xFFFFFE6F, 0xFFFFFCBF, 0x00021DF4,
|
||||
0x000004A8, 0x00000813, 0x00000000, 0xFFFBAC4A,
|
||||
|
||||
static const u32 yuv2rgb[2][2][12] = {
|
||||
[DRM_COLOR_YCBCR_LIMITED_RANGE] = {
|
||||
[DRM_COLOR_YCBCR_BT601] = {
|
||||
0x000004A8, 0x00000000, 0x00000662, 0xFFFC8451,
|
||||
0x000004A8, 0xFFFFFE6F, 0xFFFFFCC0, 0x00021E4D,
|
||||
0x000004A8, 0x00000811, 0x00000000, 0xFFFBACA9,
|
||||
},
|
||||
[DRM_COLOR_YCBCR_BT709] = {
|
||||
0x000004A8, 0x00000000, 0x0000072B, 0xFFFC1F99,
|
||||
0x000004A8, 0xFFFFFF26, 0xFFFFFDDF, 0x00013383,
|
||||
0x000004A8, 0x00000873, 0x00000000, 0xFFFB7BEF,
|
||||
}
|
||||
},
|
||||
[DRM_COLOR_YCBCR_FULL_RANGE] = {
|
||||
[DRM_COLOR_YCBCR_BT601] = {
|
||||
0x00000400, 0x00000000, 0x0000059B, 0xFFFD322E,
|
||||
0x00000400, 0xFFFFFEA0, 0xFFFFFD25, 0x00021DD5,
|
||||
0x00000400, 0x00000716, 0x00000000, 0xFFFC74BD,
|
||||
},
|
||||
[DRM_COLOR_YCBCR_BT709] = {
|
||||
0x00000400, 0x00000000, 0x0000064C, 0xFFFCD9B4,
|
||||
0x00000400, 0xFFFFFF41, 0xFFFFFE21, 0x00014F96,
|
||||
0x00000400, 0x0000076C, 0x00000000, 0xFFFC49EF,
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
static const u32 yvu2rgb[] = {
|
||||
0x000004A8, 0x00000662, 0x00000000, 0xFFFC845A,
|
||||
0x000004A8, 0xFFFFFCBF, 0xFFFFFE6F, 0x00021DF4,
|
||||
0x000004A8, 0x00000000, 0x00000813, 0xFFFBAC4A,
|
||||
static const u32 yvu2rgb[2][2][12] = {
|
||||
[DRM_COLOR_YCBCR_LIMITED_RANGE] = {
|
||||
[DRM_COLOR_YCBCR_BT601] = {
|
||||
0x000004A8, 0x00000662, 0x00000000, 0xFFFC8451,
|
||||
0x000004A8, 0xFFFFFCC0, 0xFFFFFE6F, 0x00021E4D,
|
||||
0x000004A8, 0x00000000, 0x00000811, 0xFFFBACA9,
|
||||
},
|
||||
[DRM_COLOR_YCBCR_BT709] = {
|
||||
0x000004A8, 0x0000072B, 0x00000000, 0xFFFC1F99,
|
||||
0x000004A8, 0xFFFFFDDF, 0xFFFFFF26, 0x00013383,
|
||||
0x000004A8, 0x00000000, 0x00000873, 0xFFFB7BEF,
|
||||
}
|
||||
},
|
||||
[DRM_COLOR_YCBCR_FULL_RANGE] = {
|
||||
[DRM_COLOR_YCBCR_BT601] = {
|
||||
0x00000400, 0x0000059B, 0x00000000, 0xFFFD322E,
|
||||
0x00000400, 0xFFFFFD25, 0xFFFFFEA0, 0x00021DD5,
|
||||
0x00000400, 0x00000000, 0x00000716, 0xFFFC74BD,
|
||||
},
|
||||
[DRM_COLOR_YCBCR_BT709] = {
|
||||
0x00000400, 0x0000064C, 0x00000000, 0xFFFCD9B4,
|
||||
0x00000400, 0xFFFFFE21, 0xFFFFFF41, 0x00014F96,
|
||||
0x00000400, 0x00000000, 0x0000076C, 0xFFFC49EF,
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
/*
|
||||
@@ -53,57 +96,98 @@ static const u32 yvu2rgb[] = {
|
||||
* c20 c21 c22 [d2 const2]
|
||||
*/
|
||||
|
||||
static const u32 yuv2rgb_de3[] = {
|
||||
0x0002542a, 0x00000000, 0x0003312a, 0xffc00000,
|
||||
0x0002542a, 0xffff376b, 0xfffe5fc3, 0xfe000000,
|
||||
0x0002542a, 0x000408d3, 0x00000000, 0xfe000000,
|
||||
static const u32 yuv2rgb_de3[2][2][12] = {
|
||||
[DRM_COLOR_YCBCR_LIMITED_RANGE] = {
|
||||
[DRM_COLOR_YCBCR_BT601] = {
|
||||
0x0002542A, 0x00000000, 0x0003312A, 0xFFC00000,
|
||||
0x0002542A, 0xFFFF376B, 0xFFFE5FC3, 0xFE000000,
|
||||
0x0002542A, 0x000408D2, 0x00000000, 0xFE000000,
|
||||
},
|
||||
[DRM_COLOR_YCBCR_BT709] = {
|
||||
0x0002542A, 0x00000000, 0x000395E2, 0xFFC00000,
|
||||
0x0002542A, 0xFFFF92D2, 0xFFFEEF27, 0xFE000000,
|
||||
0x0002542A, 0x0004398C, 0x00000000, 0xFE000000,
|
||||
}
|
||||
},
|
||||
[DRM_COLOR_YCBCR_FULL_RANGE] = {
|
||||
[DRM_COLOR_YCBCR_BT601] = {
|
||||
0x00020000, 0x00000000, 0x0002CDD2, 0x00000000,
|
||||
0x00020000, 0xFFFF4FCE, 0xFFFE925D, 0xFE000000,
|
||||
0x00020000, 0x00038B43, 0x00000000, 0xFE000000,
|
||||
},
|
||||
[DRM_COLOR_YCBCR_BT709] = {
|
||||
0x00020000, 0x00000000, 0x0003264C, 0x00000000,
|
||||
0x00020000, 0xFFFFA018, 0xFFFF1053, 0xFE000000,
|
||||
0x00020000, 0x0003B611, 0x00000000, 0xFE000000,
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
static const u32 yvu2rgb_de3[] = {
|
||||
0x0002542a, 0x0003312a, 0x00000000, 0xffc00000,
|
||||
0x0002542a, 0xfffe5fc3, 0xffff376b, 0xfe000000,
|
||||
0x0002542a, 0x00000000, 0x000408d3, 0xfe000000,
|
||||
static const u32 yvu2rgb_de3[2][2][12] = {
|
||||
[DRM_COLOR_YCBCR_LIMITED_RANGE] = {
|
||||
[DRM_COLOR_YCBCR_BT601] = {
|
||||
0x0002542A, 0x0003312A, 0x00000000, 0xFFC00000,
|
||||
0x0002542A, 0xFFFE5FC3, 0xFFFF376B, 0xFE000000,
|
||||
0x0002542A, 0x00000000, 0x000408D2, 0xFE000000,
|
||||
},
|
||||
[DRM_COLOR_YCBCR_BT709] = {
|
||||
0x0002542A, 0x000395E2, 0x00000000, 0xFFC00000,
|
||||
0x0002542A, 0xFFFEEF27, 0xFFFF92D2, 0xFE000000,
|
||||
0x0002542A, 0x00000000, 0x0004398C, 0xFE000000,
|
||||
}
|
||||
},
|
||||
[DRM_COLOR_YCBCR_FULL_RANGE] = {
|
||||
[DRM_COLOR_YCBCR_BT601] = {
|
||||
0x00020000, 0x0002CDD2, 0x00000000, 0x00000000,
|
||||
0x00020000, 0xFFFE925D, 0xFFFF4FCE, 0xFE000000,
|
||||
0x00020000, 0x00000000, 0x00038B43, 0xFE000000,
|
||||
},
|
||||
[DRM_COLOR_YCBCR_BT709] = {
|
||||
0x00020000, 0x0003264C, 0x00000000, 0x00000000,
|
||||
0x00020000, 0xFFFF1053, 0xFFFFA018, 0xFE000000,
|
||||
0x00020000, 0x00000000, 0x0003B611, 0xFE000000,
|
||||
}
|
||||
},
|
||||
};
|
||||
|
||||
static void sun8i_csc_set_coefficients(struct regmap *map, u32 base,
|
||||
enum sun8i_csc_mode mode)
|
||||
{
|
||||
const u32 *table;
|
||||
int i, data;
|
||||
|
||||
switch (mode) {
|
||||
case SUN8I_CSC_MODE_YUV2RGB:
|
||||
table = yuv2rgb;
|
||||
break;
|
||||
case SUN8I_CSC_MODE_YVU2RGB:
|
||||
table = yvu2rgb;
|
||||
break;
|
||||
default:
|
||||
DRM_WARN("Wrong CSC mode specified.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
for (i = 0; i < 12; i++) {
|
||||
data = table[i];
|
||||
/* For some reason, 0x200 must be added to constant parts */
|
||||
if (((i + 1) & 3) == 0)
|
||||
data += 0x200;
|
||||
regmap_write(map, SUN8I_CSC_COEFF(base, i), data);
|
||||
}
|
||||
}
|
||||
|
||||
static void sun8i_de3_ccsc_set_coefficients(struct regmap *map, int layer,
|
||||
enum sun8i_csc_mode mode)
|
||||
enum sun8i_csc_mode mode,
|
||||
enum drm_color_encoding encoding,
|
||||
enum drm_color_range range)
|
||||
{
|
||||
const u32 *table;
|
||||
u32 base_reg;
|
||||
|
||||
switch (mode) {
|
||||
case SUN8I_CSC_MODE_YUV2RGB:
|
||||
table = yuv2rgb_de3;
|
||||
table = yuv2rgb[range][encoding];
|
||||
break;
|
||||
case SUN8I_CSC_MODE_YVU2RGB:
|
||||
table = yvu2rgb_de3;
|
||||
table = yvu2rgb[range][encoding];
|
||||
break;
|
||||
default:
|
||||
DRM_WARN("Wrong CSC mode specified.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
base_reg = SUN8I_CSC_COEFF(base, 0);
|
||||
regmap_bulk_write(map, base_reg, table, 12);
|
||||
}
|
||||
|
||||
static void sun8i_de3_ccsc_set_coefficients(struct regmap *map, int layer,
|
||||
enum sun8i_csc_mode mode,
|
||||
enum drm_color_encoding encoding,
|
||||
enum drm_color_range range)
|
||||
{
|
||||
const u32 *table;
|
||||
u32 base_reg;
|
||||
|
||||
switch (mode) {
|
||||
case SUN8I_CSC_MODE_YUV2RGB:
|
||||
table = yuv2rgb_de3[range][encoding];
|
||||
break;
|
||||
case SUN8I_CSC_MODE_YVU2RGB:
|
||||
table = yvu2rgb_de3[range][encoding];
|
||||
break;
|
||||
default:
|
||||
DRM_WARN("Wrong CSC mode specified.\n");
|
||||
@@ -142,19 +226,22 @@ static void sun8i_de3_ccsc_enable(struct regmap *map, int layer, bool enable)
|
||||
}
|
||||
|
||||
void sun8i_csc_set_ccsc_coefficients(struct sun8i_mixer *mixer, int layer,
|
||||
enum sun8i_csc_mode mode)
|
||||
enum sun8i_csc_mode mode,
|
||||
enum drm_color_encoding encoding,
|
||||
enum drm_color_range range)
|
||||
{
|
||||
u32 base;
|
||||
|
||||
if (mixer->cfg->is_de3) {
|
||||
sun8i_de3_ccsc_set_coefficients(mixer->engine.regs,
|
||||
layer, mode);
|
||||
sun8i_de3_ccsc_set_coefficients(mixer->engine.regs, layer,
|
||||
mode, encoding, range);
|
||||
return;
|
||||
}
|
||||
|
||||
base = ccsc_base[mixer->cfg->ccsc][layer];
|
||||
|
||||
sun8i_csc_set_coefficients(mixer->engine.regs, base, mode);
|
||||
sun8i_csc_set_coefficients(mixer->engine.regs, base,
|
||||
mode, encoding, range);
|
||||
}
|
||||
|
||||
void sun8i_csc_enable_ccsc(struct sun8i_mixer *mixer, int layer, bool enable)
|
||||
|
||||
@@ -6,6 +6,8 @@
|
||||
#ifndef _SUN8I_CSC_H_
|
||||
#define _SUN8I_CSC_H_
|
||||
|
||||
#include <drm/drm_color_mgmt.h>
|
||||
|
||||
struct sun8i_mixer;
|
||||
|
||||
/* VI channel CSC units offsets */
|
||||
@@ -26,7 +28,9 @@ enum sun8i_csc_mode {
|
||||
};
|
||||
|
||||
void sun8i_csc_set_ccsc_coefficients(struct sun8i_mixer *mixer, int layer,
|
||||
enum sun8i_csc_mode mode);
|
||||
enum sun8i_csc_mode mode,
|
||||
enum drm_color_encoding encoding,
|
||||
enum drm_color_range range);
|
||||
void sun8i_csc_enable_ccsc(struct sun8i_mixer *mixer, int layer, bool enable);
|
||||
|
||||
#endif
|
||||
|
||||
@@ -8,9 +8,8 @@
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <drm/drm_of.h>
|
||||
#include <drm/drmP.h>
|
||||
#include <drm/drm_crtc_helper.h>
|
||||
#include <drm/drm_of.h>
|
||||
|
||||
#include "sun8i_dw_hdmi.h"
|
||||
#include "sun8i_tcon_top.h"
|
||||
@@ -98,10 +97,34 @@ crtcs_exit:
|
||||
return crtcs;
|
||||
}
|
||||
|
||||
static int sun8i_dw_hdmi_find_connector_pdev(struct device *dev,
|
||||
struct platform_device **pdev_out)
|
||||
{
|
||||
struct platform_device *pdev;
|
||||
struct device_node *remote;
|
||||
|
||||
remote = of_graph_get_remote_node(dev->of_node, 1, -1);
|
||||
if (!remote)
|
||||
return -ENODEV;
|
||||
|
||||
if (!of_device_is_compatible(remote, "hdmi-connector")) {
|
||||
of_node_put(remote);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
pdev = of_find_device_by_node(remote);
|
||||
of_node_put(remote);
|
||||
if (!pdev)
|
||||
return -ENODEV;
|
||||
|
||||
*pdev_out = pdev;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master,
|
||||
void *data)
|
||||
{
|
||||
struct platform_device *pdev = to_platform_device(dev);
|
||||
struct platform_device *pdev = to_platform_device(dev), *connector_pdev;
|
||||
struct dw_hdmi_plat_data *plat_data;
|
||||
struct drm_device *drm = data;
|
||||
struct device_node *phy_node;
|
||||
@@ -151,16 +174,30 @@ static int sun8i_dw_hdmi_bind(struct device *dev, struct device *master,
|
||||
return PTR_ERR(hdmi->regulator);
|
||||
}
|
||||
|
||||
ret = sun8i_dw_hdmi_find_connector_pdev(dev, &connector_pdev);
|
||||
if (!ret) {
|
||||
hdmi->ddc_en = gpiod_get_optional(&connector_pdev->dev,
|
||||
"ddc-en", GPIOD_OUT_HIGH);
|
||||
platform_device_put(connector_pdev);
|
||||
|
||||
if (IS_ERR(hdmi->ddc_en)) {
|
||||
dev_err(dev, "Couldn't get ddc-en gpio\n");
|
||||
return PTR_ERR(hdmi->ddc_en);
|
||||
}
|
||||
}
|
||||
|
||||
ret = regulator_enable(hdmi->regulator);
|
||||
if (ret) {
|
||||
dev_err(dev, "Failed to enable regulator\n");
|
||||
return ret;
|
||||
goto err_unref_ddc_en;
|
||||
}
|
||||
|
||||
gpiod_set_value(hdmi->ddc_en, 1);
|
||||
|
||||
ret = reset_control_deassert(hdmi->rst_ctrl);
|
||||
if (ret) {
|
||||
dev_err(dev, "Could not deassert ctrl reset control\n");
|
||||
goto err_disable_regulator;
|
||||
goto err_disable_ddc_en;
|
||||
}
|
||||
|
||||
ret = clk_prepare_enable(hdmi->clk_tmds);
|
||||
@@ -213,8 +250,12 @@ err_disable_clk_tmds:
|
||||
clk_disable_unprepare(hdmi->clk_tmds);
|
||||
err_assert_ctrl_reset:
|
||||
reset_control_assert(hdmi->rst_ctrl);
|
||||
err_disable_regulator:
|
||||
err_disable_ddc_en:
|
||||
gpiod_set_value(hdmi->ddc_en, 0);
|
||||
regulator_disable(hdmi->regulator);
|
||||
err_unref_ddc_en:
|
||||
if (hdmi->ddc_en)
|
||||
gpiod_put(hdmi->ddc_en);
|
||||
|
||||
return ret;
|
||||
}
|
||||
@@ -228,7 +269,11 @@ static void sun8i_dw_hdmi_unbind(struct device *dev, struct device *master,
|
||||
sun8i_hdmi_phy_remove(hdmi);
|
||||
clk_disable_unprepare(hdmi->clk_tmds);
|
||||
reset_control_assert(hdmi->rst_ctrl);
|
||||
gpiod_set_value(hdmi->ddc_en, 0);
|
||||
regulator_disable(hdmi->regulator);
|
||||
|
||||
if (hdmi->ddc_en)
|
||||
gpiod_put(hdmi->ddc_en);
|
||||
}
|
||||
|
||||
static const struct component_ops sun8i_dw_hdmi_ops = {
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <drm/bridge/dw_hdmi.h>
|
||||
#include <drm/drm_encoder.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/gpio/consumer.h>
|
||||
#include <linux/regmap.h>
|
||||
#include <linux/regulator/consumer.h>
|
||||
#include <linux/reset.h>
|
||||
@@ -190,6 +191,7 @@ struct sun8i_dw_hdmi {
|
||||
struct regulator *regulator;
|
||||
const struct sun8i_dw_hdmi_quirks *quirks;
|
||||
struct reset_control *rst_ctrl;
|
||||
struct gpio_desc *ddc_en;
|
||||
};
|
||||
|
||||
static inline struct sun8i_dw_hdmi *
|
||||
|
||||
@@ -7,7 +7,13 @@
|
||||
* Copyright (C) 2015 NextThing Co
|
||||
*/
|
||||
|
||||
#include <drm/drmP.h>
|
||||
#include <linux/component.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/of_graph.h>
|
||||
#include <linux/reset.h>
|
||||
|
||||
#include <drm/drm_atomic_helper.h>
|
||||
#include <drm/drm_crtc.h>
|
||||
#include <drm/drm_fb_cma_helper.h>
|
||||
@@ -15,12 +21,6 @@
|
||||
#include <drm/drm_plane_helper.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
|
||||
#include <linux/component.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/of_graph.h>
|
||||
#include <linux/reset.h>
|
||||
|
||||
#include "sun4i_drv.h"
|
||||
#include "sun8i_mixer.h"
|
||||
#include "sun8i_ui_layer.h"
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
// SPDX-License-Identifier: GPL-2.0+
|
||||
/* Copyright (c) 2018 Jernej Skrabec <jernej.skrabec@siol.net> */
|
||||
|
||||
#include <drm/drmP.h>
|
||||
|
||||
#include <dt-bindings/clock/sun8i-tcon-top.h>
|
||||
|
||||
#include <linux/bitfield.h>
|
||||
#include <linux/component.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/of_graph.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#include <dt-bindings/clock/sun8i-tcon-top.h>
|
||||
|
||||
#include "sun8i_tcon_top.h"
|
||||
|
||||
struct sun8i_tcon_top_quirks {
|
||||
|
||||
@@ -13,11 +13,11 @@
|
||||
#include <drm/drm_atomic_helper.h>
|
||||
#include <drm/drm_crtc.h>
|
||||
#include <drm/drm_fb_cma_helper.h>
|
||||
#include <drm/drm_fourcc.h>
|
||||
#include <drm/drm_gem_cma_helper.h>
|
||||
#include <drm/drm_gem_framebuffer_helper.h>
|
||||
#include <drm/drm_plane_helper.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
#include <drm/drmP.h>
|
||||
|
||||
#include "sun8i_ui_layer.h"
|
||||
#include "sun8i_mixer.h"
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
#include <drm/drm_gem_framebuffer_helper.h>
|
||||
#include <drm/drm_plane_helper.h>
|
||||
#include <drm/drm_probe_helper.h>
|
||||
#include <drm/drmP.h>
|
||||
|
||||
#include "sun8i_vi_layer.h"
|
||||
#include "sun8i_mixer.h"
|
||||
@@ -232,7 +231,9 @@ static int sun8i_vi_layer_update_formats(struct sun8i_mixer *mixer, int channel,
|
||||
SUN8I_MIXER_CHAN_VI_LAYER_ATTR_FBFMT_MASK, val);
|
||||
|
||||
if (fmt_info->csc != SUN8I_CSC_MODE_OFF) {
|
||||
sun8i_csc_set_ccsc_coefficients(mixer, channel, fmt_info->csc);
|
||||
sun8i_csc_set_ccsc_coefficients(mixer, channel, fmt_info->csc,
|
||||
state->color_encoding,
|
||||
state->color_range);
|
||||
sun8i_csc_enable_ccsc(mixer, channel, true);
|
||||
} else {
|
||||
sun8i_csc_enable_ccsc(mixer, channel, false);
|
||||
@@ -441,6 +442,7 @@ struct sun8i_vi_layer *sun8i_vi_layer_init_one(struct drm_device *drm,
|
||||
struct sun8i_mixer *mixer,
|
||||
int index)
|
||||
{
|
||||
u32 supported_encodings, supported_ranges;
|
||||
struct sun8i_vi_layer *layer;
|
||||
unsigned int plane_cnt;
|
||||
int ret;
|
||||
@@ -469,6 +471,22 @@ struct sun8i_vi_layer *sun8i_vi_layer_init_one(struct drm_device *drm,
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
|
||||
supported_encodings = BIT(DRM_COLOR_YCBCR_BT601) |
|
||||
BIT(DRM_COLOR_YCBCR_BT709);
|
||||
|
||||
supported_ranges = BIT(DRM_COLOR_YCBCR_LIMITED_RANGE) |
|
||||
BIT(DRM_COLOR_YCBCR_FULL_RANGE);
|
||||
|
||||
ret = drm_plane_create_color_properties(&layer->plane,
|
||||
supported_encodings,
|
||||
supported_ranges,
|
||||
DRM_COLOR_YCBCR_BT709,
|
||||
DRM_COLOR_YCBCR_LIMITED_RANGE);
|
||||
if (ret) {
|
||||
dev_err(drm->dev, "Couldn't add encoding and range properties!\n");
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
|
||||
drm_plane_helper_add(&layer->plane, &sun8i_vi_layer_helper_funcs);
|
||||
layer->mixer = mixer;
|
||||
layer->channel = index;
|
||||
|
||||
Reference in New Issue
Block a user