* [PATCH 1/6] drm: make drm_vblank_count_and_time() static
@ 2016-07-05 0:04 Gustavo Padovan
2016-07-05 0:04 ` [PATCH 2/6] drm/armada: use drm_crtc_handle_vblank() Gustavo Padovan
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Gustavo Padovan @ 2016-07-05 0:04 UTC (permalink / raw)
To: dri-devel; +Cc: Daniel Vetter, Gustavo Padovan, David Airlie, open list
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
As they are not used anywhere outside drm_irq.c make them static.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
drivers/gpu/drm/drm_irq.c | 7 ++-----
include/drm/drmP.h | 2 --
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 149453c..7d6a406 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -945,8 +945,8 @@ EXPORT_SYMBOL(drm_crtc_vblank_count);
*
* This is the legacy version of drm_crtc_vblank_count_and_time().
*/
-u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
- struct timeval *vblanktime)
+static u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
+ struct timeval *vblanktime)
{
struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
u32 vblank_count;
@@ -963,7 +963,6 @@ u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
return vblank_count;
}
-EXPORT_SYMBOL(drm_vblank_count_and_time);
/**
* drm_crtc_vblank_count_and_time - retrieve "cooked" vblank counter value
@@ -975,8 +974,6 @@ EXPORT_SYMBOL(drm_vblank_count_and_time);
* vblank events since the system was booted, including lost events due to
* modesetting activity. Returns corresponding system timestamp of the time
* of the vblank interval that corresponds to the current vblank counter value.
- *
- * This is the native KMS version of drm_vblank_count_and_time().
*/
u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
struct timeval *vblanktime)
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index cf918e3e..c2fe2cf 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -942,8 +942,6 @@ extern int drm_wait_vblank(struct drm_device *dev, void *data,
struct drm_file *filp);
extern u32 drm_vblank_count(struct drm_device *dev, unsigned int pipe);
extern u32 drm_crtc_vblank_count(struct drm_crtc *crtc);
-extern u32 drm_vblank_count_and_time(struct drm_device *dev, unsigned int pipe,
- struct timeval *vblanktime);
extern u32 drm_crtc_vblank_count_and_time(struct drm_crtc *crtc,
struct timeval *vblanktime);
extern void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
--
2.5.5
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 2/6] drm/armada: use drm_crtc_handle_vblank()
2016-07-05 0:04 [PATCH 1/6] drm: make drm_vblank_count_and_time() static Gustavo Padovan
@ 2016-07-05 0:04 ` Gustavo Padovan
2016-07-05 0:04 ` [PATCH 3/6] drm/atmel: " Gustavo Padovan
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Gustavo Padovan @ 2016-07-05 0:04 UTC (permalink / raw)
To: dri-devel
Cc: Daniel Vetter, Gustavo Padovan, Russell King, David Airlie, open list
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Remove legacy usage of drm_handle_vblank()
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
drivers/gpu/drm/armada/armada_crtc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/armada/armada_crtc.c b/drivers/gpu/drm/armada/armada_crtc.c
index 34405e4..2f58e9e 100644
--- a/drivers/gpu/drm/armada/armada_crtc.c
+++ b/drivers/gpu/drm/armada/armada_crtc.c
@@ -410,7 +410,7 @@ static void armada_drm_crtc_irq(struct armada_crtc *dcrtc, u32 stat)
DRM_ERROR("graphics underflow on crtc %u\n", dcrtc->num);
if (stat & VSYNC_IRQ)
- drm_handle_vblank(dcrtc->crtc.dev, dcrtc->num);
+ drm_crtc_handle_vblank(&dcrtc->crtc);
spin_lock(&dcrtc->irq_lock);
ovl_plane = dcrtc->plane;
--
2.5.5
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 3/6] drm/atmel: use drm_crtc_handle_vblank()
2016-07-05 0:04 [PATCH 1/6] drm: make drm_vblank_count_and_time() static Gustavo Padovan
2016-07-05 0:04 ` [PATCH 2/6] drm/armada: use drm_crtc_handle_vblank() Gustavo Padovan
@ 2016-07-05 0:04 ` Gustavo Padovan
2016-07-05 0:04 ` [PATCH 4/6] drm/nouveau: " Gustavo Padovan
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Gustavo Padovan @ 2016-07-05 0:04 UTC (permalink / raw)
To: dri-devel
Cc: Daniel Vetter, Gustavo Padovan, Boris Brezillon, David Airlie, open list
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Remove legacy usage of drm_handle_vblank()
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
index 613f6c9..a978381 100644
--- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
+++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
@@ -383,7 +383,7 @@ static void atmel_hlcdc_crtc_finish_page_flip(struct atmel_hlcdc_crtc *crtc)
void atmel_hlcdc_crtc_irq(struct drm_crtc *c)
{
- drm_handle_vblank(c->dev, 0);
+ drm_crtc_handle_vblank(c);
atmel_hlcdc_crtc_finish_page_flip(drm_crtc_to_atmel_hlcdc_crtc(c));
}
--
2.5.5
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 4/6] drm/nouveau: use drm_crtc_handle_vblank()
2016-07-05 0:04 [PATCH 1/6] drm: make drm_vblank_count_and_time() static Gustavo Padovan
2016-07-05 0:04 ` [PATCH 2/6] drm/armada: use drm_crtc_handle_vblank() Gustavo Padovan
2016-07-05 0:04 ` [PATCH 3/6] drm/atmel: " Gustavo Padovan
@ 2016-07-05 0:04 ` Gustavo Padovan
2016-07-05 0:04 ` [PATCH 5/6] drm/rcar-du: " Gustavo Padovan
2016-07-05 0:04 ` [PATCH 6/6] drm/tilcdc: " Gustavo Padovan
4 siblings, 0 replies; 7+ messages in thread
From: Gustavo Padovan @ 2016-07-05 0:04 UTC (permalink / raw)
To: dri-devel
Cc: Daniel Vetter, Gustavo Padovan, Ben Skeggs, David Airlie,
open list:DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS, open list
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Remove legacy usage of drm_handle_vblank()
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
drivers/gpu/drm/nouveau/nouveau_display.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index bd8d5bb..6e97862 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -47,7 +47,7 @@ nouveau_display_vblank_handler(struct nvif_notify *notify)
{
struct nouveau_crtc *nv_crtc =
container_of(notify, typeof(*nv_crtc), vblank);
- drm_handle_vblank(nv_crtc->base.dev, nv_crtc->index);
+ drm_crtc_handle_vblank(&nv_crtc->base);
return NVIF_NOTIFY_KEEP;
}
--
2.5.5
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 5/6] drm/rcar-du: use drm_crtc_handle_vblank()
2016-07-05 0:04 [PATCH 1/6] drm: make drm_vblank_count_and_time() static Gustavo Padovan
` (2 preceding siblings ...)
2016-07-05 0:04 ` [PATCH 4/6] drm/nouveau: " Gustavo Padovan
@ 2016-07-05 0:04 ` Gustavo Padovan
2016-07-05 0:04 ` [PATCH 6/6] drm/tilcdc: " Gustavo Padovan
4 siblings, 0 replies; 7+ messages in thread
From: Gustavo Padovan @ 2016-07-05 0:04 UTC (permalink / raw)
To: dri-devel
Cc: Daniel Vetter, Gustavo Padovan, Laurent Pinchart, David Airlie,
open list:DRM DRIVERS FOR RENESAS, open list
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Remove legacy usage of drm_handle_vblank()
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
index 0d8bdda..e39fcef 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c
@@ -552,7 +552,7 @@ static irqreturn_t rcar_du_crtc_irq(int irq, void *arg)
rcar_du_crtc_write(rcrtc, DSRCR, status & DSRCR_MASK);
if (status & DSSR_FRM) {
- drm_handle_vblank(rcrtc->crtc.dev, rcrtc->index);
+ drm_crtc_handle_vblank(&rcrtc->crtc);
rcar_du_crtc_finish_page_flip(rcrtc);
ret = IRQ_HANDLED;
}
--
2.5.5
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 6/6] drm/tilcdc: use drm_crtc_handle_vblank()
2016-07-05 0:04 [PATCH 1/6] drm: make drm_vblank_count_and_time() static Gustavo Padovan
` (3 preceding siblings ...)
2016-07-05 0:04 ` [PATCH 5/6] drm/rcar-du: " Gustavo Padovan
@ 2016-07-05 0:04 ` Gustavo Padovan
2016-07-12 13:42 ` Daniel Vetter
4 siblings, 1 reply; 7+ messages in thread
From: Gustavo Padovan @ 2016-07-05 0:04 UTC (permalink / raw)
To: dri-devel
Cc: Daniel Vetter, Gustavo Padovan, Jyri Sarha, Tomi Valkeinen,
David Airlie, open list
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Remove legacy usage of drm_handle_vblank()
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
index 79027b1..107c8bd 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
@@ -697,7 +697,7 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc)
spin_unlock_irqrestore(&tilcdc_crtc->irq_lock, flags);
- drm_handle_vblank(dev, 0);
+ drm_crtc_handle_vblank(crtc);
if (!skip_event) {
struct drm_pending_vblank_event *event;
--
2.5.5
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 6/6] drm/tilcdc: use drm_crtc_handle_vblank()
2016-07-05 0:04 ` [PATCH 6/6] drm/tilcdc: " Gustavo Padovan
@ 2016-07-12 13:42 ` Daniel Vetter
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Vetter @ 2016-07-12 13:42 UTC (permalink / raw)
To: Gustavo Padovan
Cc: dri-devel, Daniel Vetter, Gustavo Padovan, Jyri Sarha,
Tomi Valkeinen, David Airlie, open list
On Mon, Jul 04, 2016 at 09:04:52PM -0300, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
>
> Remove legacy usage of drm_handle_vblank()
>
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Applied the entire series, thanks.
-Daniel
> ---
> drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
> index 79027b1..107c8bd 100644
> --- a/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
> +++ b/drivers/gpu/drm/tilcdc/tilcdc_crtc.c
> @@ -697,7 +697,7 @@ irqreturn_t tilcdc_crtc_irq(struct drm_crtc *crtc)
>
> spin_unlock_irqrestore(&tilcdc_crtc->irq_lock, flags);
>
> - drm_handle_vblank(dev, 0);
> + drm_crtc_handle_vblank(crtc);
>
> if (!skip_event) {
> struct drm_pending_vblank_event *event;
> --
> 2.5.5
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-07-12 13:42 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-05 0:04 [PATCH 1/6] drm: make drm_vblank_count_and_time() static Gustavo Padovan
2016-07-05 0:04 ` [PATCH 2/6] drm/armada: use drm_crtc_handle_vblank() Gustavo Padovan
2016-07-05 0:04 ` [PATCH 3/6] drm/atmel: " Gustavo Padovan
2016-07-05 0:04 ` [PATCH 4/6] drm/nouveau: " Gustavo Padovan
2016-07-05 0:04 ` [PATCH 5/6] drm/rcar-du: " Gustavo Padovan
2016-07-05 0:04 ` [PATCH 6/6] drm/tilcdc: " Gustavo Padovan
2016-07-12 13:42 ` Daniel Vetter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®