Armada DRM updates for 4.4
Subsystems (2)
cover Armada DRM updates for 4.4
Here are my queued changes for the Armada DRM driver, for the upcoming 4.4 merge window.
These changes are about updating the driver to some of the more recent DRM APIs, and removing the non-component support now that has stabilised. This results in all of armada_output and armada_slave being removed, resulting in 460 lines of code removed from that change alone.
Other changes include:
* moving more towards supporting DRM planes in a more generic way, thereby reducing the duplication between the primary and overlay planes.
* locking cleanups, more like locking removal, prefering inherently atomic operations (eg, xchg) instead of spinlocking. This ultimately results in simpler and faster code.
I've been running these patches for a while and haven't noticed any ill effects.
Posted for comment, if nothing is forthcoming, I'll send a pull request to David in a week or so's time. These patches are against v4.2, but rebase to 4.3-rc3 without any fuss.
drivers/gpu/drm/armada/Kconfig | 9 -- drivers/gpu/drm/armada/Makefile | 3 +- drivers/gpu/drm/armada/armada_crtc.c | 258 +++++++++++++++++++++++--------- drivers/gpu/drm/armada/armada_crtc.h | 34 +++-- drivers/gpu/drm/armada/armada_drm.h | 16 -- drivers/gpu/drm/armada/armada_drv.c | 148 +++--------------- drivers/gpu/drm/armada/armada_output.c | 142 ------------------ drivers/gpu/drm/armada/armada_output.h | 33 ---- drivers/gpu/drm/armada/armada_overlay.c | 147 +++++++++--------- drivers/gpu/drm/armada/armada_slave.c | 139 ----------------- drivers/gpu/drm/armada/armada_slave.h | 26 ---- 11 files changed, 297 insertions(+), 658 deletions(-) delete mode 100644 drivers/gpu/drm/armada/armada_output.c delete mode 100644 drivers/gpu/drm/armada/armada_output.h delete mode 100644 drivers/gpu/drm/armada/armada_slave.c delete mode 100644 drivers/gpu/drm/armada/armada_slave.h
Signature · 6 lines
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 1/20 drm/armada: remove non-component support
Now that the transition of TDA998x to the component helpers is complete, remove the non-componentised support from the Armada DRM driver. All outputs are expected to use the component helpers from now on.
--- drivers/gpu/drm/armada/Kconfig | 9 --- drivers/gpu/drm/armada/Makefile | 3 +- drivers/gpu/drm/armada/armada_crtc.c | 2 +- drivers/gpu/drm/armada/armada_crtc.h | 4 - drivers/gpu/drm/armada/armada_drv.c | 125 ++++------------------------- drivers/gpu/drm/armada/armada_output.c | 142 --------------------------------- drivers/gpu/drm/armada/armada_output.h | 33 -------- drivers/gpu/drm/armada/armada_slave.c | 139 -------------------------------- drivers/gpu/drm/armada/armada_slave.h | 26 ------ 9 files changed, 19 insertions(+), 464 deletions(-) delete mode 100644 drivers/gpu/drm/armada/armada_output.c delete mode 100644 drivers/gpu/drm/armada/armada_output.h delete mode 100644 drivers/gpu/drm/armada/armada_slave.c delete mode 100644 drivers/gpu/drm/armada/armada_slave.h
drivers/gpu/drm/armada/Kconfig +0 -9
@@ -14,12 +14,3 @@ config DRM_ARMADA This driver provides no built-in acceleration; acceleration is performed by other IP found on the SoC. This driver provides kernel mode setting and buffer management to userspace. - -config DRM_ARMADA_TDA1998X - bool "Support TDA1998X HDMI output" - depends on DRM_ARMADA != n - depends on I2C && DRM_I2C_NXP_TDA998X = y - default y - help - Support the TDA1998x HDMI output device found on the Solid-Run - CuBox.
drivers/gpu/drm/armada/Makefile +1 -2
@@ -1,6 +1,5 @@ armada-y := armada_crtc.o armada_drv.o armada_fb.o armada_fbdev.o \ - armada_gem.o armada_output.o armada_overlay.o \ - armada_slave.o + armada_gem.o armada_overlay.o armada-y += armada_510.o armada-$(CONFIG_DEBUG_FS) += armada_debugfs.o
drivers/gpu/drm/armada/armada_crtc.c +1 -1
@@ -1044,7 +1044,7 @@ static int armada_drm_crtc_create_properties(struct drm_device *dev)return 0 ; } -int armada_drm_crtc_create (struct drm_device *drm,struct device *dev, +static int armada_drm_crtc_create (struct drm_device *drm,struct device *dev,struct resource *res,int irq,const struct armada_variant *variant,struct device_node *port) {
drivers/gpu/drm/armada/armada_crtc.h +0 -4
@@ -75,10 +75,6 @@ struct armada_crtc { };#define drm_to_armada_crtc (c) container_of(c, struct armada_crtc, crtc) -struct device_node ; -int armada_drm_crtc_create (struct drm_device *,struct device *, -struct resource *,int ,const struct armada_variant *, -struct device_node *);void armada_drm_crtc_gamma_set (struct drm_crtc *,u16 ,u16 ,u16 ,int );void armada_drm_crtc_gamma_get (struct drm_crtc *,u16 *,u16 *,u16 *,int );void armada_drm_crtc_disable_irq (struct armada_crtc *,u32 );
drivers/gpu/drm/armada/armada_drv.c +17 -108
188 lines not on this page · raw message
drivers/gpu/drm/armada/armada_output.c deleted +0 -142
142 lines not on this page · raw message
drivers/gpu/drm/armada/armada_output.h deleted +0 -33
@@ -1,33 +0,0 @@ -/* -* Copyright (C) 2012 Russell King -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ -#ifndef ARMADA_CONNETOR_H -#define ARMADA_CONNETOR_H - -#define encoder_helper_funcs (encoder) \ - ((const struct drm_encoder_helper_funcs *)encoder->helper_private) - -struct armada_output_type { -int connector_type; -enum drm_connector_status (*detect)(struct drm_connector *,bool ); -int (*create)(struct drm_connector *,const void *); -int (*set_property)(struct drm_connector *,struct drm_property *, -uint64_t ); -}; - -struct drm_encoder *armada_drm_connector_encoder (struct drm_connector *conn); - -int armada_drm_slave_encoder_mode_valid (struct drm_connector *conn, -struct drm_display_mode *mode); - -int armada_drm_slave_encoder_set_property (struct drm_connector *conn, -struct drm_property *property,uint64_t value); - -int armada_output_create (struct drm_device *dev, -const struct armada_output_type *type,const void *data); - -#endif
drivers/gpu/drm/armada/armada_slave.c deleted +0 -139
139 lines not on this page · raw message
drivers/gpu/drm/armada/armada_slave.h deleted +0 -26
@@ -1,26 +0,0 @@ -/* -* Copyright (C) 2012 Russell King -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2 as -* published by the Free Software Foundation. -*/ -#ifndef ARMADA_SLAVE_H -#define ARMADA_SLAVE_H - -#include <linux/i2c.h> -#include <drm/drmP.h> - -struct armada_drm_slave_config { -int i2c_adapter_id; -uint32_t crtcs; -uint8_t polled; -bool interlace_allowed; -bool doublescan_allowed; -struct i2c_board_info info; -}; - -int armada_drm_connector_slave_create (struct drm_device *dev, -const struct armada_drm_slave_config *); - -#endif
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/20 drm/armada: move vbl code into armada_crtc
In reply to Russell King - ARM LinuxOur vblank event code belongs in armada_crtc.c rather than the core of the driver. Move it there.
--- drivers/gpu/drm/armada/armada_crtc.c | 46 ++++++++++++++++++++++++++++++------ drivers/gpu/drm/armada/armada_crtc.h | 17 +++++++++++++ drivers/gpu/drm/armada/armada_drm.h | 16 ------------- drivers/gpu/drm/armada/armada_drv.c | 23 ------------------ 4 files changed, 56 insertions(+), 46 deletions(-)
drivers/gpu/drm/armada/armada_crtc.c +39 -7
@@ -173,6 +173,44 @@ static unsigned armada_drm_crtc_calc_fb(struct drm_framebuffer *fb,return i; } +void armada_drm_vbl_event_add (struct armada_crtc *dcrtc, +struct armada_vbl_event *evt) +{ +unsigned long flags; +bool not_on_list; + +WARN_ON (drm_vblank_get (dcrtc->crtc.dev, dcrtc->num)); + +spin_lock_irqsave (&dcrtc->irq_lock, flags); + not_on_list =list_empty (&evt->node); +if (not_on_list) +list_add_tail (&evt->node, &dcrtc->vbl_list); +spin_unlock_irqrestore (&dcrtc->irq_lock, flags); + +if (!not_on_list) +drm_vblank_put (dcrtc->crtc.dev, dcrtc->num); +} + +void armada_drm_vbl_event_remove (struct armada_crtc *dcrtc, +struct armada_vbl_event *evt) +{ +if (!list_empty (&evt->node)) { +list_del_init (&evt->node); +drm_vblank_put (dcrtc->crtc.dev, dcrtc->num); + } +} + +static void armada_drm_vbl_event_run (struct armada_crtc *dcrtc) +{ +struct armada_vbl_event *e, *n; + +list_for_each_entry_safe (e, n, &dcrtc->vbl_list, node) { +list_del_init (&e->node); +drm_vblank_put (dcrtc->crtc.dev, dcrtc->num); + e->fn (dcrtc, e->data); + } +} +static int armada_drm_crtc_queue_frame_work (struct armada_crtc *dcrtc,struct armada_frame_work *work) {
@@ -356,7 +394,6 @@ static bool armada_drm_crtc_mode_fixup(struct drm_crtc *crtc,static void armada_drm_crtc_irq (struct armada_crtc *dcrtc,u32 stat) { -struct armada_vbl_event *e, *n;void __iomem *base = dcrtc->base;if (stat &DMA_FF_UNDERFLOW )
@@ -368,12 +405,7 @@ static void armada_drm_crtc_irq(struct armada_crtc *dcrtc, u32 stat)drm_handle_vblank (dcrtc->crtc.dev, dcrtc->num);spin_lock (&dcrtc->irq_lock); - -list_for_each_entry_safe (e, n, &dcrtc->vbl_list, node) { -list_del_init (&e->node); -drm_vblank_put (dcrtc->crtc.dev, dcrtc->num); - e->fn (dcrtc, e->data); - } +armada_drm_vbl_event_run (dcrtc);if (stat &GRA_FRAME_IRQ && dcrtc->interlaced) {int i = stat &GRA_FRAME_IRQ0 ?0 :1 ;
drivers/gpu/drm/armada/armada_crtc.h +17 -0
@@ -75,6 +75,23 @@ struct armada_crtc { };#define drm_to_armada_crtc (c) container_of(c, struct armada_crtc, crtc) +struct armada_vbl_event { +struct list_head node; +void *data; +void (*fn)(struct armada_crtc *,void *); +}; + +void armada_drm_vbl_event_add (struct armada_crtc *, +struct armada_vbl_event *); +void armada_drm_vbl_event_remove (struct armada_crtc *, +struct armada_vbl_event *); +#define armada_drm_vbl_event_init (_e, _f, _d) do { \ + struct armada_vbl_event *__e = _e; \ + INIT_LIST_HEAD(&__e->node); \ + __e->data = _d; \ + __e->fn = _f; \ +} while (0) +void armada_drm_crtc_gamma_set (struct drm_crtc *,u16 ,u16 ,u16 ,int );void armada_drm_crtc_gamma_get (struct drm_crtc *,u16 *,u16 *,u16 *,int );void armada_drm_crtc_disable_irq (struct armada_crtc *,u32 );
drivers/gpu/drm/armada/armada_drm.h +0 -16
@@ -37,22 +37,6 @@ static inline uint32_t armada_pitch(uint32_t width, uint32_t bpp)return ALIGN (pitch,128 ); } -struct armada_vbl_event { -struct list_head node; -void *data; -void (*fn)(struct armada_crtc *,void *); -}; -void armada_drm_vbl_event_add (struct armada_crtc *, -struct armada_vbl_event *); -void armada_drm_vbl_event_remove (struct armada_crtc *, -struct armada_vbl_event *); -#define armada_drm_vbl_event_init (_e, _f, _d) do { \ - struct armada_vbl_event *__e = _e; \ - INIT_LIST_HEAD(&__e->node); \ - __e->data = _d; \ - __e->fn = _f; \ -} while (0) -struct armada_private ;
drivers/gpu/drm/armada/armada_drv.c +0 -23
@@ -148,29 +148,6 @@ static int armada_drm_unload(struct drm_device *dev)return 0 ; } -void armada_drm_vbl_event_add (struct armada_crtc *dcrtc, -struct armada_vbl_event *evt) -{ -unsigned long flags; - -spin_lock_irqsave (&dcrtc->irq_lock, flags); -if (list_empty (&evt->node)) { -list_add_tail (&evt->node, &dcrtc->vbl_list); - -drm_vblank_get (dcrtc->crtc.dev, dcrtc->num); - } -spin_unlock_irqrestore (&dcrtc->irq_lock, flags); -} - -void armada_drm_vbl_event_remove (struct armada_crtc *dcrtc, -struct armada_vbl_event *evt) -{ -if (!list_empty (&evt->node)) { -list_del_init (&evt->node); -drm_vblank_put (dcrtc->crtc.dev, dcrtc->num); - } -} -/* These are called under the vbl_lock. */ static int armada_drm_enable_vblank (struct drm_device *dev,int crtc) {
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 3/20 drm/armada: use drm_plane_force_disable() to disable the overlay plane
In reply to Russell King - ARM LinuxUse drm_plane_force_disable() to disable the overlay plane on a mode_set rather than coding this ourselves.
--- drivers/gpu/drm/armada/armada_crtc.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/gpu/drm/armada/armada_crtc.c +3 -9
@@ -348,17 +348,11 @@ static void armada_drm_crtc_prepare(struct drm_crtc *crtc)/* * If we have an overlay plane associated with this CRTC, disable * it before the modeset to avoid its coordinates being outside -* the new mode parameters. DRM doesn't provide help with this. +* the new mode parameters. */ plane = dcrtc->plane; -if (plane) { -struct drm_framebuffer *fb = plane->fb; - - plane->funcs->disable_plane (plane); - plane->fb =NULL ; - plane->crtc =NULL ; -drm_framebuffer_unreference (fb); - } +if (plane) +drm_plane_force_disable (plane); }/* The mode_config.mutex will be held for this call */
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 4/20 drm/armada: disable CRTC clock during DPMS
In reply to Russell King - ARM LinuxWhen the CRTC is in low power mode, it isn't running, and so there's no point keeping the CRTC clock enabled. Disable the CRTC clock during DPMS.
We need to re-enable it in the mode_set callback to ensure that the variant's compute_clock() continues to see its clock in the expected state (enabled).
--- drivers/gpu/drm/armada/armada_crtc.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/gpu/drm/armada/armada_crtc.c +11 -0
@@ -325,7 +325,11 @@ static void armada_drm_crtc_dpms(struct drm_crtc *crtc, int dpms)if (dcrtc->dpms != dpms) { dcrtc->dpms = dpms; +if (!IS_ERR (dcrtc->clk) && !dpms_blanked (dpms)) +WARN_ON (clk_prepare_enable (dcrtc->clk));armada_drm_crtc_update (dcrtc); +if (!IS_ERR (dcrtc->clk) &&dpms_blanked (dpms)) +clk_disable_unprepare (dcrtc->clk);if (dpms_blanked (dpms))armada_drm_vblank_off (dcrtc);else
@@ -563,6 +567,13 @@ static int armada_drm_crtc_mode_set(struct drm_crtc *crtc,writel_relaxed (val, dcrtc->base +LCD_SPU_DUMB_CTRL ); } +/* +* If we are blanked, we would have disabled the clock. Re-enable +* it so that compute_clock() does the right thing. +*/ +if (!IS_ERR (dcrtc->clk) &&dpms_blanked (dcrtc->dpms)) +WARN_ON (clk_prepare_enable (dcrtc->clk)); +/* Now compute the divider for real */ dcrtc->variant->compute_clock (dcrtc, adj, &sclk);
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 5/20 drm/armada: redo locking and atomics for armada_drm_crtc_complete_frame_work()
In reply to Russell King - ARM LinuxWe can do better with armada_drm_crtc_complete_frame_work() - we can avoid taking the event lock unless a call to drm_send_vblank_event() is required, and using cmpxchg() and xchg(), we can eliminate the locking around dcrtc->frame_work entirely.
--- drivers/gpu/drm/armada/armada_crtc.c | 53 ++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 30 deletions(-)
drivers/gpu/drm/armada/armada_crtc.c +23 -30
@@ -215,7 +215,6 @@ static int armada_drm_crtc_queue_frame_work(struct armada_crtc *dcrtc, struct armada_frame_work *work) {struct drm_device *dev = dcrtc->crtc.dev; -unsigned long flags;int ret; ret =drm_vblank_get (dev, dcrtc->num);
@@ -224,30 +223,29 @@ static int armada_drm_crtc_queue_frame_work(struct armada_crtc *dcrtc,return ret; } -spin_lock_irqsave (&dev->event_lock, flags); -if (!dcrtc->frame_work) - dcrtc->frame_work = work; -else - ret = -EBUSY ; -spin_unlock_irqrestore (&dev->event_lock, flags); - -if (ret) +if (cmpxchg (&dcrtc->frame_work,NULL , work)) {drm_vblank_put (dev, dcrtc->num); + ret = -EBUSY ; + }return ret; } -static void armada_drm_crtc_complete_frame_work (struct armada_crtc *dcrtc) +static void armada_drm_crtc_complete_frame_work (struct armada_crtc *dcrtc, +struct armada_frame_work *work) {struct drm_device *dev = dcrtc->crtc.dev; -struct armada_frame_work *work = dcrtc->frame_work; - - dcrtc->frame_work =NULL ; +unsigned long flags; +spin_lock_irqsave (&dcrtc->irq_lock, flags);armada_drm_crtc_update_regs (dcrtc, work->regs); +spin_unlock_irqrestore (&dcrtc->irq_lock, flags); -if (work->event) +if (work->event) { +spin_lock_irqsave (&dev->event_lock, flags);drm_send_vblank_event (dev, dcrtc->num, work->event); +spin_unlock_irqrestore (&dev->event_lock, flags); + }drm_vblank_put (dev, dcrtc->num);
@@ -293,7 +291,7 @@ static void armada_drm_crtc_finish_fb(struct armada_crtc *dcrtc,static void armada_drm_vblank_off (struct armada_crtc *dcrtc) { -struct drm_device *dev = dcrtc->crtc.dev; +struct armada_frame_work *work;/* * Tell the DRM core that vblank IRQs aren't going to happen for
@@ -302,10 +300,9 @@ static void armada_drm_vblank_off(struct armada_crtc *dcrtc)drm_crtc_vblank_off (&dcrtc->crtc);/* Handle any pending flip event. */ -spin_lock_irq (&dev->event_lock); -if (dcrtc->frame_work) -armada_drm_crtc_complete_frame_work (dcrtc); -spin_unlock_irq (&dev->event_lock); + work =xchg (&dcrtc->frame_work,NULL ); +if (work) +armada_drm_crtc_complete_frame_work (dcrtc, work); } void armada_drm_crtc_gamma_set(struct drm_crtc *crtc, u16 r, u16 g, u16 b,
@@ -434,12 +431,10 @@ static void armada_drm_crtc_irq(struct armada_crtc *dcrtc, u32 stat)spin_unlock (&dcrtc->irq_lock);if (stat &GRA_FRAME_IRQ ) { -struct drm_device *dev = dcrtc->crtc.dev; +struct armada_frame_work *work =xchg (&dcrtc->frame_work,NULL ); -spin_lock (&dev->event_lock); -if (dcrtc->frame_work) -armada_drm_crtc_complete_frame_work (dcrtc); -spin_unlock (&dev->event_lock); +if (work) +armada_drm_crtc_complete_frame_work (dcrtc, work);wake_up (&dcrtc->frame_wait); }
@@ -957,8 +952,6 @@ static int armada_drm_crtc_page_flip(struct drm_crtc *crtc, {struct armada_crtc *dcrtc =drm_to_armada_crtc (crtc);struct armada_frame_work *work; -struct drm_device *dev = crtc->dev; -unsigned long flags;unsigned i;int ret;
@@ -1004,10 +997,10 @@ static int armada_drm_crtc_page_flip(struct drm_crtc *crtc,* interrupt, so complete it now. */ if (dpms_blanked (dcrtc->dpms)) { -spin_lock_irqsave (&dev->event_lock, flags); -if (dcrtc->frame_work) -armada_drm_crtc_complete_frame_work (dcrtc); -spin_unlock_irqrestore (&dev->event_lock, flags); +struct armada_frame_work *work =xchg (&dcrtc->frame_work,NULL ); + +if (work) +armada_drm_crtc_complete_frame_work (dcrtc, work); }return 0 ;
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 6/20 drm/armada: rename overlay identifiers
In reply to Russell King - ARM LinuxInclude an _ovl infix into the overlay identifiers to separate them from the primary plane.
--- drivers/gpu/drm/armada/armada_overlay.c | 55 ++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 25 deletions(-)
drivers/gpu/drm/armada/armada_overlay.c +30 -25
@@ -16,7 +16,7 @@#include <drm/armada_drm.h> #include "armada_ioctlP.h" -struct armada_plane_properties { +struct armada_ovl_plane_properties {uint32_t colorkey_yr;uint32_t colorkey_ug;uint32_t colorkey_vb;
@@ -29,7 +29,7 @@ struct armada_plane_properties {uint32_t colorkey_mode; }; -struct armada_plane { +struct armada_ovl_plane {struct drm_plane base;spinlock_t lock;struct drm_framebuffer *old_fb;
@@ -42,13 +42,13 @@ struct armada_plane {struct armada_regs regs[13 ];wait_queue_head_t wait; } vbl; -struct armada_plane_properties prop; +struct armada_ovl_plane_properties prop; }; -#define drm_to_armada_plane (p) container_of(p, struct armada_plane, base) +#define drm_to_armada_ovl_plane (p) container_of(p, struct armada_ovl_plane, base)static void -armada_ovl_update_attr (struct armada_plane_properties *prop, +armada_ovl_update_attr (struct armada_ovl_plane_properties *prop,struct armada_crtc *dcrtc) {writel_relaxed (prop->colorkey_yr, dcrtc->base +LCD_SPU_COLORKEY_Y );
@@ -72,9 +72,9 @@ armada_ovl_update_attr(struct armada_plane_properties *prop, }/* === Plane support === */ -static void armada_plane_vbl (struct armada_crtc *dcrtc,void *data) +static void armada_ovl_plane_vbl (struct armada_crtc *dcrtc,void *data) { -struct armada_plane *dplane = data; +struct armada_ovl_plane *dplane = data;struct drm_framebuffer *fb;armada_drm_crtc_update_regs (dcrtc, dplane->vbl.regs);
@@ -91,12 +91,12 @@ static void armada_plane_vbl(struct armada_crtc *dcrtc, void *data) }static int -armada_plane_update (struct drm_plane *plane,struct drm_crtc *crtc, +armada_ovl_plane_update (struct drm_plane *plane,struct drm_crtc *crtc,struct drm_framebuffer *fb,int crtc_x,int crtc_y,unsigned crtc_w,unsigned crtc_h,uint32_t src_x,uint32_t src_y,uint32_t src_w,uint32_t src_h) { -struct armada_plane *dplane =drm_to_armada_plane (plane); +struct armada_ovl_plane *dplane =drm_to_armada_ovl_plane (plane);struct armada_crtc *dcrtc =drm_to_armada_crtc (crtc);struct drm_rect src = { .x1 = src_x,
@@ -267,9 +267,9 @@ armada_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,return 0 ; } -static int armada_plane_disable (struct drm_plane *plane) +static int armada_ovl_plane_disable (struct drm_plane *plane) { -struct armada_plane *dplane =drm_to_armada_plane (plane); +struct armada_ovl_plane *dplane =drm_to_armada_ovl_plane (plane);struct drm_framebuffer *fb;struct armada_crtc *dcrtc;
@@ -302,20 +302,20 @@ static int armada_plane_disable(struct drm_plane *plane)return 0 ; } -static void armada_plane_destroy (struct drm_plane *plane) +static void armada_ovl_plane_destroy (struct drm_plane *plane) { -struct armada_plane *dplane =drm_to_armada_plane (plane); +struct armada_ovl_plane *dplane =drm_to_armada_ovl_plane (plane);drm_plane_cleanup (plane);kfree (dplane); } -static int armada_plane_set_property (struct drm_plane *plane, +static int armada_ovl_plane_set_property (struct drm_plane *plane,struct drm_property *property,uint64_t val) {struct armada_private *priv = plane->dev->dev_private; -struct armada_plane *dplane =drm_to_armada_plane (plane); +struct armada_ovl_plane *dplane =drm_to_armada_ovl_plane (plane);bool update_attr = false;if (property == priv->colorkey_prop) {
@@ -379,14 +379,14 @@ static int armada_plane_set_property(struct drm_plane *plane,return 0 ; } -static const struct drm_plane_funcs armada_plane_funcs = { - .update_plane = armada_plane_update, - .disable_plane = armada_plane_disable, - .destroy = armada_plane_destroy, - .set_property = armada_plane_set_property, +static const struct drm_plane_funcs armada_ovl_plane_funcs = { + .update_plane = armada_ovl_plane_update, + .disable_plane = armada_ovl_plane_disable, + .destroy = armada_ovl_plane_destroy, + .set_property = armada_ovl_plane_set_property, }; -static const uint32_t armada_formats[] = { +static const uint32_t armada_ovl_formats[] = {DRM_FORMAT_UYVY ,DRM_FORMAT_YUYV ,DRM_FORMAT_YUV420 ,
@@ -456,7 +456,7 @@ int armada_overlay_plane_create(struct drm_device *dev, unsigned long crtcs) {struct armada_private *priv = dev->dev_private;struct drm_mode_object *mobj; -struct armada_plane *dplane; +struct armada_ovl_plane *dplane;int ret; ret =armada_overlay_create_properties (dev);
@@ -469,11 +469,16 @@ int armada_overlay_plane_create(struct drm_device *dev, unsigned long crtcs)spin_lock_init (&dplane->lock);init_waitqueue_head (&dplane->vbl.wait); -armada_drm_vbl_event_init (&dplane->vbl.update, armada_plane_vbl, +armada_drm_vbl_event_init (&dplane->vbl.update, armada_ovl_plane_vbl, dplane); -drm_plane_init (dev, &dplane->base, crtcs, &armada_plane_funcs, - armada_formats,ARRAY_SIZE (armada_formats), false); +drm_plane_init (dev, &dplane->base, crtcs, &armada_ovl_plane_funcs, + armada_ovl_formats,ARRAY_SIZE (armada_ovl_formats), + false); +if (ret) { +kfree (dplane); +return ret; + } dplane->prop.colorkey_yr =0xfefefe00 ; dplane->prop.colorkey_ug =0x01010100 ;
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 7/20 drm/armada: factor out retirement of old fb
In reply to Russell King - ARM LinuxWe have two identical places in the overlay code which retire the drm framebuffer. Factor these out into a common function.
--- drivers/gpu/drm/armada/armada_overlay.c | 37 +++++++++++++++------------------ 1 file changed, 17 insertions(+), 20 deletions(-)
drivers/gpu/drm/armada/armada_overlay.c +17 -20
@@ -71,21 +71,27 @@ armada_ovl_update_attr(struct armada_ovl_plane_properties *prop,spin_unlock_irq (&dcrtc->irq_lock); } +static void armada_ovl_retire_fb (struct armada_ovl_plane *dplane, +struct drm_framebuffer *fb) +{ +struct drm_framebuffer *old_fb; + +spin_lock (&dplane->lock); + old_fb = dplane->old_fb; + dplane->old_fb = fb; +spin_unlock (&dplane->lock); + +if (old_fb) +armada_drm_queue_unref_work (dplane->base.dev, old_fb); +} +/* === Plane support === */ static void armada_ovl_plane_vbl (struct armada_crtc *dcrtc,void *data) {struct armada_ovl_plane *dplane = data; -struct drm_framebuffer *fb;armada_drm_crtc_update_regs (dcrtc, dplane->vbl.regs); - -spin_lock (&dplane->lock); - fb = dplane->old_fb; - dplane->old_fb =NULL ; -spin_unlock (&dplane->lock); - -if (fb) -armada_drm_queue_unref_work (dcrtc->crtc.dev, fb); +armada_ovl_retire_fb (dplane,NULL );wake_up (&dplane->vbl.wait); }
@@ -175,17 +181,8 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,*/ drm_framebuffer_reference (fb); -if (plane->fb) { -struct drm_framebuffer *older_fb; - -spin_lock_irq (&dplane->lock); - older_fb = dplane->old_fb; - dplane->old_fb = plane->fb; -spin_unlock_irq (&dplane->lock); -if (older_fb) -armada_drm_queue_unref_work (dcrtc->crtc.dev, - older_fb); - } +if (plane->fb) +armada_ovl_retire_fb (dplane, plane->fb); src_y = src.y1 >>16 ; src_x = src.x1 >>16 ;
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 8/20 drm/armada: use xchg() to atomically update dplane->old_fb
In reply to Russell King - ARM LinuxRather than using a spinlock, use xchg() to atomically update dplane->old_fb. This allows us to eliminate dplane->lock.
--- drivers/gpu/drm/armada/armada_overlay.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
drivers/gpu/drm/armada/armada_overlay.c +3 -11
@@ -31,7 +31,6 @@ struct armada_ovl_plane_properties {struct armada_ovl_plane {struct drm_plane base; -spinlock_t lock;struct drm_framebuffer *old_fb;uint32_t src_hw;uint32_t dst_hw;
@@ -76,13 +75,10 @@ static void armada_ovl_retire_fb(struct armada_ovl_plane *dplane, {struct drm_framebuffer *old_fb; -spin_lock (&dplane->lock); - old_fb = dplane->old_fb; - dplane->old_fb = fb; -spin_unlock (&dplane->lock); + old_fb =xchg (&dplane->old_fb, fb);if (old_fb) -armada_drm_queue_unref_work (dplane->base.dev, old_fb); +armada_drm_queue_unref_work (dplane->base.base.dev, old_fb); }/* === Plane support === */
@@ -289,10 +285,7 @@ static int armada_ovl_plane_disable(struct drm_plane *plane)if (plane->fb)drm_framebuffer_unreference (plane->fb); -spin_lock_irq (&dplane->lock); - fb = dplane->old_fb; - dplane->old_fb =NULL ; -spin_unlock_irq (&dplane->lock); + fb =xchg (&dplane->old_fb,NULL );if (fb)drm_framebuffer_unreference (fb);
@@ -464,7 +457,6 @@ int armada_overlay_plane_create(struct drm_device *dev, unsigned long crtcs)if (!dplane)return -ENOMEM ; -spin_lock_init (&dplane->lock);init_waitqueue_head (&dplane->vbl.wait);armada_drm_vbl_event_init (&dplane->vbl.update, armada_ovl_plane_vbl, dplane);
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 08/20] drm/armada: use xchg() to atomically update dplane->old_fb
Hi Russell,
Quoted 5 lines · Russell King
Rather than using a spinlock, use
xchg()to atomically updatedplane->old_fb. This allows us to eliminatedplane->lock.Signed-off-by Russell King <[email protected]>---
[...]
drivers/gpu/drm/armada/armada_overlay.c static void armada_ovl_retire_fb(struct armada_ovl_plane *dplane, · line 81
Quoted 13 lines
drivers/gpu/drm/armada/armada_overlay.c +2
-5@@ -76,13 +75,10 @@ static void armada_ovl_retire_fb(struct armada_ovl_plane *dplane, {struct drm_framebuffer *old_fb; -spin_lock (&dplane->lock); - old_fb = dplane->old_fb; - dplane->old_fb = fb; -spin_unlock (&dplane->lock); + old_fb =xchg (&dplane->old_fb, fb);if (old_fb) -armada_drm_queue_unref_work (dplane->base.dev, old_fb); +armada_drm_queue_unref_work (dplane->base.base.dev, old_fb);
Shouldn't this be part of another patch ?
-Emil
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 08/20] drm/armada: use xchg() to atomically update dplane->old_fb
Quoted 19 lines · Emil Velikov
Hi Russell,
Quoted 5 lines · Russell King
Rather than using a spinlock, use
xchg()to atomically updatedplane->old_fb. This allows us to eliminatedplane->lock.Signed-off-by Russell King <[email protected]>---
[...]
Quoted 10 lines
drivers/gpu/drm/armada/armada_overlay.c +1
-4@@ -76,13 +75,10 @@ static void armada_ovl_retire_fb(struct armada_ovl_plane *dplane, {struct drm_framebuffer *old_fb; -spin_lock (&dplane->lock); - old_fb = dplane->old_fb; - dplane->old_fb = fb; -spin_unlock (&dplane->lock); + old_fb =xchg (&dplane->old_fb, fb);
Quoted 4 lines
drivers/gpu/drm/armada/armada_overlay.c static void armada_ovl_retire_fb(struct armada_ovl_plane *dplane, · line 81
Quoted 3 lines
drivers/gpu/drm/armada/armada_overlay.c +1
-1if (old_fb) -armada_drm_queue_unref_work (dplane->base.dev, old_fb); +armada_drm_queue_unref_work (dplane->base.base.dev, old_fb);Shouldn't this be part of another patch ?
Yes, you're right, it should be in:
drm/armada: introduce generic armada_plane struct
Now moved there, thanks.
Signature · 6 lines
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 9/20 drm/armada: update armada overlay to use drm_universal_plane_init()
In reply to Russell King - ARM LinuxUse the new drm_universal_plane_init() rather than the legacy drm_plane_init().
--- drivers/gpu/drm/armada/armada_overlay.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/gpu/drm/armada/armada_overlay.c +5 -3
@@ -461,9 +461,11 @@ int armada_overlay_plane_create(struct drm_device *dev, unsigned long crtcs)armada_drm_vbl_event_init (&dplane->vbl.update, armada_ovl_plane_vbl, dplane); -drm_plane_init (dev, &dplane->base, crtcs, &armada_ovl_plane_funcs, - armada_ovl_formats,ARRAY_SIZE (armada_ovl_formats), - false); + ret =drm_universal_plane_init (dev, &dplane->base, crtcs, + &armada_ovl_plane_funcs, + armada_ovl_formats, +ARRAY_SIZE (armada_ovl_formats), +DRM_PLANE_TYPE_OVERLAY );if (ret) {kfree (dplane);return ret;
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 10/20 drm/armada: introduce generic armada_plane struct
In reply to Russell King - ARM LinuxIntroduce a generic armada_plane struct which will eventually be used for both the primary and overlay planes.
--- drivers/gpu/drm/armada/armada_crtc.h | 5 +++++ drivers/gpu/drm/armada/armada_overlay.c | 17 +++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-)
drivers/gpu/drm/armada/armada_crtc.h +5 -0
@@ -34,6 +34,11 @@ struct armada_regs {struct armada_frame_work ;struct armada_variant ; +struct armada_plane { +struct drm_plane base; +}; +#define drm_to_armada_plane (p) container_of(p, struct armada_plane, base) +struct armada_crtc {struct drm_crtc crtc;const struct armada_variant *variant;
drivers/gpu/drm/armada/armada_overlay.c +9 -8
@@ -30,7 +30,7 @@ struct armada_ovl_plane_properties { };struct armada_ovl_plane { -struct drm_plane base; +struct armada_plane base;struct drm_framebuffer *old_fb;uint32_t src_hw;uint32_t dst_hw;
@@ -43,7 +43,8 @@ struct armada_ovl_plane { } vbl;struct armada_ovl_plane_properties prop; }; -#define drm_to_armada_ovl_plane (p) container_of(p, struct armada_ovl_plane, base) +#define drm_to_armada_ovl_plane (p) \ + container_of(p, struct armada_ovl_plane, base.base) static void
@@ -266,10 +267,10 @@ static int armada_ovl_plane_disable(struct drm_plane *plane)struct drm_framebuffer *fb;struct armada_crtc *dcrtc; -if (!dplane->base.crtc) +if (!dplane->base.base.crtc)return 0 ; - dcrtc =drm_to_armada_crtc (dplane->base.crtc); + dcrtc =drm_to_armada_crtc (dplane->base.base.crtc); dcrtc->plane =NULL ;spin_lock_irq (&dcrtc->irq_lock);
@@ -362,9 +363,9 @@ static int armada_ovl_plane_set_property(struct drm_plane *plane, update_attr = true; } -if (update_attr && dplane->base.crtc) +if (update_attr && dplane->base.base.crtc)armada_ovl_update_attr (&dplane->prop, -drm_to_armada_crtc (dplane->base.crtc)); +drm_to_armada_crtc (dplane->base.base.crtc));return 0 ; }
@@ -461,7 +462,7 @@ int armada_overlay_plane_create(struct drm_device *dev, unsigned long crtcs)armada_drm_vbl_event_init (&dplane->vbl.update, armada_ovl_plane_vbl, dplane); - ret = drm_universal_plane_init(dev, &dplane->base, crtcs, + ret = drm_universal_plane_init(dev, &dplane->base.base, crtcs, &armada_ovl_plane_funcs, armada_ovl_formats, ARRAY_SIZE(armada_ovl_formats),
@@ -479,7 +480,7 @@ int armada_overlay_plane_create(struct drm_device *dev, unsigned long crtcs) dplane->prop.contrast =0x4000 ; dplane->prop.saturation =0x4000 ; - mobj = &dplane->base.base; + mobj = &dplane->base.base.base;drm_object_attach_property (mobj, priv->colorkey_prop,0x0101fe ); drm_object_attach_property(mobj, priv->colorkey_min_prop,
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 11/20 drm/armada: add primary plane creation
In reply to Russell King - ARM LinuxUse drm_primary_helper_create_plane() to create our primary plane, and register the CRTC with drm_crtc_init_with_planes(). This enables the primary plane to be initialised with the supported format information.
--- drivers/gpu/drm/armada/armada_crtc.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-)
drivers/gpu/drm/armada/armada_crtc.c +33 -1
@@ -33,6 +33,23 @@ enum csc_mode { CSC_RGB_STUDIO = 2, }; +static const uint32_t armada_primary_formats[] = { +DRM_FORMAT_UYVY , +DRM_FORMAT_YUYV , +DRM_FORMAT_VYUY , +DRM_FORMAT_YVYU , +DRM_FORMAT_ARGB8888 , +DRM_FORMAT_ABGR8888 , +DRM_FORMAT_XRGB8888 , +DRM_FORMAT_XBGR8888 , +DRM_FORMAT_RGB888 , +DRM_FORMAT_BGR888 , +DRM_FORMAT_ARGB1555 , +DRM_FORMAT_ABGR1555 , +DRM_FORMAT_RGB565 , +DRM_FORMAT_BGR565 , +}; +/* * A note about interlacing. Let's consider HDMI 1920x1080i. * The timing parameters we have from X are:
@@ -1080,6 +1097,7 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev, {struct armada_private *priv = drm->dev_private;struct armada_crtc *dcrtc; +struct drm_plane *primary;void __iomem *base;int ret;
@@ -1148,7 +1166,17 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev, priv->dcrtc[dcrtc->num] = dcrtc; dcrtc->crtc.port = port; -drm_crtc_init (drm, &dcrtc->crtc, &armada_crtc_funcs); + + primary =drm_primary_helper_create_plane (drm, armada_primary_formats, +ARRAY_SIZE (armada_primary_formats)); +if (!primary) +return -ENOMEM ; + + ret =drm_crtc_init_with_planes (drm, &dcrtc->crtc, primary,NULL , + &armada_crtc_funcs); +if (ret) + goto err_crtc_init; +drm_crtc_helper_add (&dcrtc->crtc, &armada_crtc_helper_funcs); drm_object_attach_property(&dcrtc->crtc.base, priv->csc_yuv_prop,
@@ -1157,6 +1185,10 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev, dcrtc->csc_rgb_mode);return armada_overlay_plane_create (drm,1 << dcrtc->num); + +err_crtc_init: + primary->funcs->destroy (primary); +return ret; } static int
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 12/20 drm/armada: allocate primary plane ourselves
In reply to Russell King - ARM LinuxAllocate our own primary plane as an armada_plane.
--- drivers/gpu/drm/armada/armada_crtc.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-)
drivers/gpu/drm/armada/armada_crtc.c +20 -5
@@ -1059,6 +1059,12 @@ static struct drm_crtc_funcs armada_crtc_funcs = { .set_property = armada_drm_crtc_set_property, }; +static const struct drm_plane_funcs armada_primary_plane_funcs = { + .update_plane = drm_primary_helper_update, + .disable_plane = drm_primary_helper_disable, + .destroy = drm_primary_helper_destroy, +}; +static struct drm_prop_enum_list armada_drm_csc_yuv_enum_list[] = { {CSC_AUTO ,"Auto" }, {CSC_YUV_CCIR601 ,"CCIR601" },
@@ -1097,7 +1103,7 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev, {struct armada_private *priv = drm->dev_private;struct armada_crtc *dcrtc; -struct drm_plane *primary; +struct armada_plane *primary;void __iomem *base;int ret;
@@ -1167,12 +1173,21 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev, dcrtc->crtc.port = port; - primary =drm_primary_helper_create_plane (drm, armada_primary_formats, -ARRAY_SIZE (armada_primary_formats)); + primary =kzalloc (sizeof (*primary),GFP_KERNEL );if (!primary)return -ENOMEM ; - ret =drm_crtc_init_with_planes (drm, &dcrtc->crtc, primary,NULL , + ret =drm_universal_plane_init (drm, &primary->base,0 , + &armada_primary_plane_funcs, + armada_primary_formats, +ARRAY_SIZE (armada_primary_formats), +DRM_PLANE_TYPE_PRIMARY ); +if (ret) { +kfree (primary); +return ret; + } + + ret =drm_crtc_init_with_planes (drm, &dcrtc->crtc, &primary->base,NULL , &armada_crtc_funcs);if (ret) goto err_crtc_init;
@@ -1187,7 +1202,7 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,return armada_overlay_plane_create (drm,1 << dcrtc->num); err_crtc_init: - primary->funcs->destroy (primary); + primary->base.funcs->destroy (&primary->base);return ret; }
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 13/20 drm/armada: provide a common helper to disable a plane
In reply to Russell King - ARM LinuxProvide a common helper to disable either the overlay or the primary plane.
--- drivers/gpu/drm/armada/armada_crtc.c | 33 +++++++++++++++++++++++++++------ drivers/gpu/drm/armada/armada_crtc.h | 3 +++ drivers/gpu/drm/armada/armada_overlay.c | 7 +------ 3 files changed, 31 insertions(+), 12 deletions(-)
drivers/gpu/drm/armada/armada_crtc.c +27 -6
@@ -700,18 +700,39 @@ static int armada_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,return 0 ; } +void armada_drm_crtc_plane_disable (struct armada_crtc *dcrtc, +struct drm_plane *plane) +{ +u32 sram_para1; + +/* +* Drop our reference on any framebuffer attached to this plane. +* We don't need to NULL this out as drm_plane_force_disable(), +* and __setplane_internal() will do so for an overlay plane, and +* __drm_helper_disable_unused_functions() will do so for the +* primary plane. +*/ +if (plane->fb) +drm_framebuffer_unreference (plane->fb); + +/* Power down the Y/U/V FIFOs */ + sram_para1 = CFG_PDWN16x66 | CFG_PDWN32x66; + +/* Power down most RAMs and FIFOs if this is the primary plane */ +if (plane->type ==DRM_PLANE_TYPE_PRIMARY ) + sram_para1 |= CFG_PDWN256x32 | CFG_PDWN256x24 | CFG_PDWN256x8 | + CFG_PDWN32x32 | CFG_PDWN64x66; + +armada_updatel (sram_para1,0 , dcrtc->base +LCD_SPU_SRAM_PARA1 ); +} +/* The mode_config.mutex will be held for this call */ static void armada_drm_crtc_disable (struct drm_crtc *crtc) {struct armada_crtc *dcrtc =drm_to_armada_crtc (crtc);armada_drm_crtc_dpms (crtc,DRM_MODE_DPMS_OFF ); -armada_drm_crtc_finish_fb (dcrtc, crtc->primary->fb, true); - -/* Power down most RAMs and FIFOs */ -writel_relaxed (CFG_PDWN256x32 | CFG_PDWN256x24 | CFG_PDWN256x8 | - CFG_PDWN32x32 | CFG_PDWN16x66 | CFG_PDWN32x66 | - CFG_PDWN64x66, dcrtc->base +LCD_SPU_SRAM_PARA1 ); +armada_drm_crtc_plane_disable (dcrtc, crtc->primary); }static const struct drm_crtc_helper_funcs armada_crtc_helper_funcs = {
drivers/gpu/drm/armada/armada_crtc.h +3 -0
@@ -103,6 +103,9 @@ void armada_drm_crtc_disable_irq(struct armada_crtc *, u32);void armada_drm_crtc_enable_irq (struct armada_crtc *,u32 );void armada_drm_crtc_update_regs (struct armada_crtc *,struct armada_regs *); +void armada_drm_crtc_plane_disable (struct armada_crtc *dcrtc, +struct drm_plane *plane); +extern struct platform_driver armada_lcd_platform_driver;#endif
drivers/gpu/drm/armada/armada_overlay.c +1 -6
@@ -279,12 +279,7 @@ static int armada_ovl_plane_disable(struct drm_plane *plane) dplane->ctrl0 =0 ;spin_unlock_irq (&dcrtc->irq_lock); -/* Power down the Y/U/V FIFOs */ -armada_updatel (CFG_PDWN16x66 | CFG_PDWN32x66,0 , - dcrtc->base +LCD_SPU_SRAM_PARA1 ); - -if (plane->fb) -drm_framebuffer_unreference (plane->fb); +armada_drm_crtc_plane_disable (dcrtc, plane); fb =xchg (&dplane->old_fb,NULL );if (fb)
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 14/20 drm/armada: move write to dma_ctrl0 to armada_drm_crtc_plane_disable()
In reply to Russell King - ARM LinuxMove the write to clear the DMA enable bit, and augment it with clearing the graphics enable bit for the primary plane.
--- drivers/gpu/drm/armada/armada_crtc.c | 12 ++++++++++-- drivers/gpu/drm/armada/armada_overlay.c | 1 - 2 files changed, 10 insertions(+), 3 deletions(-)
drivers/gpu/drm/armada/armada_crtc.c +10 -2
@@ -703,7 +703,7 @@ static int armada_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,void armada_drm_crtc_plane_disable (struct armada_crtc *dcrtc,struct drm_plane *plane) { -u32 sram_para1; +u32 sram_para1, dma_ctrl0_mask;/* * Drop our reference on any framebuffer attached to this plane.
@@ -719,9 +719,17 @@ void armada_drm_crtc_plane_disable(struct armada_crtc *dcrtc, sram_para1 = CFG_PDWN16x66 | CFG_PDWN32x66;/* Power down most RAMs and FIFOs if this is the primary plane */ -if (plane->type ==DRM_PLANE_TYPE_PRIMARY ) +if (plane->type ==DRM_PLANE_TYPE_PRIMARY ) { sram_para1 |= CFG_PDWN256x32 | CFG_PDWN256x24 | CFG_PDWN256x8 | CFG_PDWN32x32 | CFG_PDWN64x66; + dma_ctrl0_mask =CFG_GRA_ENA ; + }else { + dma_ctrl0_mask =CFG_DMA_ENA ; + } + +spin_lock_irq (&dcrtc->irq_lock); +armada_updatel (0 , dma_ctrl0_mask, dcrtc->base +LCD_SPU_DMA_CTRL0 ); +spin_unlock_irq (&dcrtc->irq_lock);armada_updatel (sram_para1,0 , dcrtc->base +LCD_SPU_SRAM_PARA1 ); }
drivers/gpu/drm/armada/armada_overlay.c +0 -1
@@ -275,7 +275,6 @@ static int armada_ovl_plane_disable(struct drm_plane *plane)spin_lock_irq (&dcrtc->irq_lock);armada_drm_vbl_event_remove (dcrtc, &dplane->vbl.update); -armada_updatel (0 ,CFG_DMA_ENA , dcrtc->base +LCD_SPU_DMA_CTRL0 ); dplane->ctrl0 =0 ;spin_unlock_irq (&dcrtc->irq_lock);
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 15/20 drm/armada: move the update of dplane->ctrl0 out of spinlock
In reply to Russell King - ARM LinuxIt is not necessary to write dplane->ctrl0 under the CRTC spinlock, as this is only accessed under process context where the DRM locks will protect us instead.
--- drivers/gpu/drm/armada/armada_overlay.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/armada/armada_overlay.c +2 -1
@@ -275,9 +275,10 @@ static int armada_ovl_plane_disable(struct drm_plane *plane)spin_lock_irq (&dcrtc->irq_lock);armada_drm_vbl_event_remove (dcrtc, &dplane->vbl.update); - dplane->ctrl0 =0 ;spin_unlock_irq (&dcrtc->irq_lock); + dplane->ctrl0 =0 ; +armada_drm_crtc_plane_disable (dcrtc, plane); fb =xchg (&dplane->old_fb,NULL );
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 16/20 drm/armada: move the locking for armada_drm_vbl_event_remove()
In reply to Russell King - ARM LinuxMove the locking for armada_drm_vbl_event_remove() into itself, which makes this function symmetrical with armada_drm_vbl_event_add().
--- drivers/gpu/drm/armada/armada_crtc.c | 2 ++ drivers/gpu/drm/armada/armada_overlay.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/armada/armada_crtc.c +2 -0
@@ -211,10 +211,12 @@ void armada_drm_vbl_event_add(struct armada_crtc *dcrtc,void armada_drm_vbl_event_remove (struct armada_crtc *dcrtc,struct armada_vbl_event *evt) { +spin_lock_irq (&dcrtc->irq_lock);if (!list_empty (&evt->node)) {list_del_init (&evt->node);drm_vblank_put (dcrtc->crtc.dev, dcrtc->num); } +spin_unlock_irq (&dcrtc->irq_lock); }static void armada_drm_vbl_event_run (struct armada_crtc *dcrtc)
drivers/gpu/drm/armada/armada_overlay.c +0 -2
@@ -273,9 +273,7 @@ static int armada_ovl_plane_disable(struct drm_plane *plane) dcrtc =drm_to_armada_crtc (dplane->base.base.crtc); dcrtc->plane =NULL ; -spin_lock_irq (&dcrtc->irq_lock);armada_drm_vbl_event_remove (dcrtc, &dplane->vbl.update); -spin_unlock_irq (&dcrtc->irq_lock); dplane->ctrl0 =0 ;
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 17/20 drm/armada: move frame wait into armada_frame
In reply to Russell King - ARM LinuxBoth the CRTC and overlay frames have their own wait queues. It would make more sense if these were part of the plane - the primary plane for the CRTC and overlay plane for the overlay.
--- drivers/gpu/drm/armada/armada_crtc.c | 22 ++++++++++++++++++---- drivers/gpu/drm/armada/armada_crtc.h | 4 +++- drivers/gpu/drm/armada/armada_overlay.c | 12 ++++++++---- 3 files changed, 29 insertions(+), 9 deletions(-)
drivers/gpu/drm/armada/armada_crtc.c +18 -4
@@ -455,7 +455,7 @@ static void armada_drm_crtc_irq(struct armada_crtc *dcrtc, u32 stat)if (work)armada_drm_crtc_complete_frame_work (dcrtc, work); -wake_up (&dcrtc->frame_wait); +wake_up (&drm_to_armada_plane (dcrtc->crtc.primary)->frame_wait); } }
@@ -571,7 +571,8 @@ static int armada_drm_crtc_mode_set(struct drm_crtc *crtc, adj->crtc_vtotal, tm, bm);/* Wait for pending flips to complete */ -wait_event (dcrtc->frame_wait, !dcrtc->frame_work); +wait_event (drm_to_armada_plane (dcrtc->crtc.primary)->frame_wait, + !dcrtc->frame_work);drm_crtc_vblank_off (crtc);
@@ -688,7 +689,8 @@ static int armada_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,armada_reg_queue_end (regs, i);/* Wait for pending flips to complete */ -wait_event (dcrtc->frame_wait, !dcrtc->frame_work); +wait_event (drm_to_armada_plane (dcrtc->crtc.primary)->frame_wait, + !dcrtc->frame_work);/* Take a reference to the new fb as we're using it */ drm_framebuffer_reference (crtc->primary->fb);
@@ -1096,6 +1098,13 @@ static const struct drm_plane_funcs armada_primary_plane_funcs = { .destroy = drm_primary_helper_destroy, }; +int armada_drm_plane_init (struct armada_plane *plane) +{ +init_waitqueue_head (&plane->frame_wait); + +return 0 ; +} +static struct drm_prop_enum_list armada_drm_csc_yuv_enum_list[] = { {CSC_AUTO ,"Auto" }, {CSC_YUV_CCIR601 ,"CCIR601" },
@@ -1166,7 +1175,6 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,spin_lock_init (&dcrtc->irq_lock); dcrtc->irq_ena =CLEAN_SPU_IRQ_ISR ;INIT_LIST_HEAD (&dcrtc->vbl_list); -init_waitqueue_head (&dcrtc->frame_wait);/* Initialize some registers which we don't otherwise set */ writel_relaxed (0x00000001 , dcrtc->base +LCD_CFG_SCLK_DIV );
@@ -1208,6 +1216,12 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev,if (!primary)return -ENOMEM ; + ret =armada_drm_plane_init (primary); +if (ret) { +kfree (primary); +return ret; + } + ret = drm_universal_plane_init(drm, &primary->base, 0, &armada_primary_plane_funcs, armada_primary_formats,
drivers/gpu/drm/armada/armada_crtc.h +3 -1
@@ -36,9 +36,12 @@ struct armada_variant;struct armada_plane {struct drm_plane base; +wait_queue_head_t frame_wait; };#define drm_to_armada_plane (p) container_of(p, struct armada_plane, base) +int armada_drm_plane_init (struct armada_plane *plane); +struct armada_crtc {struct drm_crtc crtc;const struct armada_variant *variant;
@@ -71,7 +74,6 @@ struct armada_crtc {uint32_t dumb_ctrl;uint32_t spu_iopad_ctrl; -wait_queue_head_t frame_wait;struct armada_frame_work *frame_work;spinlock_t irq_lock;
drivers/gpu/drm/armada/armada_overlay.c +8 -4
@@ -39,7 +39,6 @@ struct armada_ovl_plane {struct {struct armada_vbl_event update;struct armada_regs regs[13 ]; -wait_queue_head_t wait; } vbl;struct armada_ovl_plane_properties prop; };
@@ -90,7 +89,7 @@ static void armada_ovl_plane_vbl(struct armada_crtc *dcrtc, void *data)armada_drm_crtc_update_regs (dcrtc, dplane->vbl.regs);armada_ovl_retire_fb (dplane,NULL ); -wake_up (&dplane->vbl.wait); +wake_up (&dplane->base.frame_wait); } static int
@@ -163,7 +162,7 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc, dcrtc->base + LCD_SPU_SRAM_PARA1); } -wait_event_timeout (dplane->vbl.wait, +wait_event_timeout (dplane->base.frame_wait,list_empty (&dplane->vbl.update.node),HZ /25 );
@@ -451,7 +450,12 @@ int armada_overlay_plane_create(struct drm_device *dev, unsigned long crtcs)if (!dplane)return -ENOMEM ; -init_waitqueue_head (&dplane->vbl.wait); + ret =armada_drm_plane_init (&dplane->base); +if (ret) { +kfree (dplane); +return ret; + } +armada_drm_vbl_event_init (&dplane->vbl.update, armada_ovl_plane_vbl, dplane);
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 18/20 drm/armada: move CRTC flip work to primary plane work
In reply to Russell King - ARM LinuxAdd a plane work implementation, and move the CRTC framebuffer flip work to it for the primary plane. The idea is to have a common plane work implementation for both the primary and overlay planes.
--- drivers/gpu/drm/armada/armada_crtc.c | 102 ++++++++++++++++++++--------------- drivers/gpu/drm/armada/armada_crtc.h | 15 ++++-- 2 files changed, 70 insertions(+), 47 deletions(-)
drivers/gpu/drm/armada/armada_crtc.c +58 -44
@@ -20,6 +20,7 @@#include "armada_hw.h" struct armada_frame_work { +struct armada_plane_work work;struct drm_pending_vblank_event *event;struct armada_regs regs[4 ];struct drm_framebuffer *old_fb;
@@ -190,6 +191,41 @@ static unsigned armada_drm_crtc_calc_fb(struct drm_framebuffer *fb,return i; } +static void armada_drm_plane_work_run (struct armada_crtc *dcrtc, +struct armada_plane *plane) +{ +struct armada_plane_work *work =xchg (&plane->work,NULL ); + +/* Handle any pending frame work. */ +if (work) { + work->fn (dcrtc, plane, work); +drm_vblank_put (dcrtc->crtc.dev, dcrtc->num); + } +} + +int armada_drm_plane_work_queue (struct armada_crtc *dcrtc, +struct armada_plane *plane,struct armada_plane_work *work) +{ +int ret; + + ret =drm_vblank_get (dcrtc->crtc.dev, dcrtc->num); +if (ret) { +DRM_ERROR ("failed to acquire vblank counter\n" ); +return ret; + } + + ret =cmpxchg (&plane->work,NULL , work) ? -EBUSY :0 ; +if (ret) +drm_vblank_put (dcrtc->crtc.dev, dcrtc->num); + +return ret; +} + +int armada_drm_plane_work_wait (struct armada_plane *plane,long timeout) +{ +return wait_event_timeout (plane->frame_wait, !plane->work, timeout); +} +void armada_drm_vbl_event_add (struct armada_crtc *dcrtc,struct armada_vbl_event *evt) {
@@ -233,44 +269,31 @@ static void armada_drm_vbl_event_run(struct armada_crtc *dcrtc)static int armada_drm_crtc_queue_frame_work (struct armada_crtc *dcrtc,struct armada_frame_work *work) { -struct drm_device *dev = dcrtc->crtc.dev; -int ret; +struct armada_plane *plane =drm_to_armada_plane (dcrtc->crtc.primary); - ret =drm_vblank_get (dev, dcrtc->num); -if (ret) { -DRM_ERROR ("failed to acquire vblank counter\n" ); -return ret; - } - -if (cmpxchg (&dcrtc->frame_work,NULL , work)) { -drm_vblank_put (dev, dcrtc->num); - ret = -EBUSY ; - } - -return ret; +return armada_drm_plane_work_queue (dcrtc, plane, &work->work); }static void armada_drm_crtc_complete_frame_work (struct armada_crtc *dcrtc, -struct armada_frame_work *work) +struct armada_plane *plane,struct armada_plane_work *work) { + struct armada_frame_work *fwork = container_of(work, struct armada_frame_work, work);struct drm_device *dev = dcrtc->crtc.dev;unsigned long flags;spin_lock_irqsave (&dcrtc->irq_lock, flags); -armada_drm_crtc_update_regs (dcrtc, work->regs); +armada_drm_crtc_update_regs (dcrtc, fwork->regs);spin_unlock_irqrestore (&dcrtc->irq_lock, flags); -if (work->event) { +if (fwork->event) {spin_lock_irqsave (&dev->event_lock, flags); -drm_send_vblank_event (dev, dcrtc->num, work->event); +drm_send_vblank_event (dev, dcrtc->num, fwork->event);spin_unlock_irqrestore (&dev->event_lock, flags); } -drm_vblank_put (dev, dcrtc->num); -/* Finally, queue the process-half of the cleanup. */ -__armada_drm_queue_unref_work (dcrtc->crtc.dev, work->old_fb); -kfree (work); +__armada_drm_queue_unref_work (dcrtc->crtc.dev, fwork->old_fb); +kfree (fwork); } static void armada_drm_crtc_finish_fb(struct armada_crtc *dcrtc,
@@ -290,6 +313,7 @@ static void armada_drm_crtc_finish_fb(struct armada_crtc *dcrtc, work =kmalloc (sizeof (*work),GFP_KERNEL );if (work) {int i =0 ; + work->work.fn = armada_drm_crtc_complete_frame_work; work->event =NULL ; work->old_fb = fb;armada_reg_queue_end (work->regs, i);
@@ -310,18 +334,14 @@ static void armada_drm_crtc_finish_fb(struct armada_crtc *dcrtc,static void armada_drm_vblank_off (struct armada_crtc *dcrtc) { -struct armada_frame_work *work; +struct armada_plane *plane =drm_to_armada_plane (dcrtc->crtc.primary);/* * Tell the DRM core that vblank IRQs aren't going to happen for * a while. This cleans up any pending vblank events for us. */ drm_crtc_vblank_off (&dcrtc->crtc); - -/* Handle any pending flip event. */ - work =xchg (&dcrtc->frame_work,NULL ); -if (work) -armada_drm_crtc_complete_frame_work (dcrtc, work); +armada_drm_plane_work_run (dcrtc, plane); } void armada_drm_crtc_gamma_set(struct drm_crtc *crtc, u16 r, u16 g, u16 b,
@@ -450,12 +470,9 @@ static void armada_drm_crtc_irq(struct armada_crtc *dcrtc, u32 stat)spin_unlock (&dcrtc->irq_lock);if (stat &GRA_FRAME_IRQ ) { -struct armada_frame_work *work =xchg (&dcrtc->frame_work,NULL ); - -if (work) -armada_drm_crtc_complete_frame_work (dcrtc, work); - -wake_up (&drm_to_armada_plane (dcrtc->crtc.primary)->frame_wait); +struct armada_plane *plane =drm_to_armada_plane (dcrtc->crtc.primary); +armada_drm_plane_work_run (dcrtc, plane); +wake_up (&plane->frame_wait); } }
@@ -571,8 +588,8 @@ static int armada_drm_crtc_mode_set(struct drm_crtc *crtc, adj->crtc_vtotal, tm, bm);/* Wait for pending flips to complete */ -wait_event (drm_to_armada_plane (dcrtc->crtc.primary)->frame_wait, - !dcrtc->frame_work); +armada_drm_plane_work_wait (drm_to_armada_plane (dcrtc->crtc.primary), +MAX_SCHEDULE_TIMEOUT );drm_crtc_vblank_off (crtc);
@@ -689,8 +706,8 @@ static int armada_drm_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,armada_reg_queue_end (regs, i);/* Wait for pending flips to complete */ -wait_event (drm_to_armada_plane (dcrtc->crtc.primary)->frame_wait, - !dcrtc->frame_work); +armada_drm_plane_work_wait (drm_to_armada_plane (dcrtc->crtc.primary), +MAX_SCHEDULE_TIMEOUT );/* Take a reference to the new fb as we're using it */ drm_framebuffer_reference (crtc->primary->fb);
@@ -1013,6 +1030,7 @@ static int armada_drm_crtc_page_flip(struct drm_crtc *crtc,if (!work)return -ENOMEM ; + work->work.fn = armada_drm_crtc_complete_frame_work; work->event = event; work->old_fb = dcrtc->crtc.primary->fb;
@@ -1046,12 +1064,8 @@ static int armada_drm_crtc_page_flip(struct drm_crtc *crtc,* Finally, if the display is blanked, we won't receive an * interrupt, so complete it now. */ -if (dpms_blanked (dcrtc->dpms)) { -struct armada_frame_work *work =xchg (&dcrtc->frame_work,NULL ); - -if (work) -armada_drm_crtc_complete_frame_work (dcrtc, work); - } +if (dpms_blanked (dcrtc->dpms)) +armada_drm_plane_work_run (dcrtc,drm_to_armada_plane (dcrtc->crtc.primary));return 0 ; }
drivers/gpu/drm/armada/armada_crtc.h +12 -3
@@ -31,16 +31,27 @@ struct armada_regs {#define armada_reg_queue_end (_r, _i) \ armada_reg_queue_mod(_r, _i, 0, 0, ~0) -struct armada_frame_work ; +struct armada_crtc ; +struct armada_plane ;struct armada_variant ; +struct armada_plane_work { +void (*fn)(struct armada_crtc *, +struct armada_plane *, +struct armada_plane_work *); +}; +struct armada_plane {struct drm_plane base;wait_queue_head_t frame_wait; +struct armada_plane_work *work; };#define drm_to_armada_plane (p) container_of(p, struct armada_plane, base)int armada_drm_plane_init (struct armada_plane *plane); +int armada_drm_plane_work_queue (struct armada_crtc *dcrtc, +struct armada_plane *plane,struct armada_plane_work *work); +int armada_drm_plane_work_wait (struct armada_plane *plane,long timeout);struct armada_crtc {struct drm_crtc crtc;
@@ -74,8 +85,6 @@ struct armada_crtc {uint32_t dumb_ctrl;uint32_t spu_iopad_ctrl; -struct armada_frame_work *frame_work; -spinlock_t irq_lock;uint32_t irq_ena;struct list_head vbl_list;
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 19/20 drm/armada: convert overlay plane vbl worker to a armada plane worker
In reply to Russell King - ARM LinuxConvert the overlay plane to use the generic armada plane worker infrastructure which is shared with the primary plane.
--- drivers/gpu/drm/armada/armada_crtc.c | 48 +++++++++------------------------ drivers/gpu/drm/armada/armada_crtc.h | 20 ++------------ drivers/gpu/drm/armada/armada_overlay.c | 27 +++++++++---------- 3 files changed, 26 insertions(+), 69 deletions(-)
drivers/gpu/drm/armada/armada_crtc.c +12 -36
@@ -226,44 +226,15 @@ int armada_drm_plane_work_wait(struct armada_plane *plane, long timeout)return wait_event_timeout (plane->frame_wait, !plane->work, timeout); } -void armada_drm_vbl_event_add (struct armada_crtc *dcrtc, -struct armada_vbl_event *evt) +struct armada_plane_work *armada_drm_plane_work_cancel ( +struct armada_crtc *dcrtc,struct armada_plane *plane) { -unsigned long flags; -bool not_on_list; - -WARN_ON (drm_vblank_get (dcrtc->crtc.dev, dcrtc->num)); - -spin_lock_irqsave (&dcrtc->irq_lock, flags); - not_on_list =list_empty (&evt->node); -if (not_on_list) -list_add_tail (&evt->node, &dcrtc->vbl_list); -spin_unlock_irqrestore (&dcrtc->irq_lock, flags); +struct armada_plane_work *work =xchg (&plane->work,NULL ); -if (!not_on_list) +if (work)drm_vblank_put (dcrtc->crtc.dev, dcrtc->num); -} -void armada_drm_vbl_event_remove (struct armada_crtc *dcrtc, -struct armada_vbl_event *evt) -{ -spin_lock_irq (&dcrtc->irq_lock); -if (!list_empty (&evt->node)) { -list_del_init (&evt->node); -drm_vblank_put (dcrtc->crtc.dev, dcrtc->num); - } -spin_unlock_irq (&dcrtc->irq_lock); -} - -static void armada_drm_vbl_event_run (struct armada_crtc *dcrtc) -{ -struct armada_vbl_event *e, *n; - -list_for_each_entry_safe (e, n, &dcrtc->vbl_list, node) { -list_del_init (&e->node); -drm_vblank_put (dcrtc->crtc.dev, dcrtc->num); - e->fn (dcrtc, e->data); - } +return work; } static int armada_drm_crtc_queue_frame_work(struct armada_crtc *dcrtc,
@@ -429,6 +400,7 @@ static bool armada_drm_crtc_mode_fixup(struct drm_crtc *crtc,static void armada_drm_crtc_irq (struct armada_crtc *dcrtc,u32 stat) {void __iomem *base = dcrtc->base; +struct drm_plane *ovl_plane;if (stat &DMA_FF_UNDERFLOW )DRM_ERROR ("video underflow on crtc %u\n" , dcrtc->num);
@@ -439,7 +411,12 @@ static void armada_drm_crtc_irq(struct armada_crtc *dcrtc, u32 stat)drm_handle_vblank (dcrtc->crtc.dev, dcrtc->num);spin_lock (&dcrtc->irq_lock); -armada_drm_vbl_event_run (dcrtc); + ovl_plane = dcrtc->plane; +if (ovl_plane) { +struct armada_plane *plane =drm_to_armada_plane (ovl_plane); +armada_drm_plane_work_run (dcrtc, plane); +wake_up (&plane->frame_wait); + }if (stat &GRA_FRAME_IRQ && dcrtc->interlaced) {int i = stat &GRA_FRAME_IRQ0 ?0 :1 ;
@@ -1188,7 +1165,6 @@ static int armada_drm_crtc_create(struct drm_device *drm, struct device *dev, dcrtc->spu_iopad_ctrl =CFG_VSCALE_LN_EN |CFG_IOPAD_DUMB24 ;spin_lock_init (&dcrtc->irq_lock); dcrtc->irq_ena =CLEAN_SPU_IRQ_ISR ; -INIT_LIST_HEAD (&dcrtc->vbl_list);/* Initialize some registers which we don't otherwise set */ writel_relaxed (0x00000001 , dcrtc->base +LCD_CFG_SCLK_DIV );
drivers/gpu/drm/armada/armada_crtc.h +2 -18
@@ -52,6 +52,8 @@ int armada_drm_plane_init(struct armada_plane *plane);int armada_drm_plane_work_queue (struct armada_crtc *dcrtc,struct armada_plane *plane,struct armada_plane_work *work);int armada_drm_plane_work_wait (struct armada_plane *plane,long timeout); +struct armada_plane_work *armada_drm_plane_work_cancel ( +struct armada_crtc *dcrtc,struct armada_plane *plane);struct armada_crtc {struct drm_crtc crtc;
@@ -87,27 +89,9 @@ struct armada_crtc {spinlock_t irq_lock;uint32_t irq_ena; -struct list_head vbl_list; };#define drm_to_armada_crtc (c) container_of(c, struct armada_crtc, crtc) -struct armada_vbl_event { -struct list_head node; -void *data; -void (*fn)(struct armada_crtc *,void *); -}; - -void armada_drm_vbl_event_add (struct armada_crtc *, -struct armada_vbl_event *); -void armada_drm_vbl_event_remove (struct armada_crtc *, -struct armada_vbl_event *); -#define armada_drm_vbl_event_init (_e, _f, _d) do { \ - struct armada_vbl_event *__e = _e; \ - INIT_LIST_HEAD(&__e->node); \ - __e->data = _d; \ - __e->fn = _f; \ -} while (0) -void armada_drm_crtc_gamma_set (struct drm_crtc *,u16 ,u16 ,u16 ,int );void armada_drm_crtc_gamma_get (struct drm_crtc *,u16 *,u16 *,u16 *,int );void armada_drm_crtc_disable_irq (struct armada_crtc *,u32 );
drivers/gpu/drm/armada/armada_overlay.c +12 -15
@@ -37,7 +37,7 @@ struct armada_ovl_plane {uint32_t dst_yx;uint32_t ctrl0;struct { -struct armada_vbl_event update; +struct armada_plane_work work;struct armada_regs regs[13 ]; } vbl;struct armada_ovl_plane_properties prop;
@@ -82,14 +82,13 @@ static void armada_ovl_retire_fb(struct armada_ovl_plane *dplane, }/* === Plane support === */ -static void armada_ovl_plane_vbl (struct armada_crtc *dcrtc,void *data) +static void armada_ovl_plane_work (struct armada_crtc *dcrtc, +struct armada_plane *plane,struct armada_plane_work *work) { -struct armada_ovl_plane *dplane = data; + struct armada_ovl_plane *dplane = container_of(plane, struct armada_ovl_plane, base);armada_drm_crtc_update_regs (dcrtc, dplane->vbl.regs);armada_ovl_retire_fb (dplane,NULL ); - -wake_up (&dplane->base.frame_wait); } static int
@@ -162,9 +161,8 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc, dcrtc->base + LCD_SPU_SRAM_PARA1); } -wait_event_timeout (dplane->base.frame_wait, -list_empty (&dplane->vbl.update.node), -HZ /25 ); +if (armada_drm_plane_work_wait (&dplane->base,HZ /25 ) ==0 ) +armada_drm_plane_work_cancel (dcrtc, &dplane->base);if (plane->fb != fb) {struct armada_gem_object *obj =drm_fb_obj (fb);
@@ -255,7 +253,8 @@ armada_ovl_plane_update(struct drm_plane *plane, struct drm_crtc *crtc, }if (idx) {armada_reg_queue_end (dplane->vbl.regs, idx); -armada_drm_vbl_event_add (dcrtc, &dplane->vbl.update); +armada_drm_plane_work_queue (dcrtc, &dplane->base, + &dplane->vbl.work); }return 0 ; }
@@ -270,14 +269,13 @@ static int armada_ovl_plane_disable(struct drm_plane *plane)return 0 ; dcrtc =drm_to_armada_crtc (dplane->base.base.crtc); - dcrtc->plane =NULL ; -armada_drm_vbl_event_remove (dcrtc, &dplane->vbl.update); +armada_drm_plane_work_cancel (dcrtc, &dplane->base); +armada_drm_crtc_plane_disable (dcrtc, plane); + dcrtc->plane =NULL ; dplane->ctrl0 =0 ; -armada_drm_crtc_plane_disable (dcrtc, plane); - fb =xchg (&dplane->old_fb,NULL );if (fb)drm_framebuffer_unreference (fb);
@@ -456,8 +454,7 @@ int armada_overlay_plane_create(struct drm_device *dev, unsigned long crtcs)return ret; } -armada_drm_vbl_event_init (&dplane->vbl.update, armada_ovl_plane_vbl, - dplane); + dplane->vbl.work.fn = armada_ovl_plane_work; ret = drm_universal_plane_init(dev, &dplane->base.base, crtcs, &armada_ovl_plane_funcs,
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 20/20 drm/armada: move frame wait wakeup into plane work
In reply to Russell King - ARM LinuxMove the wakeup for the frame wait into the armada plane work, to ensure that it is woken up every time we run a work.
--- drivers/gpu/drm/armada/armada_crtc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/armada/armada_crtc.c +2 -2
@@ -201,6 +201,8 @@ static void armada_drm_plane_work_run(struct armada_crtc *dcrtc, work->fn (dcrtc, plane, work);drm_vblank_put (dcrtc->crtc.dev, dcrtc->num); } + +wake_up (&plane->frame_wait); } int armada_drm_plane_work_queue(struct armada_crtc *dcrtc,
@@ -415,7 +417,6 @@ static void armada_drm_crtc_irq(struct armada_crtc *dcrtc, u32 stat)if (ovl_plane) {struct armada_plane *plane =drm_to_armada_plane (ovl_plane);armada_drm_plane_work_run (dcrtc, plane); -wake_up (&plane->frame_wait); }if (stat &GRA_FRAME_IRQ && dcrtc->interlaced) {
@@ -449,7 +450,6 @@ static void armada_drm_crtc_irq(struct armada_crtc *dcrtc, u32 stat)if (stat &GRA_FRAME_IRQ ) {struct armada_plane *plane =drm_to_armada_plane (dcrtc->crtc.primary);armada_drm_plane_work_run (dcrtc, plane); -wake_up (&plane->frame_wait); } }
Signature · 6 lines
2.1.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 2 lines · Russell King - ARM Linux
Here are my queued changes for the Armada DRM driver, for the upcoming 4.4 merge window.
If there are no further comments (there was only one minor comment which has been fixed), I'll send a pull request for this to David later today.
Quoted 43 lines
These changes are about updating the driver to some of the more recent DRM APIs, and removing the non-component support now that has stabilised. This results in all of
armada_outputandarmada_slavebeing removed, resulting in 460 lines of code removed from that change alone.Other changes include:
* moving more towards supporting DRM planes in a more generic way, thereby reducing the duplication between the primary and overlay planes.
* locking cleanups, more like locking removal, prefering inherently atomic operations (eg, xchg) instead of spinlocking. This ultimately results in simpler and faster code.I've been running these patches for a while and haven't noticed any ill effects.
Posted for comment, if nothing is forthcoming, I'll send a pull request to David in a week or so's time. These patches are against v4.2, but rebase to 4.3-rc3 without any fuss.
drivers/gpu/drm/armada/Kconfig | 9 -- drivers/gpu/drm/armada/Makefile | 3 +- drivers/gpu/drm/armada/armada_crtc.c | 258 +++++++++++++++++++++++--------- drivers/gpu/drm/armada/armada_crtc.h | 34 +++-- drivers/gpu/drm/armada/armada_drm.h | 16 -- drivers/gpu/drm/armada/armada_drv.c | 148 +++--------------- drivers/gpu/drm/armada/armada_output.c | 142 ------------------ drivers/gpu/drm/armada/armada_output.h | 33 ---- drivers/gpu/drm/armada/armada_overlay.c | 147 +++++++++--------- drivers/gpu/drm/armada/armada_slave.c | 139 ----------------- drivers/gpu/drm/armada/armada_slave.h | 26 ---- 11 files changed, 297 insertions(+), 658 deletions(-) delete mode 100644 drivers/gpu/drm/armada/armada_output.c delete mode 100644 drivers/gpu/drm/armada/armada_output.h delete mode 100644 drivers/gpu/drm/armada/armada_slave.c delete mode 100644 drivers/gpu/drm/armada/armada_slave.hSignature · 2 lines
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net.
Signature · 6 lines
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up according to speedtest.net. _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel