You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
Pull drm updates from Dave Airlie:
"Highlights:
- AMD KFD driver merge
This is the AMD HSA interface for exposing a lowlevel interface for
GPGPU use. They have an open source userspace built on top of this
interface, and the code looks as good as it was going to get out of
tree.
- Initial atomic modesetting work
The need for an atomic modesetting interface to allow userspace to
try and send a complete set of modesetting state to the driver has
arisen, and been suffering from neglect this past year. No more,
the start of the common code and changes for msm driver to use it
are in this tree. Ongoing work to get the userspace ioctl finished
and the code clean will probably wait until next kernel.
- DisplayID 1.3 and tiled monitor exposed to userspace.
Tiled monitor property is now exposed for userspace to make use of.
- Rockchip drm driver merged.
- imx gpu driver moved out of staging
Other stuff:
- core:
panel - MIPI DSI + new panels.
expose suggested x/y properties for virtual GPUs
- i915:
Initial Skylake (SKL) support
gen3/4 reset work
start of dri1/ums removal
infoframe tracking
fixes for lots of things.
- nouveau:
tegra k1 voltage support
GM204 modesetting support
GT21x memory reclocking work
- radeon:
CI dpm fixes
GPUVM improvements
Initial DPM fan control
- rcar-du:
HDMI support added
removed some support for old boards
slave encoder driver for Analog Devices adv7511
- exynos:
Exynos4415 SoC support
- msm:
a4xx gpu support
atomic helper conversion
- tegra:
iommu support
universal plane support
ganged-mode DSI support
- sti:
HDMI i2c improvements
- vmwgfx:
some late fixes.
- qxl:
use suggested x/y properties"
* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (969 commits)
drm: sti: fix module compilation issue
drm/i915: save/restore GMBUS freq across suspend/resume on gen4
drm: sti: correctly cleanup CRTC and planes
drm: sti: add HQVDP plane
drm: sti: add cursor plane
drm: sti: enable auxiliary CRTC
drm: sti: fix delay in VTG programming
drm: sti: prepare sti_tvout to support auxiliary crtc
drm: sti: use drm_crtc_vblank_{on/off} instead of drm_vblank_{on/off}
drm: sti: fix hdmi avi infoframe
drm: sti: remove event lock while disabling vblank
drm: sti: simplify gdp code
drm: sti: clear all mixer control
drm: sti: remove gpio for HDMI hot plug detection
drm: sti: allow to change hdmi ddc i2c adapter
drm/doc: Document drm_add_modes_noedid() usage
drm/i915: Remove '& 0xffff' from the mask given to WA_REG()
drm/i915: Invert the mask and val arguments in wa_add() and WA_REG()
drm: Zero out DRM object memory upon cleanup
drm/i915/bdw: Fix the write setting up the WIZ hashing mode
...
This commit is contained in:
Linus Torvalds
@@ -86,8 +86,6 @@ source "drivers/staging/gdm72xx/Kconfig"
|
||||
|
||||
source "drivers/staging/gdm724x/Kconfig"
|
||||
|
||||
source "drivers/staging/imx-drm/Kconfig"
|
||||
|
||||
source "drivers/staging/fwserial/Kconfig"
|
||||
|
||||
source "drivers/staging/goldfish/Kconfig"
|
||||
|
||||
@@ -36,7 +36,6 @@ obj-$(CONFIG_STAGING_BOARD) += board/
|
||||
obj-$(CONFIG_USB_WPAN_HCD) += ozwpan/
|
||||
obj-$(CONFIG_WIMAX_GDM72XX) += gdm72xx/
|
||||
obj-$(CONFIG_LTE_GDM724X) += gdm724x/
|
||||
obj-$(CONFIG_DRM_IMX) += imx-drm/
|
||||
obj-$(CONFIG_FIREWIRE_SERIAL) += fwserial/
|
||||
obj-$(CONFIG_GOLDFISH) += goldfish/
|
||||
obj-$(CONFIG_LUSTRE_FS) += lustre/
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
config DRM_IMX
|
||||
tristate "DRM Support for Freescale i.MX"
|
||||
select DRM_KMS_HELPER
|
||||
select DRM_KMS_FB_HELPER
|
||||
select VIDEOMODE_HELPERS
|
||||
select DRM_GEM_CMA_HELPER
|
||||
select DRM_KMS_CMA_HELPER
|
||||
depends on DRM && (ARCH_MXC || ARCH_MULTIPLATFORM)
|
||||
help
|
||||
enable i.MX graphics support
|
||||
|
||||
config DRM_IMX_FB_HELPER
|
||||
tristate "provide legacy framebuffer /dev/fb0"
|
||||
select DRM_KMS_CMA_HELPER
|
||||
depends on DRM_IMX
|
||||
help
|
||||
The DRM framework can provide a legacy /dev/fb0 framebuffer
|
||||
for your device. This is necessary to get a framebuffer console
|
||||
and also for applications using the legacy framebuffer API
|
||||
|
||||
config DRM_IMX_PARALLEL_DISPLAY
|
||||
tristate "Support for parallel displays"
|
||||
select DRM_PANEL
|
||||
depends on DRM_IMX
|
||||
select VIDEOMODE_HELPERS
|
||||
|
||||
config DRM_IMX_TVE
|
||||
tristate "Support for TV and VGA displays"
|
||||
depends on DRM_IMX
|
||||
select REGMAP_MMIO
|
||||
help
|
||||
Choose this to enable the internal Television Encoder (TVe)
|
||||
found on i.MX53 processors.
|
||||
|
||||
config DRM_IMX_LDB
|
||||
tristate "Support for LVDS displays"
|
||||
depends on DRM_IMX && MFD_SYSCON
|
||||
help
|
||||
Choose this to enable the internal LVDS Display Bridge (LDB)
|
||||
found on i.MX53 and i.MX6 processors.
|
||||
|
||||
config DRM_IMX_IPUV3
|
||||
tristate "DRM Support for i.MX IPUv3"
|
||||
depends on DRM_IMX
|
||||
depends on IMX_IPUV3_CORE
|
||||
help
|
||||
Choose this if you have a i.MX5 or i.MX6 processor.
|
||||
|
||||
config DRM_IMX_HDMI
|
||||
tristate "Freescale i.MX DRM HDMI"
|
||||
depends on DRM_IMX
|
||||
help
|
||||
Choose this if you want to use HDMI on i.MX6.
|
||||
@@ -1,12 +0,0 @@
|
||||
|
||||
imxdrm-objs := imx-drm-core.o
|
||||
|
||||
obj-$(CONFIG_DRM_IMX) += imxdrm.o
|
||||
|
||||
obj-$(CONFIG_DRM_IMX_PARALLEL_DISPLAY) += parallel-display.o
|
||||
obj-$(CONFIG_DRM_IMX_TVE) += imx-tve.o
|
||||
obj-$(CONFIG_DRM_IMX_LDB) += imx-ldb.o
|
||||
|
||||
imx-ipuv3-crtc-objs := ipuv3-crtc.o ipuv3-plane.o
|
||||
obj-$(CONFIG_DRM_IMX_IPUV3) += imx-ipuv3-crtc.o
|
||||
obj-$(CONFIG_DRM_IMX_HDMI) += imx-hdmi.o
|
||||
@@ -1,17 +0,0 @@
|
||||
TODO:
|
||||
- get DRM Maintainer review for this code
|
||||
- decide where to put the base driver. It is not specific to a subsystem
|
||||
and would be used by DRM/KMS and media/V4L2
|
||||
|
||||
Missing features (not necessarily for moving out of staging):
|
||||
|
||||
- Add support for IC (Image converter)
|
||||
- Add support for CSI (CMOS Sensor interface)
|
||||
- Add support for VDIC (Video Deinterlacer)
|
||||
|
||||
Many work-in-progress patches for the above features exist. Contact
|
||||
Sascha Hauer <kernel@pengutronix.de> if you are interested in working
|
||||
on a specific feature.
|
||||
|
||||
Please send any patches to Greg Kroah-Hartman <gregkh@linuxfoundation.org> and
|
||||
Sascha Hauer <kernel@pengutronix.de>
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,56 +0,0 @@
|
||||
#ifndef _IMX_DRM_H_
|
||||
#define _IMX_DRM_H_
|
||||
|
||||
struct device_node;
|
||||
struct drm_crtc;
|
||||
struct drm_connector;
|
||||
struct drm_device;
|
||||
struct drm_display_mode;
|
||||
struct drm_encoder;
|
||||
struct drm_fbdev_cma;
|
||||
struct drm_framebuffer;
|
||||
struct imx_drm_crtc;
|
||||
struct platform_device;
|
||||
|
||||
int imx_drm_crtc_id(struct imx_drm_crtc *crtc);
|
||||
|
||||
struct imx_drm_crtc_helper_funcs {
|
||||
int (*enable_vblank)(struct drm_crtc *crtc);
|
||||
void (*disable_vblank)(struct drm_crtc *crtc);
|
||||
int (*set_interface_pix_fmt)(struct drm_crtc *crtc, u32 encoder_type,
|
||||
u32 pix_fmt, int hsync_pin, int vsync_pin);
|
||||
const struct drm_crtc_helper_funcs *crtc_helper_funcs;
|
||||
const struct drm_crtc_funcs *crtc_funcs;
|
||||
};
|
||||
|
||||
int imx_drm_add_crtc(struct drm_device *drm, struct drm_crtc *crtc,
|
||||
struct imx_drm_crtc **new_crtc,
|
||||
const struct imx_drm_crtc_helper_funcs *imx_helper_funcs,
|
||||
struct device_node *port);
|
||||
int imx_drm_remove_crtc(struct imx_drm_crtc *);
|
||||
int imx_drm_init_drm(struct platform_device *pdev,
|
||||
int preferred_bpp);
|
||||
int imx_drm_exit_drm(void);
|
||||
|
||||
int imx_drm_crtc_vblank_get(struct imx_drm_crtc *imx_drm_crtc);
|
||||
void imx_drm_crtc_vblank_put(struct imx_drm_crtc *imx_drm_crtc);
|
||||
void imx_drm_handle_vblank(struct imx_drm_crtc *imx_drm_crtc);
|
||||
|
||||
void imx_drm_mode_config_init(struct drm_device *drm);
|
||||
|
||||
struct drm_gem_cma_object *imx_drm_fb_get_obj(struct drm_framebuffer *fb);
|
||||
|
||||
int imx_drm_panel_format_pins(struct drm_encoder *encoder,
|
||||
u32 interface_pix_fmt, int hsync_pin, int vsync_pin);
|
||||
int imx_drm_panel_format(struct drm_encoder *encoder,
|
||||
u32 interface_pix_fmt);
|
||||
|
||||
int imx_drm_encoder_get_mux_id(struct device_node *node,
|
||||
struct drm_encoder *encoder);
|
||||
int imx_drm_encoder_parse_of(struct drm_device *drm,
|
||||
struct drm_encoder *encoder, struct device_node *np);
|
||||
|
||||
void imx_drm_connector_destroy(struct drm_connector *connector);
|
||||
void imx_drm_encoder_destroy(struct drm_encoder *encoder);
|
||||
|
||||
#endif /* _IMX_DRM_H_ */
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,363 +0,0 @@
|
||||
/*
|
||||
* i.MX IPUv3 DP Overlay Planes
|
||||
*
|
||||
* Copyright (C) 2013 Philipp Zabel, Pengutronix
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#include <drm/drmP.h>
|
||||
#include <drm/drm_fb_cma_helper.h>
|
||||
#include <drm/drm_gem_cma_helper.h>
|
||||
|
||||
#include "video/imx-ipu-v3.h"
|
||||
#include "ipuv3-plane.h"
|
||||
|
||||
#define to_ipu_plane(x) container_of(x, struct ipu_plane, base)
|
||||
|
||||
static const uint32_t ipu_plane_formats[] = {
|
||||
DRM_FORMAT_XRGB1555,
|
||||
DRM_FORMAT_XBGR1555,
|
||||
DRM_FORMAT_ARGB8888,
|
||||
DRM_FORMAT_XRGB8888,
|
||||
DRM_FORMAT_ABGR8888,
|
||||
DRM_FORMAT_XBGR8888,
|
||||
DRM_FORMAT_YUYV,
|
||||
DRM_FORMAT_YVYU,
|
||||
DRM_FORMAT_YUV420,
|
||||
DRM_FORMAT_YVU420,
|
||||
};
|
||||
|
||||
int ipu_plane_irq(struct ipu_plane *ipu_plane)
|
||||
{
|
||||
return ipu_idmac_channel_irq(ipu_plane->ipu, ipu_plane->ipu_ch,
|
||||
IPU_IRQ_EOF);
|
||||
}
|
||||
|
||||
static int calc_vref(struct drm_display_mode *mode)
|
||||
{
|
||||
unsigned long htotal, vtotal;
|
||||
|
||||
htotal = mode->htotal;
|
||||
vtotal = mode->vtotal;
|
||||
|
||||
if (!htotal || !vtotal)
|
||||
return 60;
|
||||
|
||||
return DIV_ROUND_UP(mode->clock * 1000, vtotal * htotal);
|
||||
}
|
||||
|
||||
static inline int calc_bandwidth(int width, int height, unsigned int vref)
|
||||
{
|
||||
return width * height * vref;
|
||||
}
|
||||
|
||||
int ipu_plane_set_base(struct ipu_plane *ipu_plane, struct drm_framebuffer *fb,
|
||||
int x, int y)
|
||||
{
|
||||
struct drm_gem_cma_object *cma_obj;
|
||||
unsigned long eba;
|
||||
|
||||
cma_obj = drm_fb_cma_get_gem_obj(fb, 0);
|
||||
if (!cma_obj) {
|
||||
DRM_DEBUG_KMS("entry is null.\n");
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
dev_dbg(ipu_plane->base.dev->dev, "phys = %pad, x = %d, y = %d",
|
||||
&cma_obj->paddr, x, y);
|
||||
|
||||
ipu_cpmem_set_stride(ipu_plane->ipu_ch, fb->pitches[0]);
|
||||
|
||||
eba = cma_obj->paddr + fb->offsets[0] +
|
||||
fb->pitches[0] * y + (fb->bits_per_pixel >> 3) * x;
|
||||
ipu_cpmem_set_buffer(ipu_plane->ipu_ch, 0, eba);
|
||||
ipu_cpmem_set_buffer(ipu_plane->ipu_ch, 1, eba);
|
||||
|
||||
/* cache offsets for subsequent pageflips */
|
||||
ipu_plane->x = x;
|
||||
ipu_plane->y = y;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int ipu_plane_mode_set(struct ipu_plane *ipu_plane, struct drm_crtc *crtc,
|
||||
struct drm_display_mode *mode,
|
||||
struct drm_framebuffer *fb, int crtc_x, int crtc_y,
|
||||
unsigned int crtc_w, unsigned int crtc_h,
|
||||
uint32_t src_x, uint32_t src_y,
|
||||
uint32_t src_w, uint32_t src_h)
|
||||
{
|
||||
struct device *dev = ipu_plane->base.dev->dev;
|
||||
int ret;
|
||||
|
||||
/* no scaling */
|
||||
if (src_w != crtc_w || src_h != crtc_h)
|
||||
return -EINVAL;
|
||||
|
||||
/* clip to crtc bounds */
|
||||
if (crtc_x < 0) {
|
||||
if (-crtc_x > crtc_w)
|
||||
return -EINVAL;
|
||||
src_x += -crtc_x;
|
||||
src_w -= -crtc_x;
|
||||
crtc_w -= -crtc_x;
|
||||
crtc_x = 0;
|
||||
}
|
||||
if (crtc_y < 0) {
|
||||
if (-crtc_y > crtc_h)
|
||||
return -EINVAL;
|
||||
src_y += -crtc_y;
|
||||
src_h -= -crtc_y;
|
||||
crtc_h -= -crtc_y;
|
||||
crtc_y = 0;
|
||||
}
|
||||
if (crtc_x + crtc_w > mode->hdisplay) {
|
||||
if (crtc_x > mode->hdisplay)
|
||||
return -EINVAL;
|
||||
crtc_w = mode->hdisplay - crtc_x;
|
||||
src_w = crtc_w;
|
||||
}
|
||||
if (crtc_y + crtc_h > mode->vdisplay) {
|
||||
if (crtc_y > mode->vdisplay)
|
||||
return -EINVAL;
|
||||
crtc_h = mode->vdisplay - crtc_y;
|
||||
src_h = crtc_h;
|
||||
}
|
||||
/* full plane minimum width is 13 pixels */
|
||||
if (crtc_w < 13 && (ipu_plane->dp_flow != IPU_DP_FLOW_SYNC_FG))
|
||||
return -EINVAL;
|
||||
if (crtc_h < 2)
|
||||
return -EINVAL;
|
||||
|
||||
switch (ipu_plane->dp_flow) {
|
||||
case IPU_DP_FLOW_SYNC_BG:
|
||||
ret = ipu_dp_setup_channel(ipu_plane->dp,
|
||||
IPUV3_COLORSPACE_RGB,
|
||||
IPUV3_COLORSPACE_RGB);
|
||||
if (ret) {
|
||||
dev_err(dev,
|
||||
"initializing display processor failed with %d\n",
|
||||
ret);
|
||||
return ret;
|
||||
}
|
||||
ipu_dp_set_global_alpha(ipu_plane->dp, 1, 0, 1);
|
||||
break;
|
||||
case IPU_DP_FLOW_SYNC_FG:
|
||||
ipu_dp_setup_channel(ipu_plane->dp,
|
||||
ipu_drm_fourcc_to_colorspace(fb->pixel_format),
|
||||
IPUV3_COLORSPACE_UNKNOWN);
|
||||
ipu_dp_set_window_pos(ipu_plane->dp, crtc_x, crtc_y);
|
||||
break;
|
||||
}
|
||||
|
||||
ret = ipu_dmfc_init_channel(ipu_plane->dmfc, crtc_w);
|
||||
if (ret) {
|
||||
dev_err(dev, "initializing dmfc channel failed with %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = ipu_dmfc_alloc_bandwidth(ipu_plane->dmfc,
|
||||
calc_bandwidth(crtc_w, crtc_h,
|
||||
calc_vref(mode)), 64);
|
||||
if (ret) {
|
||||
dev_err(dev, "allocating dmfc bandwidth failed with %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ipu_cpmem_zero(ipu_plane->ipu_ch);
|
||||
ipu_cpmem_set_resolution(ipu_plane->ipu_ch, src_w, src_h);
|
||||
ret = ipu_cpmem_set_fmt(ipu_plane->ipu_ch, fb->pixel_format);
|
||||
if (ret < 0) {
|
||||
dev_err(dev, "unsupported pixel format 0x%08x\n",
|
||||
fb->pixel_format);
|
||||
return ret;
|
||||
}
|
||||
ipu_cpmem_set_high_priority(ipu_plane->ipu_ch);
|
||||
|
||||
ret = ipu_plane_set_base(ipu_plane, fb, src_x, src_y);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
void ipu_plane_put_resources(struct ipu_plane *ipu_plane)
|
||||
{
|
||||
if (!IS_ERR_OR_NULL(ipu_plane->dp))
|
||||
ipu_dp_put(ipu_plane->dp);
|
||||
if (!IS_ERR_OR_NULL(ipu_plane->dmfc))
|
||||
ipu_dmfc_put(ipu_plane->dmfc);
|
||||
if (!IS_ERR_OR_NULL(ipu_plane->ipu_ch))
|
||||
ipu_idmac_put(ipu_plane->ipu_ch);
|
||||
}
|
||||
|
||||
int ipu_plane_get_resources(struct ipu_plane *ipu_plane)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ipu_plane->ipu_ch = ipu_idmac_get(ipu_plane->ipu, ipu_plane->dma);
|
||||
if (IS_ERR(ipu_plane->ipu_ch)) {
|
||||
ret = PTR_ERR(ipu_plane->ipu_ch);
|
||||
DRM_ERROR("failed to get idmac channel: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
ipu_plane->dmfc = ipu_dmfc_get(ipu_plane->ipu, ipu_plane->dma);
|
||||
if (IS_ERR(ipu_plane->dmfc)) {
|
||||
ret = PTR_ERR(ipu_plane->dmfc);
|
||||
DRM_ERROR("failed to get dmfc: ret %d\n", ret);
|
||||
goto err_out;
|
||||
}
|
||||
|
||||
if (ipu_plane->dp_flow >= 0) {
|
||||
ipu_plane->dp = ipu_dp_get(ipu_plane->ipu, ipu_plane->dp_flow);
|
||||
if (IS_ERR(ipu_plane->dp)) {
|
||||
ret = PTR_ERR(ipu_plane->dp);
|
||||
DRM_ERROR("failed to get dp flow: %d\n", ret);
|
||||
goto err_out;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
err_out:
|
||||
ipu_plane_put_resources(ipu_plane);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
void ipu_plane_enable(struct ipu_plane *ipu_plane)
|
||||
{
|
||||
if (ipu_plane->dp)
|
||||
ipu_dp_enable(ipu_plane->ipu);
|
||||
ipu_dmfc_enable_channel(ipu_plane->dmfc);
|
||||
ipu_idmac_enable_channel(ipu_plane->ipu_ch);
|
||||
if (ipu_plane->dp)
|
||||
ipu_dp_enable_channel(ipu_plane->dp);
|
||||
|
||||
ipu_plane->enabled = true;
|
||||
}
|
||||
|
||||
void ipu_plane_disable(struct ipu_plane *ipu_plane)
|
||||
{
|
||||
ipu_plane->enabled = false;
|
||||
|
||||
ipu_idmac_wait_busy(ipu_plane->ipu_ch, 50);
|
||||
|
||||
if (ipu_plane->dp)
|
||||
ipu_dp_disable_channel(ipu_plane->dp);
|
||||
ipu_idmac_disable_channel(ipu_plane->ipu_ch);
|
||||
ipu_dmfc_disable_channel(ipu_plane->dmfc);
|
||||
if (ipu_plane->dp)
|
||||
ipu_dp_disable(ipu_plane->ipu);
|
||||
}
|
||||
|
||||
/*
|
||||
* drm_plane API
|
||||
*/
|
||||
|
||||
static int ipu_update_plane(struct drm_plane *plane, struct drm_crtc *crtc,
|
||||
struct drm_framebuffer *fb, int crtc_x, int crtc_y,
|
||||
unsigned int crtc_w, unsigned int crtc_h,
|
||||
uint32_t src_x, uint32_t src_y,
|
||||
uint32_t src_w, uint32_t src_h)
|
||||
{
|
||||
struct ipu_plane *ipu_plane = to_ipu_plane(plane);
|
||||
int ret = 0;
|
||||
|
||||
DRM_DEBUG_KMS("plane - %p\n", plane);
|
||||
|
||||
if (!ipu_plane->enabled)
|
||||
ret = ipu_plane_get_resources(ipu_plane);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
ret = ipu_plane_mode_set(ipu_plane, crtc, &crtc->hwmode, fb,
|
||||
crtc_x, crtc_y, crtc_w, crtc_h,
|
||||
src_x >> 16, src_y >> 16, src_w >> 16, src_h >> 16);
|
||||
if (ret < 0) {
|
||||
ipu_plane_put_resources(ipu_plane);
|
||||
return ret;
|
||||
}
|
||||
|
||||
if (crtc != plane->crtc)
|
||||
dev_info(plane->dev->dev, "crtc change: %p -> %p\n",
|
||||
plane->crtc, crtc);
|
||||
plane->crtc = crtc;
|
||||
|
||||
if (!ipu_plane->enabled)
|
||||
ipu_plane_enable(ipu_plane);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ipu_disable_plane(struct drm_plane *plane)
|
||||
{
|
||||
struct ipu_plane *ipu_plane = to_ipu_plane(plane);
|
||||
|
||||
DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);
|
||||
|
||||
if (ipu_plane->enabled)
|
||||
ipu_plane_disable(ipu_plane);
|
||||
|
||||
ipu_plane_put_resources(ipu_plane);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void ipu_plane_destroy(struct drm_plane *plane)
|
||||
{
|
||||
struct ipu_plane *ipu_plane = to_ipu_plane(plane);
|
||||
|
||||
DRM_DEBUG_KMS("[%d] %s\n", __LINE__, __func__);
|
||||
|
||||
ipu_disable_plane(plane);
|
||||
drm_plane_cleanup(plane);
|
||||
kfree(ipu_plane);
|
||||
}
|
||||
|
||||
static struct drm_plane_funcs ipu_plane_funcs = {
|
||||
.update_plane = ipu_update_plane,
|
||||
.disable_plane = ipu_disable_plane,
|
||||
.destroy = ipu_plane_destroy,
|
||||
};
|
||||
|
||||
struct ipu_plane *ipu_plane_init(struct drm_device *dev, struct ipu_soc *ipu,
|
||||
int dma, int dp, unsigned int possible_crtcs,
|
||||
bool priv)
|
||||
{
|
||||
struct ipu_plane *ipu_plane;
|
||||
int ret;
|
||||
|
||||
DRM_DEBUG_KMS("channel %d, dp flow %d, possible_crtcs=0x%x\n",
|
||||
dma, dp, possible_crtcs);
|
||||
|
||||
ipu_plane = kzalloc(sizeof(*ipu_plane), GFP_KERNEL);
|
||||
if (!ipu_plane) {
|
||||
DRM_ERROR("failed to allocate plane\n");
|
||||
return ERR_PTR(-ENOMEM);
|
||||
}
|
||||
|
||||
ipu_plane->ipu = ipu;
|
||||
ipu_plane->dma = dma;
|
||||
ipu_plane->dp_flow = dp;
|
||||
|
||||
ret = drm_plane_init(dev, &ipu_plane->base, possible_crtcs,
|
||||
&ipu_plane_funcs, ipu_plane_formats,
|
||||
ARRAY_SIZE(ipu_plane_formats),
|
||||
priv);
|
||||
if (ret) {
|
||||
DRM_ERROR("failed to initialize plane\n");
|
||||
kfree(ipu_plane);
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
|
||||
return ipu_plane;
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
#ifndef __IPUV3_PLANE_H__
|
||||
#define __IPUV3_PLANE_H__
|
||||
|
||||
#include <drm/drm_crtc.h> /* drm_plane */
|
||||
|
||||
struct drm_plane;
|
||||
struct drm_device;
|
||||
struct ipu_soc;
|
||||
struct drm_crtc;
|
||||
struct drm_framebuffer;
|
||||
|
||||
struct ipuv3_channel;
|
||||
struct dmfc_channel;
|
||||
struct ipu_dp;
|
||||
|
||||
struct ipu_plane {
|
||||
struct drm_plane base;
|
||||
|
||||
struct ipu_soc *ipu;
|
||||
struct ipuv3_channel *ipu_ch;
|
||||
struct dmfc_channel *dmfc;
|
||||
struct ipu_dp *dp;
|
||||
|
||||
int dma;
|
||||
int dp_flow;
|
||||
|
||||
int x;
|
||||
int y;
|
||||
|
||||
bool enabled;
|
||||
};
|
||||
|
||||
struct ipu_plane *ipu_plane_init(struct drm_device *dev, struct ipu_soc *ipu,
|
||||
int dma, int dp, unsigned int possible_crtcs,
|
||||
bool priv);
|
||||
|
||||
/* Init IDMAC, DMFC, DP */
|
||||
int ipu_plane_mode_set(struct ipu_plane *plane, struct drm_crtc *crtc,
|
||||
struct drm_display_mode *mode,
|
||||
struct drm_framebuffer *fb, int crtc_x, int crtc_y,
|
||||
unsigned int crtc_w, unsigned int crtc_h,
|
||||
uint32_t src_x, uint32_t src_y, uint32_t src_w,
|
||||
uint32_t src_h);
|
||||
|
||||
void ipu_plane_enable(struct ipu_plane *plane);
|
||||
void ipu_plane_disable(struct ipu_plane *plane);
|
||||
int ipu_plane_set_base(struct ipu_plane *plane, struct drm_framebuffer *fb,
|
||||
int x, int y);
|
||||
|
||||
int ipu_plane_get_resources(struct ipu_plane *plane);
|
||||
void ipu_plane_put_resources(struct ipu_plane *plane);
|
||||
|
||||
int ipu_plane_irq(struct ipu_plane *plane);
|
||||
|
||||
#endif
|
||||
@@ -1,295 +0,0 @@
|
||||
/*
|
||||
* i.MX drm driver - parallel display implementation
|
||||
*
|
||||
* Copyright (C) 2012 Sascha Hauer, Pengutronix
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
|
||||
* MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
#include <linux/component.h>
|
||||
#include <linux/module.h>
|
||||
#include <drm/drmP.h>
|
||||
#include <drm/drm_fb_helper.h>
|
||||
#include <drm/drm_crtc_helper.h>
|
||||
#include <drm/drm_panel.h>
|
||||
#include <linux/videodev2.h>
|
||||
#include <video/of_display_timing.h>
|
||||
|
||||
#include "imx-drm.h"
|
||||
|
||||
#define con_to_imxpd(x) container_of(x, struct imx_parallel_display, connector)
|
||||
#define enc_to_imxpd(x) container_of(x, struct imx_parallel_display, encoder)
|
||||
|
||||
struct imx_parallel_display {
|
||||
struct drm_connector connector;
|
||||
struct drm_encoder encoder;
|
||||
struct device *dev;
|
||||
void *edid;
|
||||
int edid_len;
|
||||
u32 interface_pix_fmt;
|
||||
int mode_valid;
|
||||
struct drm_display_mode mode;
|
||||
struct drm_panel *panel;
|
||||
};
|
||||
|
||||
static enum drm_connector_status imx_pd_connector_detect(
|
||||
struct drm_connector *connector, bool force)
|
||||
{
|
||||
return connector_status_connected;
|
||||
}
|
||||
|
||||
static int imx_pd_connector_get_modes(struct drm_connector *connector)
|
||||
{
|
||||
struct imx_parallel_display *imxpd = con_to_imxpd(connector);
|
||||
struct device_node *np = imxpd->dev->of_node;
|
||||
int num_modes = 0;
|
||||
|
||||
if (imxpd->panel && imxpd->panel->funcs &&
|
||||
imxpd->panel->funcs->get_modes) {
|
||||
num_modes = imxpd->panel->funcs->get_modes(imxpd->panel);
|
||||
if (num_modes > 0)
|
||||
return num_modes;
|
||||
}
|
||||
|
||||
if (imxpd->edid) {
|
||||
drm_mode_connector_update_edid_property(connector, imxpd->edid);
|
||||
num_modes = drm_add_edid_modes(connector, imxpd->edid);
|
||||
}
|
||||
|
||||
if (imxpd->mode_valid) {
|
||||
struct drm_display_mode *mode = drm_mode_create(connector->dev);
|
||||
|
||||
if (!mode)
|
||||
return -EINVAL;
|
||||
drm_mode_copy(mode, &imxpd->mode);
|
||||
mode->type |= DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED,
|
||||
drm_mode_probed_add(connector, mode);
|
||||
num_modes++;
|
||||
}
|
||||
|
||||
if (np) {
|
||||
struct drm_display_mode *mode = drm_mode_create(connector->dev);
|
||||
|
||||
if (!mode)
|
||||
return -EINVAL;
|
||||
of_get_drm_display_mode(np, &imxpd->mode, OF_USE_NATIVE_MODE);
|
||||
drm_mode_copy(mode, &imxpd->mode);
|
||||
mode->type |= DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED,
|
||||
drm_mode_probed_add(connector, mode);
|
||||
num_modes++;
|
||||
}
|
||||
|
||||
return num_modes;
|
||||
}
|
||||
|
||||
static struct drm_encoder *imx_pd_connector_best_encoder(
|
||||
struct drm_connector *connector)
|
||||
{
|
||||
struct imx_parallel_display *imxpd = con_to_imxpd(connector);
|
||||
|
||||
return &imxpd->encoder;
|
||||
}
|
||||
|
||||
static void imx_pd_encoder_dpms(struct drm_encoder *encoder, int mode)
|
||||
{
|
||||
struct imx_parallel_display *imxpd = enc_to_imxpd(encoder);
|
||||
|
||||
if (mode != DRM_MODE_DPMS_ON)
|
||||
drm_panel_disable(imxpd->panel);
|
||||
else
|
||||
drm_panel_enable(imxpd->panel);
|
||||
}
|
||||
|
||||
static bool imx_pd_encoder_mode_fixup(struct drm_encoder *encoder,
|
||||
const struct drm_display_mode *mode,
|
||||
struct drm_display_mode *adjusted_mode)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
static void imx_pd_encoder_prepare(struct drm_encoder *encoder)
|
||||
{
|
||||
struct imx_parallel_display *imxpd = enc_to_imxpd(encoder);
|
||||
|
||||
imx_drm_panel_format(encoder, imxpd->interface_pix_fmt);
|
||||
}
|
||||
|
||||
static void imx_pd_encoder_commit(struct drm_encoder *encoder)
|
||||
{
|
||||
}
|
||||
|
||||
static void imx_pd_encoder_mode_set(struct drm_encoder *encoder,
|
||||
struct drm_display_mode *mode,
|
||||
struct drm_display_mode *adjusted_mode)
|
||||
{
|
||||
}
|
||||
|
||||
static void imx_pd_encoder_disable(struct drm_encoder *encoder)
|
||||
{
|
||||
}
|
||||
|
||||
static struct drm_connector_funcs imx_pd_connector_funcs = {
|
||||
.dpms = drm_helper_connector_dpms,
|
||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||
.detect = imx_pd_connector_detect,
|
||||
.destroy = imx_drm_connector_destroy,
|
||||
};
|
||||
|
||||
static struct drm_connector_helper_funcs imx_pd_connector_helper_funcs = {
|
||||
.get_modes = imx_pd_connector_get_modes,
|
||||
.best_encoder = imx_pd_connector_best_encoder,
|
||||
};
|
||||
|
||||
static struct drm_encoder_funcs imx_pd_encoder_funcs = {
|
||||
.destroy = imx_drm_encoder_destroy,
|
||||
};
|
||||
|
||||
static struct drm_encoder_helper_funcs imx_pd_encoder_helper_funcs = {
|
||||
.dpms = imx_pd_encoder_dpms,
|
||||
.mode_fixup = imx_pd_encoder_mode_fixup,
|
||||
.prepare = imx_pd_encoder_prepare,
|
||||
.commit = imx_pd_encoder_commit,
|
||||
.mode_set = imx_pd_encoder_mode_set,
|
||||
.disable = imx_pd_encoder_disable,
|
||||
};
|
||||
|
||||
static int imx_pd_register(struct drm_device *drm,
|
||||
struct imx_parallel_display *imxpd)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = imx_drm_encoder_parse_of(drm, &imxpd->encoder,
|
||||
imxpd->dev->of_node);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
/* set the connector's dpms to OFF so that
|
||||
* drm_helper_connector_dpms() won't return
|
||||
* immediately since the current state is ON
|
||||
* at this point.
|
||||
*/
|
||||
imxpd->connector.dpms = DRM_MODE_DPMS_OFF;
|
||||
|
||||
drm_encoder_helper_add(&imxpd->encoder, &imx_pd_encoder_helper_funcs);
|
||||
drm_encoder_init(drm, &imxpd->encoder, &imx_pd_encoder_funcs,
|
||||
DRM_MODE_ENCODER_NONE);
|
||||
|
||||
drm_connector_helper_add(&imxpd->connector,
|
||||
&imx_pd_connector_helper_funcs);
|
||||
drm_connector_init(drm, &imxpd->connector, &imx_pd_connector_funcs,
|
||||
DRM_MODE_CONNECTOR_VGA);
|
||||
|
||||
if (imxpd->panel)
|
||||
drm_panel_attach(imxpd->panel, &imxpd->connector);
|
||||
|
||||
drm_mode_connector_attach_encoder(&imxpd->connector, &imxpd->encoder);
|
||||
|
||||
imxpd->connector.encoder = &imxpd->encoder;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int imx_pd_bind(struct device *dev, struct device *master, void *data)
|
||||
{
|
||||
struct drm_device *drm = data;
|
||||
struct device_node *np = dev->of_node;
|
||||
struct device_node *panel_node;
|
||||
const u8 *edidp;
|
||||
struct imx_parallel_display *imxpd;
|
||||
int ret;
|
||||
const char *fmt;
|
||||
|
||||
imxpd = devm_kzalloc(dev, sizeof(*imxpd), GFP_KERNEL);
|
||||
if (!imxpd)
|
||||
return -ENOMEM;
|
||||
|
||||
edidp = of_get_property(np, "edid", &imxpd->edid_len);
|
||||
if (edidp)
|
||||
imxpd->edid = kmemdup(edidp, imxpd->edid_len, GFP_KERNEL);
|
||||
|
||||
ret = of_property_read_string(np, "interface-pix-fmt", &fmt);
|
||||
if (!ret) {
|
||||
if (!strcmp(fmt, "rgb24"))
|
||||
imxpd->interface_pix_fmt = V4L2_PIX_FMT_RGB24;
|
||||
else if (!strcmp(fmt, "rgb565"))
|
||||
imxpd->interface_pix_fmt = V4L2_PIX_FMT_RGB565;
|
||||
else if (!strcmp(fmt, "bgr666"))
|
||||
imxpd->interface_pix_fmt = V4L2_PIX_FMT_BGR666;
|
||||
else if (!strcmp(fmt, "lvds666"))
|
||||
imxpd->interface_pix_fmt =
|
||||
v4l2_fourcc('L', 'V', 'D', '6');
|
||||
}
|
||||
|
||||
panel_node = of_parse_phandle(np, "fsl,panel", 0);
|
||||
if (panel_node)
|
||||
imxpd->panel = of_drm_find_panel(panel_node);
|
||||
|
||||
imxpd->dev = dev;
|
||||
|
||||
ret = imx_pd_register(drm, imxpd);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
dev_set_drvdata(dev, imxpd);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void imx_pd_unbind(struct device *dev, struct device *master,
|
||||
void *data)
|
||||
{
|
||||
struct imx_parallel_display *imxpd = dev_get_drvdata(dev);
|
||||
|
||||
imxpd->encoder.funcs->destroy(&imxpd->encoder);
|
||||
imxpd->connector.funcs->destroy(&imxpd->connector);
|
||||
}
|
||||
|
||||
static const struct component_ops imx_pd_ops = {
|
||||
.bind = imx_pd_bind,
|
||||
.unbind = imx_pd_unbind,
|
||||
};
|
||||
|
||||
static int imx_pd_probe(struct platform_device *pdev)
|
||||
{
|
||||
return component_add(&pdev->dev, &imx_pd_ops);
|
||||
}
|
||||
|
||||
static int imx_pd_remove(struct platform_device *pdev)
|
||||
{
|
||||
component_del(&pdev->dev, &imx_pd_ops);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct of_device_id imx_pd_dt_ids[] = {
|
||||
{ .compatible = "fsl,imx-parallel-display", },
|
||||
{ /* sentinel */ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, imx_pd_dt_ids);
|
||||
|
||||
static struct platform_driver imx_pd_driver = {
|
||||
.probe = imx_pd_probe,
|
||||
.remove = imx_pd_remove,
|
||||
.driver = {
|
||||
.of_match_table = imx_pd_dt_ids,
|
||||
.name = "imx-parallel-display",
|
||||
},
|
||||
};
|
||||
|
||||
module_platform_driver(imx_pd_driver);
|
||||
|
||||
MODULE_DESCRIPTION("i.MX parallel display driver");
|
||||
MODULE_AUTHOR("Sascha Hauer, Pengutronix");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_ALIAS("platform:imx-parallel-display");
|
||||
Reference in New Issue
Block a user