dri-devel January 2016

dri-devel@lists.freedesktop.org

194 participants
1200 discussions

[PATCH] drm/exynos: fix kernel panic issue at drm releasing
by Inki Dae 05 Jan '16

05 Jan '16

This patch fixes a kernel panic issue which happened when drm driver is closed while modetest. This issue could be reproduced easily by launching modetest with page flip repeatedly. The reason is that invalid drm_file object could be accessed by send_vblank_event function when finishing page flip if the drm_file object was removed by drm_release and there was a pended page flip event which was already committed to hardware. So this patch makes the pended page flip event to be cancelled by preclose callback which is called at front of drm_release function. Signed-off-by: Inki Dae <inki.dae(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 10 ++++++++++ drivers/gpu/drm/exynos/exynos_drm_crtc.h | 3 +++ drivers/gpu/drm/exynos/exynos_drm_drv.c | 5 +++++ 3 files changed, 18 insertions(+) diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index 81cfff5..57619b8 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -235,3 +235,13 @@ void exynos_drm_crtc_te_handler(struct drm_crtc *crtc) if (exynos_crtc->ops->te_handler) exynos_crtc->ops->te_handler(exynos_crtc); } + +void exynos_drm_crtc_cancel_page_flip(struct drm_crtc *crtc) +{ + struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); + unsigned long flags; + + spin_lock_irqsave(&crtc->dev->event_lock, flags); + exynos_crtc->event = NULL; + spin_unlock_irqrestore(&crtc->dev->event_lock, flags); +} diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.h b/drivers/gpu/drm/exynos/exynos_drm_crtc.h index 6a581a8..b4def6e 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.h +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.h @@ -40,4 +40,7 @@ int exynos_drm_crtc_get_pipe_from_type(struct drm_device *drm_dev, */ void exynos_drm_crtc_te_handler(struct drm_crtc *crtc); +/* This function cancels a page flip request. */ +void exynos_drm_crtc_cancel_page_flip(struct drm_crtc *crtc); + #endif diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 9756797a..57c0e7d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -330,7 +330,12 @@ err_file_priv_free: static void exynos_drm_preclose(struct drm_device *dev, struct drm_file *file) { + struct drm_crtc *crtc; + exynos_drm_subdrv_close(dev, file); + + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) + exynos_drm_crtc_cancel_page_flip(crtc); } static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file) -- 1.9.1

3 6

[PATCH v2] drm/exynos: fix kernel panic issue at drm releasing
by Inki Dae 05 Jan '16

05 Jan '16

This patch fixes a kernel panic issue which happened when drm driver is closed while modetest. This issue could be reproduced easily by launching modetest with page flip repeatedly. The reason is that invalid drm_file object could be accessed by send_vblank_event function when finishing page flip if the drm_file object was removed by drm_release and there was a pended page flip event which was already committed to hardware. So this patch makes the pended page flip event to be cancelled by preclose callback which is called at front of drm_release function. Changelog v2: - free vblank event objects belonging to the request process, increment event space and decrease pending_update when cancelling the event Signed-off-by: Inki Dae <inki.dae(a)samsung.com> Reviewed-by: Daniel Stone <daniels(a)collabora.com> --- drivers/gpu/drm/exynos/exynos_drm_crtc.c | 18 ++++++++++++++++++ drivers/gpu/drm/exynos/exynos_drm_crtc.h | 4 ++++ drivers/gpu/drm/exynos/exynos_drm_drv.c | 5 +++++ 3 files changed, 27 insertions(+) diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c index f3589a3..a3c2c71 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c @@ -238,3 +238,21 @@ void exynos_drm_crtc_te_handler(struct drm_crtc *crtc) if (exynos_crtc->ops->te_handler) exynos_crtc->ops->te_handler(exynos_crtc); } + +void exynos_drm_crtc_cancel_page_flip(struct drm_crtc *crtc, + struct drm_file *file) +{ + struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc); + struct drm_pending_vblank_event *e; + unsigned long flags; + + spin_lock_irqsave(&crtc->dev->event_lock, flags); + e = exynos_crtc->event; + if (e && e->base.file_priv == file) { + exynos_crtc->event = NULL; + e->base.destroy(&e->base); + file->event_space += sizeof(e->event); + atomic_dec(&exynos_crtc->pending_update); + } + spin_unlock_irqrestore(&crtc->dev->event_lock, flags); +} diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.h b/drivers/gpu/drm/exynos/exynos_drm_crtc.h index 6a581a8..cfdcf3e 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.h +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.h @@ -40,4 +40,8 @@ int exynos_drm_crtc_get_pipe_from_type(struct drm_device *drm_dev, */ void exynos_drm_crtc_te_handler(struct drm_crtc *crtc); +/* This function cancels a page flip request. */ +void exynos_drm_crtc_cancel_page_flip(struct drm_crtc *crtc, + struct drm_file *file); + #endif diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.c b/drivers/gpu/drm/exynos/exynos_drm_drv.c index 2c6019d..b9a9fd6 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_drv.c +++ b/drivers/gpu/drm/exynos/exynos_drm_drv.c @@ -369,7 +369,12 @@ err_file_priv_free: static void exynos_drm_preclose(struct drm_device *dev, struct drm_file *file) { + struct drm_crtc *crtc; + exynos_drm_subdrv_close(dev, file); + + list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) + exynos_drm_crtc_cancel_page_flip(crtc, file); } static void exynos_drm_postclose(struct drm_device *dev, struct drm_file *file) -- 1.9.1

1 0

[PATCH 1/5] [RFC] drm: Documentation style guide
by Daniel Vetter 05 Jan '16

05 Jan '16

Every time I type or review docs this seems a bit different. Try to document the common style so we can try to unify at least new docs. Signed-off-by: Daniel Vetter <daniel.vetter(a)intel.com> --- Documentation/DocBook/gpu.tmpl | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/Documentation/DocBook/gpu.tmpl b/Documentation/DocBook/gpu.tmpl index 86e5b12a49ba..5698c93dae8b 100644 --- a/Documentation/DocBook/gpu.tmpl +++ b/Documentation/DocBook/gpu.tmpl @@ -124,6 +124,43 @@ <para> [Insert diagram of typical DRM stack here] </para> + <sect1> + <title>Style Guidelines</title> + <para> + For consistency these documentations use American English. Abbreviations + are written as all-uppercase, for example: DRM, KMS, IOCTL, CRTC, and so + on. To aid in reading documentations make full use of the markup + characters kerneldoc provides: @parameter for function paramters, @member + for structure members, &structure to refernce structures and + function() for functions. These all get automatically hyperlinked if + kerneldoc for the referencec objects exists When referencing entries in + function vtables please use -<vfunc(). Note that with kerneldoc does + not support referncing struct members directly, so please add a reference + to the vtable struct somewhere in the same paragraph or at least section. + </para> + <para> + Except in special situations (to separate locked from unlocked variants) + locking requirements for functions aren't documented in the kerneldoc. + Instead locking should be check at runtime using e.g. + <code>WARN_ON(!mutex_is_locked(...));</code>. Since it's much easier to + ignore documentation than runtime noise this provides more value. And on + top of that runtime checks do need to be updated when the locking rules + change, increasing the changes that they're correct. Within the + documentation the locking rules should be explained in the relevant + structures: Either in the comment for the lock explaining what it + protects, or data fields need a note about which lock protects them, or + both. + </para> + <para> + Functions which have a non-<code>void</code> return value should have a + section called "Returns" explaining the expected return values in + different cases an their meanings. Currently there's no consensus whether + that section name should be all upper-case or not, and whether it should + end in a colon or not. Go with the file-local style. Other common section + names are "Notes" with information for dangerous or tricky corner cases, + and "FIXME" where the interface could be cleaned up. + </para> + </sect1> </chapter>  -- 2.5.1

13 29

[PATCHv7 0/5] Add initial support for slimport anx78xx
by Enric Balletbo i Serra 05 Jan '16

05 Jan '16

Hi all, This is another version of the patch set to introduce the anx7814 transmitter. Any comments are welcome. The following series add initial support for the Slimport ANX7814 transmitter, a ultra-low power Full-HD (1080p60) transmitter designed for portable device. The driver was originally created and based from the work of Junhua Xia from Analogix. This driver is a refactor of the original driver and fixes different coding style lines, and different errors/warnings reported by checkpatch. Also there were things that I noticed that we need to change like: - Convert the numbered GPIO API to the new descriptor based GPIO API. - Review the DT binding - Add missing MODULE_DEVICE_TABLE(of, ...); - Fix Makefiles and Kconfig to build conditionally. - Use SIMPLE_DEV_PM_OPS() instead of the deprecated i2c .suspend and .resume callbacks. - Move to use managed device resources. - Remove dead/unused code. - And others ... Enric Balletbo i Serra (5): drm/dp: add DPCD definitions from DP 1.1 hdmi: added functions for MPEG InfoFrames of: Add vendor prefix for Analogix Semiconductor, Inc. devicetree: Add new ANX7814 SlimPort transmitter binding. drm: bridge: anx78xx: Add anx78xx driver support by analogix. .../devicetree/bindings/vendor-prefixes.txt | 1 + .../devicetree/bindings/video/bridge/anx7814.txt | 39 + drivers/gpu/drm/bridge/Kconfig | 2 + drivers/gpu/drm/bridge/Makefile | 1 + drivers/gpu/drm/bridge/anx78xx/Kconfig | 5 + drivers/gpu/drm/bridge/anx78xx/Makefile | 4 + drivers/gpu/drm/bridge/anx78xx/anx78xx.h | 44 + drivers/gpu/drm/bridge/anx78xx/anx78xx_main.c | 334 ++ drivers/gpu/drm/bridge/anx78xx/slimport_tx_drv.c | 3194 ++++++++++++++++++++ drivers/gpu/drm/bridge/anx78xx/slimport_tx_drv.h | 110 + drivers/gpu/drm/bridge/anx78xx/slimport_tx_reg.h | 737 +++++ drivers/video/hdmi.c | 156 + include/drm/drm_dp_helper.h | 10 + include/linux/hdmi.h | 24 + 14 files changed, 4661 insertions(+) create mode 100644 Documentation/devicetree/bindings/video/bridge/anx7814.txt create mode 100644 drivers/gpu/drm/bridge/anx78xx/Kconfig create mode 100644 drivers/gpu/drm/bridge/anx78xx/Makefile create mode 100644 drivers/gpu/drm/bridge/anx78xx/anx78xx.h create mode 100644 drivers/gpu/drm/bridge/anx78xx/anx78xx_main.c create mode 100644 drivers/gpu/drm/bridge/anx78xx/slimport_tx_drv.c create mode 100644 drivers/gpu/drm/bridge/anx78xx/slimport_tx_drv.h create mode 100644 drivers/gpu/drm/bridge/anx78xx/slimport_tx_reg.h -- 2.1.0

2 6

[PATCH 1/3] drm: Balance error path for GEM handle allocation
by Chris Wilson 05 Jan '16

05 Jan '16

The current error path for failure when establishing a handle for a GEM object is unbalance, e.g. we call object_close() without calling first object_open(). Use the typical onion structure to only undo what has been set up prior to the error. Signed-off-by: Chris Wilson <chris(a)chris-wilson.co.uk> --- drivers/gpu/drm/drm_gem.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 2e10bba4468b..a08176debc0e 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -343,27 +343,32 @@ drm_gem_handle_create_tail(struct drm_file *file_priv, spin_unlock(&file_priv->table_lock); idr_preload_end(); mutex_unlock(&dev->object_name_lock); - if (ret < 0) { - drm_gem_object_handle_unreference_unlocked(obj); - return ret; - } + if (ret < 0) + goto err_unref; + *handlep = ret; ret = drm_vma_node_allow(&obj->vma_node, file_priv->filp); - if (ret) { - drm_gem_handle_delete(file_priv, *handlep); - return ret; - } + if (ret) + goto err_remove; if (dev->driver->gem_open_object) { ret = dev->driver->gem_open_object(obj, file_priv); - if (ret) { - drm_gem_handle_delete(file_priv, *handlep); - return ret; - } + if (ret) + goto err_revoke; } return 0; + +err_revoke: + drm_vma_node_revoke(&obj->vma_node, file_priv->filp); +err_remove: + spin_lock(&file_priv->table_lock); + idr_remove(&file_priv->object_idr, *handlep); + spin_unlock(&file_priv->table_lock); +err_unref: + drm_gem_object_handle_unreference_unlocked(obj); + return ret; } /** -- 2.6.4

3 10

[Bug 93471] [radeonsi] power consumption on pitcairn card stays high after 2. monitor disconnected
by bugzilla-daemon＠freedesktop.org 05 Jan '16

05 Jan '16

https://bugs.freedesktop.org/show_bug.cgi?id=93471 Bug ID: 93471 Summary: [radeonsi] power consumption on pitcairn card stays high after 2. monitor disconnected Product: DRI Version: XOrg git Hardware: x86-64 (AMD64) OS: Linux (All) Status: NEW Severity: normal Priority: medium Component: DRM/Radeon Assignee: dri-devel(a)lists.freedesktop.org Reporter: onlineservices(a)marwedels.de Created attachment 120641 --> https://bugs.freedesktop.org/attachment.cgi?id=120641&action=edit drm part of dmesg When starting the PC with a single monitor, the power consumption is about 60W (was 50-55W with a HD4650 before). cat /sys/kernel/debug/dri/64/radeon_pm_info uvd vclk: 0 dclk: 0 power level 0 sclk: 30000 mclk: 15000 vddc: 900 vddci: 850 pcie gen: 2 When adding a second monitor the power consumption stays at this level until its get activated. Once activated (xrandr --output HDMI-0 --auto), the consumption ramps up to 79W. cat /sys/kernel/debug/dri/64/radeon_pm_info uvd vclk: 0 dclk: 0 power level 0 sclk: 30000 mclk: 120000 vddc: 900 vddci: 1000 pcie gen: 2 Disabling the second monitor again (xrandr --output HDMI-0 --off), does not reduce the consumption again. Not even unplugging helps. While I read that its simply not possible to get the low power with two active monitors, could it be possible to manually or automatically switch to the previous clock if all but one monitor have been disabled? Moreover could the signal simply be cloned without consuming +29W if resolution and refresh rate are equal? The second monitor is a projector permanently connected, but switched off 90% of the time. Xorg: From Debian 8.1 stable Kernel: 4.3.3 Card (bought as R7 370): VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Curacao PRO [Radeon R9 270] (rev 81) -- You are receiving this mail because: You are the assignee for the bug.

1 8

[RFC PATCH v1 1/2] drm/rockchip: vop: add rk3229 vop support
by Yakir Yang 05 Jan '16

05 Jan '16

RK3228 registers layout is simalar to RK3288 layout, only the interruput registers is different to RK3288. RK3228 support two overlay plane and one hwc plane, max output resolution is 4K. it support IOMMU, and its IOMMU same as rk3288's. Signed-off-by: Yakir Yang <ykk(a)rock-chips.com> --- drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 7 +- drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 2 + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 120 ++++++++++++++++++++++++++++ drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 90 +++++++++++++++++++++ 4 files changed, 217 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index d83bf87..3c83097 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c @@ -63,9 +63,12 @@ #define VOP_INTR_SET_TYPE(vop, name, type, v) \ do { \ int i, reg = 0; \ - for (i = 0; i < vop->data->intr->nintrs; i++) { \ - if (vop->data->intr->intrs[i] & type) \ + const struct vop_intr *intr = vop->data->intr; \ + for (i = 0; i < intr->nintrs; i++) { \ + if (intr->intrs[i] & type) { \ reg |= (v) << i; \ + reg |= intr->write_mask ? (1 << (i + 16)) : 0; \ + } \ } \ VOP_INTR_SET(vop, name, reg); \ } while (0) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h index 071ff0b..1e839e8 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.h @@ -60,6 +60,7 @@ struct vop_ctrl { }; struct vop_intr { + bool write_mask; const int *intrs; uint32_t nintrs; struct vop_reg enable; @@ -136,6 +137,7 @@ struct vop_data { }; /* interrupt define */ +#define DUMMY_INTR (0 << 0) #define DSP_HOLD_VALID_INTR (1 << 0) #define FS_INTR (1 << 1) #define LINE_FLAG_INTR (1 << 2) diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c index 3166b46..bbcd128 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.c +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.c @@ -174,6 +174,7 @@ static const int rk3288_vop_intrs[] = { }; static const struct vop_intr rk3288_vop_intr = { + .write_mask = false, .intrs = rk3288_vop_intrs, .nintrs = ARRAY_SIZE(rk3288_vop_intrs), .status = VOP_REG(RK3288_INTR_CTRL0, 0xf, 0), @@ -190,6 +191,122 @@ static const struct vop_data rk3288_vop = { .win_size = ARRAY_SIZE(rk3288_vop_win_data), }; +static const struct vop_scl_extension rk3229_win_full_scl_ext = { + .cbcr_vsd_mode = VOP_REG(RK3229_WIN0_CTRL1, 0x1, 31), + .cbcr_vsu_mode = VOP_REG(RK3229_WIN0_CTRL1, 0x1, 30), + .cbcr_hsd_mode = VOP_REG(RK3229_WIN0_CTRL1, 0x3, 28), + .cbcr_ver_scl_mode = VOP_REG(RK3229_WIN0_CTRL1, 0x3, 26), + .cbcr_hor_scl_mode = VOP_REG(RK3229_WIN0_CTRL1, 0x3, 24), + .yrgb_vsd_mode = VOP_REG(RK3229_WIN0_CTRL1, 0x1, 23), + .yrgb_vsu_mode = VOP_REG(RK3229_WIN0_CTRL1, 0x1, 22), + .yrgb_hsd_mode = VOP_REG(RK3229_WIN0_CTRL1, 0x3, 20), + .yrgb_ver_scl_mode = VOP_REG(RK3229_WIN0_CTRL1, 0x3, 18), + .yrgb_hor_scl_mode = VOP_REG(RK3229_WIN0_CTRL1, 0x3, 16), + .line_load_mode = VOP_REG(RK3229_WIN0_CTRL1, 0x1, 15), + .cbcr_axi_gather_num = VOP_REG(RK3229_WIN0_CTRL1, 0x7, 12), + .yrgb_axi_gather_num = VOP_REG(RK3229_WIN0_CTRL1, 0xf, 8), + .vsd_cbcr_gt2 = VOP_REG(RK3229_WIN0_CTRL1, 0x1, 7), + .vsd_cbcr_gt4 = VOP_REG(RK3229_WIN0_CTRL1, 0x1, 6), + .vsd_yrgb_gt2 = VOP_REG(RK3229_WIN0_CTRL1, 0x1, 5), + .vsd_yrgb_gt4 = VOP_REG(RK3229_WIN0_CTRL1, 0x1, 4), + .bic_coe_sel = VOP_REG(RK3229_WIN0_CTRL1, 0x3, 2), + .cbcr_axi_gather_en = VOP_REG(RK3229_WIN0_CTRL1, 0x1, 1), + .yrgb_axi_gather_en = VOP_REG(RK3229_WIN0_CTRL1, 0x1, 0), + .lb_mode = VOP_REG(RK3229_WIN0_CTRL0, 0x7, 5), +}; + +static const struct vop_scl_regs rk3229_win_full_scl = { + .ext = &rk3229_win_full_scl_ext, + .scale_yrgb_x = VOP_REG(RK3229_WIN0_SCL_FACTOR_YRGB, 0xffff, 0x0), + .scale_yrgb_y = VOP_REG(RK3229_WIN0_SCL_FACTOR_YRGB, 0xffff, 16), + .scale_cbcr_x = VOP_REG(RK3229_WIN0_SCL_FACTOR_CBR, 0xffff, 0x0), + .scale_cbcr_y = VOP_REG(RK3229_WIN0_SCL_FACTOR_CBR, 0xffff, 16), +}; + +static const struct vop_win_phy rk3229_win01_data = { + .scl = &rk3229_win_full_scl, + .data_formats = formats_win_full, + .nformats = ARRAY_SIZE(formats_win_full), + .enable = VOP_REG(RK3229_WIN0_CTRL0, 0x1, 0), + .format = VOP_REG(RK3229_WIN0_CTRL0, 0x7, 1), + .rb_swap = VOP_REG(RK3229_WIN0_CTRL0, 0x1, 12), + .act_info = VOP_REG(RK3229_WIN0_ACT_INFO, 0x1fff1fff, 0), + .dsp_info = VOP_REG(RK3229_WIN0_DSP_INFO, 0x0fff0fff, 0), + .dsp_st = VOP_REG(RK3229_WIN0_DSP_ST, 0x1fff1fff, 0), + .yrgb_mst = VOP_REG(RK3229_WIN0_YRGB_MST, 0xffffffff, 0), + .uv_mst = VOP_REG(RK3229_WIN0_CBR_MST, 0xffffffff, 0), + .yrgb_vir = VOP_REG(RK3229_WIN0_VIR, 0x3fff, 0), + .uv_vir = VOP_REG(RK3229_WIN0_VIR, 0x3fff, 16), + .src_alpha_ctl = VOP_REG(RK3229_WIN0_SRC_ALPHA_CTRL, 0xff, 0), + .dst_alpha_ctl = VOP_REG(RK3229_WIN0_DST_ALPHA_CTRL, 0xff, 0), +}; + +static const struct vop_win_data rk3229_vop_win_data[] = { + { .base = 0x00, .phy = &rk3229_win01_data, + .type = DRM_PLANE_TYPE_PRIMARY }, + { .base = 0x40, .phy = &rk3229_win01_data, + .type = DRM_PLANE_TYPE_CURSOR }, +}; + +static const struct vop_ctrl rk3229_ctrl_data = { + .cfg_done = VOP_REG(RK3229_REG_CFG_DONE, 0x1, 0), + .standby = VOP_REG(RK3229_SYS_CTRL, 0x1, 22), + .gate_en = VOP_REG(RK3229_SYS_CTRL, 0x1, 23), + .mmu_en = VOP_REG(RK3229_SYS_CTRL, 0x1, 20), + .rgb_en = VOP_REG(RK3229_SYS_CTRL, 0x1, 12), + .hdmi_en = VOP_REG(RK3229_SYS_CTRL, 0x1, 13), + .edp_en = VOP_REG(RK3229_SYS_CTRL, 0x1, 14), + .mipi_en = VOP_REG(RK3229_SYS_CTRL, 0x1, 15), + .data_blank = VOP_REG(RK3229_DSP_CTRL0, 0x1, 19), + .out_mode = VOP_REG(RK3229_DSP_CTRL0, 0xf, 0), + .pin_pol = VOP_REG(RK3229_DSP_CTRL1, 0xf, 20), + .dither_up = VOP_REG(RK3229_DSP_CTRL1, 0x1, 6), + .htotal_pw = VOP_REG(RK3229_DSP_HTOTAL_HS_END, 0x1fff1fff, 0), + .hact_st_end = VOP_REG(RK3229_DSP_HACT_ST_END, 0x1fff1fff, 0), + .vtotal_pw = VOP_REG(RK3229_DSP_VTOTAL_VS_END, 0x1fff1fff, 0), + .vact_st_end = VOP_REG(RK3229_DSP_VACT_ST_END, 0x1fff1fff, 0), + .hpost_st_end = VOP_REG(RK3229_POST_DSP_HACT_INFO, 0x1fff1fff, 0), + .vpost_st_end = VOP_REG(RK3229_POST_DSP_VACT_INFO, 0x1fff1fff, 0), +}; + +static const int rk3229_vop_intrs[] = { + FS_INTR, + DUMMY_INTR, + DUMMY_INTR, + LINE_FLAG_INTR, + DUMMY_INTR, + DUMMY_INTR, + DUMMY_INTR, + DUMMY_INTR, + DUMMY_INTR, + DUMMY_INTR, + DUMMY_INTR, + DUMMY_INTR, + DUMMY_INTR, + DSP_HOLD_VALID_INTR, +}; + +static const struct vop_intr rk3229_intr = { + .write_mask = true, + .intrs = rk3229_vop_intrs, + .nintrs = ARRAY_SIZE(rk3229_vop_intrs), + .status = VOP_REG(RK3229_INTR_STATUS0, 0xffffffff, 0), + .clear = VOP_REG(RK3229_INTR_CLEAR0, 0xffffffff, 0), + .enable = VOP_REG(RK3229_INTR_EN0, 0xffffffff, 0), +}; + +static const struct vop_reg_data rk3229_vop_init_reg_table[] = { +}; + +static const struct vop_data rk3229_vop = { + .init_table = rk3229_vop_init_reg_table, + .table_size = ARRAY_SIZE(rk3229_vop_init_reg_table), + .intr = &rk3229_intr, + .ctrl = &rk3229_ctrl_data, + .win = rk3229_vop_win_data, + .win_size = ARRAY_SIZE(rk3229_vop_win_data), +}; + static const struct vop_scl_regs rk3066_win_scl = { .scale_yrgb_x = VOP_REG(RK3036_WIN0_SCL_FACTOR_YRGB, 0xffff, 0x0), .scale_yrgb_y = VOP_REG(RK3036_WIN0_SCL_FACTOR_YRGB, 0xffff, 16), @@ -240,6 +357,7 @@ static const int rk3036_vop_intrs[] = { }; static const struct vop_intr rk3036_intr = { + .write_mask = false, .intrs = rk3036_vop_intrs, .nintrs = ARRAY_SIZE(rk3036_vop_intrs), .status = VOP_REG(RK3036_INT_STATUS, 0xf, 0), @@ -274,6 +392,8 @@ static const struct vop_data rk3036_vop = { static const struct of_device_id vop_driver_dt_match[] = { { .compatible = "rockchip,rk3288-vop", .data = &rk3288_vop }, + { .compatible = "rockchip,rk3229-vop", + .data = &rk3229_vop }, { .compatible = "rockchip,rk3036-vop", .data = &rk3036_vop }, {}, diff --git a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h index d4b46cb..8c86b86 100644 --- a/drivers/gpu/drm/rockchip/rockchip_vop_reg.h +++ b/drivers/gpu/drm/rockchip/rockchip_vop_reg.h @@ -15,6 +15,96 @@ #ifndef _ROCKCHIP_VOP_REG_H #define _ROCKCHIP_VOP_REG_H +/* rk3228 register definition */ +#define RK3228_REG_CFG_DONE 0x0000 +#define RK3228_VERSION_INFO 0x0004 +#define RK3228_SYS_CTRL 0x0008 +#define RK3228_SYS_CTRL1 0x000c +#define RK3228_DSP_CTRL0 0x0010 +#define RK3228_DSP_CTRL1 0x0014 +#define RK3228_DSP_BG 0x0018 +#define RK3228_WIN0_CTRL0 0x0030 +#define RK3228_WIN0_CTRL1 0x0034 +#define RK3228_WIN0_COLOR_KEY 0x0038 +#define RK3228_WIN0_VIR 0x003c +#define RK3228_WIN0_YRGB_MST 0x0040 +#define RK3228_WIN0_CBR_MST 0x0044 +#define RK3228_WIN0_ACT_INFO 0x0048 +#define RK3228_WIN0_DSP_INFO 0x004c +#define RK3228_WIN0_DSP_ST 0x0050 +#define RK3228_WIN0_SCL_FACTOR_YRGB 0x0054 +#define RK3228_WIN0_SCL_FACTOR_CBR 0x0058 +#define RK3228_WIN0_SCL_OFFSET 0x005c +#define RK3228_WIN0_SRC_ALPHA_CTRL 0x0060 +#define RK3228_WIN0_DST_ALPHA_CTRL 0x0064 +#define RK3228_WIN0_FADING_CTRL 0x0068 +/* win1 register */ +#define RK3228_WIN1_CTRL0 0x0070 +#define RK3228_WIN1_CTRL1 0x0074 +#define RK3228_WIN1_COLOR_KEY 0x0078 +#define RK3228_WIN1_VIR 0x007c +#define RK3228_WIN1_YRGB_MST 0x0080 +#define RK3228_WIN1_CBR_MST 0x0084 +#define RK3228_WIN1_ACT_INFO 0x0088 +#define RK3228_WIN1_DSP_INFO 0x008c +#define RK3228_WIN1_DSP_ST 0x0090 +#define RK3228_WIN1_SCL_FACTOR_YRGB 0x0094 +#define RK3228_WIN1_SCL_FACTOR_CBR 0x0098 +#define RK3228_WIN1_SCL_OFFSET 0x009c +#define RK3228_WIN1_SRC_ALPHA_CTRL 0x00a0 +#define RK3228_WIN1_DST_ALPHA_CTRL 0x00a4 +#define RK3228_WIN1_FADING_CTRL 0x00a8 +#define RK3228_WIN1_CTRL2 0x00ac +/* hwc register */ +#define RK3228_HWC_CTRL0 0x0150 +#define RK3228_HWC_CTRL1 0x0154 +#define RK3228_HWC_MST 0x0158 +#define RK3228_HWC_DSP_ST 0x015c +#define RK3228_HWC_SRC_ALPHA_CTRL 0x0160 +#define RK3228_HWC_DST_ALPHA_CTRL 0x0164 +#define RK3228_HWC_FADING_CTRL 0x0168 +#define RK3228_HWC_RESERVED 0x016c +/* post process register */ +#define RK3228_POST_DSP_HACT_INFO 0x0170 +#define RK3228_POST_DSP_VACT_INFO 0x0174 +#define RK3228_POST_SCL_FACTOR_YRGB 0x0178 +#define RK3228_POST_RESERVED 0x017c +#define RK3228_POST_SCL_CTRL 0x0180 +#define RK3228_POST_DSP_VACT_INFO_F1 0x0184 +#define RK3228_DSP_HTOTAL_HS_END 0x0188 +#define RK3228_DSP_HACT_ST_END 0x018c +#define RK3228_DSP_VTOTAL_VS_END 0x0190 +#define RK3228_DSP_VACT_ST_END 0x0194 +#define RK3228_DSP_VS_ST_END_F1 0x0198 +#define RK3228_DSP_VACT_ST_END_F1 0x019c +/* Brightness contrast */ +#define RK3228_BCSH_COLOR_BAR 0x01b0 +#define RK3228_BCSH_BCS 0x01b4 +#define RK3228_BCSH_H 0x01b8 +#define RK3228_BCSH_CTRL 0x01bc +/* FRC registers */ +#define RK3228_FRC_LOWER01_0 0x01e8 +#define RK3228_FRC_LOWER01_1 0x01ec +#define RK3228_FRC_LOWER10_0 0x01f0 +#define RK3228_FRC_LOWER10_1 0x01f4 +#define RK3228_FRC_LOWER11_0 0x01f8 +#define RK3228_FRC_LOWER11_1 0x01fc +/* Interrupt registers */ +#define RK3228_INTR_EN0 0x0280 +#define RK3228_INTR_CLEAR0 0x0284 +#define RK3228_INTR_STATUS0 0x0288 +#define RK3228_INTR_RAW_STATUS0 0x028c +#define RK3228_INTR_EN1 0x0290 +#define RK3228_INTR_CLEAR1 0x0294 +#define RK3228_INTR_STATUS1 0x0298 +#define RK3228_INTR_RAW_STATUS1 0x029c +#define RK3228_LINE_FLAG 0x02a0 +#define RK3228_VOP_STATUS 0x02a4 +#define RK3228_BLANKING_VALUE 0x02a8 +#define RK3228_WIN0_DSP_BG 0x02b0 +#define RK3228_WIN1_DSP_BG 0x02b4 +/* register definition end */ + /* rk3288 register definition */ #define RK3288_REG_CFG_DONE 0x0000 #define RK3288_VERSION_INFO 0x0004 -- 1.9.1

2 4

[RFC PATCH v1 2/2] dt-bindings: add document for rk3229-vop
by Yakir Yang 05 Jan '16

05 Jan '16

Signed-off-by: Yakir Yang <ykk(a)rock-chips.com> --- Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt index 5489b59..75ebc20 100644 --- a/Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt @@ -7,6 +7,7 @@ buffer to an external LCD interface. Required properties: - compatible: value should be one of the following "rockchip,rk3288-vop"; + "rockchip,rk3229-vop"; "rockchip,rk3036-vop"; - interrupts: should contain a list of all VOP IP block interrupts in the -- 1.9.1

2 2

[PATCH] Fix no fb check
by Meng Yi 05 Jan '16

05 Jan '16

For state->fb may be NULL in fsl_dcu_drm_plane_atomic_check function, if so, return 0. No need check in fsl_dcu_drm_plane_atomic_update anymore. Signed-off-by: Meng Yi <meng.yi(a)nxp.com> --- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c index 4b13cf9..8965580 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c @@ -41,6 +41,9 @@ static int fsl_dcu_drm_plane_atomic_check(struct drm_plane *plane, { struct drm_framebuffer *fb = state->fb; + if (!state->fb || !state->crtc) + return 0; + switch (fb->pixel_format) { case DRM_FORMAT_RGB565: case DRM_FORMAT_RGB888: @@ -85,9 +88,6 @@ static void fsl_dcu_drm_plane_atomic_update(struct drm_plane *plane, unsigned int alpha, bpp; int index, ret; - if (!fb) - return; - index = fsl_dcu_drm_plane_index(plane); if (index < 0) return; -- 2.1.0.27.g96db324

1 0

[4.2.y-ckt stable] Patch "drm: Use userspace compatible type in fourcc_mod_code macro" has been added to staging queue
by Kamal Mostafa 04 Jan '16

04 Jan '16

This is a note to let you know that I have just added a patch titled drm: Use userspace compatible type in fourcc_mod_code macro to the linux-4.2.y-queue branch of the 4.2.y-ckt extended stable tree which can be found at: http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-4.2.y-queue This patch is scheduled to be released in version 4.2.8-ckt1. If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 4.2.y-ckt tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Kamal ------ >From 821230d84141c4d2da394038db09fcba3fbf57ba Mon Sep 17 00:00:00 2001 From: Tvrtko Ursulin <tvrtko.ursulin(a)intel.com> Date: Wed, 23 Sep 2015 10:10:31 +0100 Subject: drm: Use userspace compatible type in fourcc_mod_code macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit 6172180c6b37ea164bf8a9bad70bb348d0a16563 upstream. __u64 should be used instead of u64. Feature originally added in: commit e3eb3250d84ef97b766312345774367b6a310db8 Author: Rob Clark <robdclark(a)gmail.com> Date: Thu Feb 5 14:41:52 2015 +0000 drm: add support for tiled/compressed/etc modifier in addfb2 Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin(a)intel.com> Cc: Rob Clark <robdclark(a)gmail.com> Cc: Daniel Stone <daniels(a)collabora.com> Cc: Daniel Vetter <daniel.vetter(a)intel.com> Cc: dri-devel(a)lists.freedesktop.org Fixes: e3eb3250d84e ("drm: add support for tiled/compressed/etc modifier in addfb2") Reviewed-by: Ville Syrjälä <ville.syrjala(a)linux.intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1442999431-28568-1-git-send-em… Signed-off-by: Jani Nikula <jani.nikula(a)intel.com> Signed-off-by: Kamal Mostafa <kamal(a)canonical.com> --- include/uapi/drm/drm_fourcc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h index 2f295cd..904c798 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h @@ -151,7 +151,7 @@ /* add more to the end as needed */ #define fourcc_mod_code(vendor, val) \ - ((((u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL)) + ((((__u64)DRM_FORMAT_MOD_VENDOR_## vendor) << 56) | (val & 0x00ffffffffffffffULL)) /* * Format Modifier tokens: -- 1.9.1

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel January 2016