dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] drm: use drm_dev_has_vblank more
@ 2020-05-27 11:11 Daniel Vetter
  2020-05-27 12:02 ` Thomas Zimmermann
  2020-05-27 17:44 ` Sam Ravnborg
  0 siblings, 2 replies; 4+ messages in thread
From: Daniel Vetter @ 2020-05-27 11:11 UTC (permalink / raw)
  To: DRI Development
  Cc: David Airlie, Daniel Vetter, Intel Graphics Development,
	Thomas Zimmermann, Daniel Vetter

For historical reasons it's called dev->num_crtcs, which is rather
confusing ever since kms was added. But now we have a nice helper, so
let's use it for better readability!

Only code change is in atomic helpers: vblank support means that
dev->irq_enabled must be set too. Another one of these quirky things
... But since it's implied we can simplify that check.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
---
 drivers/gpu/drm/drm_atomic_helper.c |  2 +-
 drivers/gpu/drm/drm_irq.c           |  2 +-
 drivers/gpu/drm/drm_vblank.c        | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 0a541368246e..bfcc7857a9a1 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -1097,7 +1097,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state)
 		else if (funcs->dpms)
 			funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
 
-		if (!(dev->irq_enabled && dev->num_crtcs))
+		if (!drm_dev_has_vblank(dev))
 			continue;
 
 		ret = drm_crtc_vblank_get(crtc);
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
index 588be45abd7a..09d6e9e2e075 100644
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
@@ -181,7 +181,7 @@ int drm_irq_uninstall(struct drm_device *dev)
 	 * vblank/irq handling. KMS drivers must ensure that vblanks are all
 	 * disabled when uninstalling the irq handler.
 	 */
-	if (dev->num_crtcs) {
+	if (drm_dev_has_vblank(dev)) {
 		spin_lock_irqsave(&dev->vbl_lock, irqflags);
 		for (i = 0; i < dev->num_crtcs; i++) {
 			struct drm_vblank_crtc *vblank = &dev->vblank[i];
diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
index e278d6407f8e..162d9f7e692a 100644
--- a/drivers/gpu/drm/drm_vblank.c
+++ b/drivers/gpu/drm/drm_vblank.c
@@ -605,7 +605,7 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc,
 	int linedur_ns = 0, framedur_ns = 0;
 	int dotclock = mode->crtc_clock;
 
-	if (!dev->num_crtcs)
+	if (!drm_dev_has_vblank(dev))
 		return;
 
 	if (WARN_ON(pipe >= dev->num_crtcs))
@@ -1065,7 +1065,7 @@ void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
 	unsigned int pipe = drm_crtc_index(crtc);
 	ktime_t now;
 
-	if (dev->num_crtcs > 0) {
+	if (drm_dev_has_vblank(dev)) {
 		seq = drm_vblank_count_and_time(dev, pipe, &now);
 	} else {
 		seq = 0;
@@ -1137,7 +1137,7 @@ static int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
 	unsigned long irqflags;
 	int ret = 0;
 
-	if (!dev->num_crtcs)
+	if (!drm_dev_has_vblank(dev))
 		return -EINVAL;
 
 	if (WARN_ON(pipe >= dev->num_crtcs))
@@ -1506,7 +1506,7 @@ static void drm_legacy_vblank_pre_modeset(struct drm_device *dev,
 	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
 
 	/* vblank is not initialized (IRQ not installed ?), or has been freed */
-	if (!dev->num_crtcs)
+	if (!drm_dev_has_vblank(dev))
 		return;
 
 	if (WARN_ON(pipe >= dev->num_crtcs))
@@ -1533,7 +1533,7 @@ static void drm_legacy_vblank_post_modeset(struct drm_device *dev,
 	unsigned long irqflags;
 
 	/* vblank is not initialized (IRQ not installed ?), or has been freed */
-	if (!dev->num_crtcs)
+	if (!drm_dev_has_vblank(dev))
 		return;
 
 	if (WARN_ON(pipe >= dev->num_crtcs))
@@ -1558,7 +1558,7 @@ int drm_legacy_modeset_ctl_ioctl(struct drm_device *dev, void *data,
 	unsigned int pipe;
 
 	/* If drm_vblank_init() hasn't been called yet, just no-op */
-	if (!dev->num_crtcs)
+	if (!drm_dev_has_vblank(dev))
 		return 0;
 
 	/* KMS drivers handle this internally */
@@ -1896,7 +1896,7 @@ bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe)
 	unsigned long irqflags;
 	bool disable_irq, fence_cookie;
 
-	if (WARN_ON_ONCE(!dev->num_crtcs))
+	if (WARN_ON_ONCE(!drm_dev_has_vblank(dev)))
 		return false;
 
 	if (WARN_ON(pipe >= dev->num_crtcs))
-- 
2.26.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm: use drm_dev_has_vblank more
  2020-05-27 11:11 [PATCH] drm: use drm_dev_has_vblank more Daniel Vetter
@ 2020-05-27 12:02 ` Thomas Zimmermann
  2020-05-29 11:39   ` Daniel Vetter
  2020-05-27 17:44 ` Sam Ravnborg
  1 sibling, 1 reply; 4+ messages in thread
From: Thomas Zimmermann @ 2020-05-27 12:02 UTC (permalink / raw)
  To: Daniel Vetter, DRI Development
  Cc: David Airlie, Intel Graphics Development, Daniel Vetter


[-- Attachment #1.1.1: Type: text/plain, Size: 4734 bytes --]


Am 27.05.20 um 13:11 schrieb Daniel Vetter:
> For historical reasons it's called dev->num_crtcs, which is rather
> confusing ever since kms was added. But now we have a nice helper, so
> let's use it for better readability!
> 
> Only code change is in atomic helpers: vblank support means that
> dev->irq_enabled must be set too. Another one of these quirky things
> ... But since it's implied we can simplify that check.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>

Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>

> ---
>  drivers/gpu/drm/drm_atomic_helper.c |  2 +-
>  drivers/gpu/drm/drm_irq.c           |  2 +-
>  drivers/gpu/drm/drm_vblank.c        | 14 +++++++-------
>  3 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index 0a541368246e..bfcc7857a9a1 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -1097,7 +1097,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state)
>  		else if (funcs->dpms)
>  			funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
>  
> -		if (!(dev->irq_enabled && dev->num_crtcs))
> +		if (!drm_dev_has_vblank(dev))
>  			continue;
>  
>  		ret = drm_crtc_vblank_get(crtc);
> diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> index 588be45abd7a..09d6e9e2e075 100644
> --- a/drivers/gpu/drm/drm_irq.c
> +++ b/drivers/gpu/drm/drm_irq.c
> @@ -181,7 +181,7 @@ int drm_irq_uninstall(struct drm_device *dev)
>  	 * vblank/irq handling. KMS drivers must ensure that vblanks are all
>  	 * disabled when uninstalling the irq handler.
>  	 */
> -	if (dev->num_crtcs) {
> +	if (drm_dev_has_vblank(dev)) {
>  		spin_lock_irqsave(&dev->vbl_lock, irqflags);
>  		for (i = 0; i < dev->num_crtcs; i++) {
>  			struct drm_vblank_crtc *vblank = &dev->vblank[i];
> diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
> index e278d6407f8e..162d9f7e692a 100644
> --- a/drivers/gpu/drm/drm_vblank.c
> +++ b/drivers/gpu/drm/drm_vblank.c
> @@ -605,7 +605,7 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc,
>  	int linedur_ns = 0, framedur_ns = 0;
>  	int dotclock = mode->crtc_clock;
>  
> -	if (!dev->num_crtcs)
> +	if (!drm_dev_has_vblank(dev))
>  		return;
>  
>  	if (WARN_ON(pipe >= dev->num_crtcs))
> @@ -1065,7 +1065,7 @@ void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
>  	unsigned int pipe = drm_crtc_index(crtc);
>  	ktime_t now;
>  
> -	if (dev->num_crtcs > 0) {
> +	if (drm_dev_has_vblank(dev)) {
>  		seq = drm_vblank_count_and_time(dev, pipe, &now);
>  	} else {
>  		seq = 0;
> @@ -1137,7 +1137,7 @@ static int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
>  	unsigned long irqflags;
>  	int ret = 0;
>  
> -	if (!dev->num_crtcs)
> +	if (!drm_dev_has_vblank(dev))
>  		return -EINVAL;
>  
>  	if (WARN_ON(pipe >= dev->num_crtcs))
> @@ -1506,7 +1506,7 @@ static void drm_legacy_vblank_pre_modeset(struct drm_device *dev,
>  	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
>  
>  	/* vblank is not initialized (IRQ not installed ?), or has been freed */
> -	if (!dev->num_crtcs)
> +	if (!drm_dev_has_vblank(dev))
>  		return;
>  
>  	if (WARN_ON(pipe >= dev->num_crtcs))
> @@ -1533,7 +1533,7 @@ static void drm_legacy_vblank_post_modeset(struct drm_device *dev,
>  	unsigned long irqflags;
>  
>  	/* vblank is not initialized (IRQ not installed ?), or has been freed */
> -	if (!dev->num_crtcs)
> +	if (!drm_dev_has_vblank(dev))
>  		return;
>  
>  	if (WARN_ON(pipe >= dev->num_crtcs))
> @@ -1558,7 +1558,7 @@ int drm_legacy_modeset_ctl_ioctl(struct drm_device *dev, void *data,
>  	unsigned int pipe;
>  
>  	/* If drm_vblank_init() hasn't been called yet, just no-op */
> -	if (!dev->num_crtcs)
> +	if (!drm_dev_has_vblank(dev))
>  		return 0;
>  
>  	/* KMS drivers handle this internally */
> @@ -1896,7 +1896,7 @@ bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe)
>  	unsigned long irqflags;
>  	bool disable_irq, fence_cookie;
>  
> -	if (WARN_ON_ONCE(!dev->num_crtcs))
> +	if (WARN_ON_ONCE(!drm_dev_has_vblank(dev)))
>  		return false;
>  
>  	if (WARN_ON(pipe >= dev->num_crtcs))
> 

-- 
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
(HRB 36809, AG Nürnberg)
Geschäftsführer: Felix Imendörffer


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

[-- Attachment #2: Type: text/plain, Size: 160 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm: use drm_dev_has_vblank more
  2020-05-27 11:11 [PATCH] drm: use drm_dev_has_vblank more Daniel Vetter
  2020-05-27 12:02 ` Thomas Zimmermann
@ 2020-05-27 17:44 ` Sam Ravnborg
  1 sibling, 0 replies; 4+ messages in thread
From: Sam Ravnborg @ 2020-05-27 17:44 UTC (permalink / raw)
  To: Daniel Vetter
  Cc: David Airlie, Daniel Vetter, Intel Graphics Development,
	Thomas Zimmermann, DRI Development

On Wed, May 27, 2020 at 01:11:34PM +0200, Daniel Vetter wrote:
> For historical reasons it's called dev->num_crtcs, which is rather
> confusing ever since kms was added. But now we have a nice helper, so
> let's use it for better readability!
> 
> Only code change is in atomic helpers: vblank support means that
> dev->irq_enabled must be set too. Another one of these quirky things
> ... But since it's implied we can simplify that check.
> 
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Cc: Maxime Ripard <mripard@kernel.org>
> Cc: Thomas Zimmermann <tzimmermann@suse.de>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Daniel Vetter <daniel@ffwll.ch>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
> ---
>  drivers/gpu/drm/drm_atomic_helper.c |  2 +-
>  drivers/gpu/drm/drm_irq.c           |  2 +-
>  drivers/gpu/drm/drm_vblank.c        | 14 +++++++-------
>  3 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> index 0a541368246e..bfcc7857a9a1 100644
> --- a/drivers/gpu/drm/drm_atomic_helper.c
> +++ b/drivers/gpu/drm/drm_atomic_helper.c
> @@ -1097,7 +1097,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state)
>  		else if (funcs->dpms)
>  			funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
>  
> -		if (!(dev->irq_enabled && dev->num_crtcs))
> +		if (!drm_dev_has_vblank(dev))
>  			continue;
>  
>  		ret = drm_crtc_vblank_get(crtc);
> diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> index 588be45abd7a..09d6e9e2e075 100644
> --- a/drivers/gpu/drm/drm_irq.c
> +++ b/drivers/gpu/drm/drm_irq.c
> @@ -181,7 +181,7 @@ int drm_irq_uninstall(struct drm_device *dev)
>  	 * vblank/irq handling. KMS drivers must ensure that vblanks are all
>  	 * disabled when uninstalling the irq handler.
>  	 */
> -	if (dev->num_crtcs) {
> +	if (drm_dev_has_vblank(dev)) {
>  		spin_lock_irqsave(&dev->vbl_lock, irqflags);
>  		for (i = 0; i < dev->num_crtcs; i++) {
>  			struct drm_vblank_crtc *vblank = &dev->vblank[i];
> diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
> index e278d6407f8e..162d9f7e692a 100644
> --- a/drivers/gpu/drm/drm_vblank.c
> +++ b/drivers/gpu/drm/drm_vblank.c
> @@ -605,7 +605,7 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc,
>  	int linedur_ns = 0, framedur_ns = 0;
>  	int dotclock = mode->crtc_clock;
>  
> -	if (!dev->num_crtcs)
> +	if (!drm_dev_has_vblank(dev))
>  		return;
>  
>  	if (WARN_ON(pipe >= dev->num_crtcs))
> @@ -1065,7 +1065,7 @@ void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
>  	unsigned int pipe = drm_crtc_index(crtc);
>  	ktime_t now;
>  
> -	if (dev->num_crtcs > 0) {
> +	if (drm_dev_has_vblank(dev)) {
>  		seq = drm_vblank_count_and_time(dev, pipe, &now);
>  	} else {
>  		seq = 0;
> @@ -1137,7 +1137,7 @@ static int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
>  	unsigned long irqflags;
>  	int ret = 0;
>  
> -	if (!dev->num_crtcs)
> +	if (!drm_dev_has_vblank(dev))
>  		return -EINVAL;
>  
>  	if (WARN_ON(pipe >= dev->num_crtcs))
> @@ -1506,7 +1506,7 @@ static void drm_legacy_vblank_pre_modeset(struct drm_device *dev,
>  	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
>  
>  	/* vblank is not initialized (IRQ not installed ?), or has been freed */
> -	if (!dev->num_crtcs)
> +	if (!drm_dev_has_vblank(dev))
>  		return;
>  
>  	if (WARN_ON(pipe >= dev->num_crtcs))
> @@ -1533,7 +1533,7 @@ static void drm_legacy_vblank_post_modeset(struct drm_device *dev,
>  	unsigned long irqflags;
>  
>  	/* vblank is not initialized (IRQ not installed ?), or has been freed */
> -	if (!dev->num_crtcs)
> +	if (!drm_dev_has_vblank(dev))
>  		return;
>  
>  	if (WARN_ON(pipe >= dev->num_crtcs))
> @@ -1558,7 +1558,7 @@ int drm_legacy_modeset_ctl_ioctl(struct drm_device *dev, void *data,
>  	unsigned int pipe;
>  
>  	/* If drm_vblank_init() hasn't been called yet, just no-op */
> -	if (!dev->num_crtcs)
> +	if (!drm_dev_has_vblank(dev))
>  		return 0;
>  
>  	/* KMS drivers handle this internally */
> @@ -1896,7 +1896,7 @@ bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe)
>  	unsigned long irqflags;
>  	bool disable_irq, fence_cookie;
>  
> -	if (WARN_ON_ONCE(!dev->num_crtcs))
> +	if (WARN_ON_ONCE(!drm_dev_has_vblank(dev)))
>  		return false;
>  
>  	if (WARN_ON(pipe >= dev->num_crtcs))
> -- 
> 2.26.2
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] drm: use drm_dev_has_vblank more
  2020-05-27 12:02 ` Thomas Zimmermann
@ 2020-05-29 11:39   ` Daniel Vetter
  0 siblings, 0 replies; 4+ messages in thread
From: Daniel Vetter @ 2020-05-29 11:39 UTC (permalink / raw)
  To: Thomas Zimmermann
  Cc: David Airlie, Daniel Vetter, Intel Graphics Development,
	DRI Development, Daniel Vetter

On Wed, May 27, 2020 at 02:02:12PM +0200, Thomas Zimmermann wrote:
> 
> Am 27.05.20 um 13:11 schrieb Daniel Vetter:
> > For historical reasons it's called dev->num_crtcs, which is rather
> > confusing ever since kms was added. But now we have a nice helper, so
> > let's use it for better readability!
> > 
> > Only code change is in atomic helpers: vblank support means that
> > dev->irq_enabled must be set too. Another one of these quirky things
> > ... But since it's implied we can simplify that check.
> > 
> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> > Cc: Maxime Ripard <mripard@kernel.org>
> > Cc: Thomas Zimmermann <tzimmermann@suse.de>
> > Cc: David Airlie <airlied@linux.ie>
> > Cc: Daniel Vetter <daniel@ffwll.ch>
> 
> Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de>

Thanks for your review, patch queued up.
-Daniel

> 
> > ---
> >  drivers/gpu/drm/drm_atomic_helper.c |  2 +-
> >  drivers/gpu/drm/drm_irq.c           |  2 +-
> >  drivers/gpu/drm/drm_vblank.c        | 14 +++++++-------
> >  3 files changed, 9 insertions(+), 9 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
> > index 0a541368246e..bfcc7857a9a1 100644
> > --- a/drivers/gpu/drm/drm_atomic_helper.c
> > +++ b/drivers/gpu/drm/drm_atomic_helper.c
> > @@ -1097,7 +1097,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state)
> >  		else if (funcs->dpms)
> >  			funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
> >  
> > -		if (!(dev->irq_enabled && dev->num_crtcs))
> > +		if (!drm_dev_has_vblank(dev))
> >  			continue;
> >  
> >  		ret = drm_crtc_vblank_get(crtc);
> > diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c
> > index 588be45abd7a..09d6e9e2e075 100644
> > --- a/drivers/gpu/drm/drm_irq.c
> > +++ b/drivers/gpu/drm/drm_irq.c
> > @@ -181,7 +181,7 @@ int drm_irq_uninstall(struct drm_device *dev)
> >  	 * vblank/irq handling. KMS drivers must ensure that vblanks are all
> >  	 * disabled when uninstalling the irq handler.
> >  	 */
> > -	if (dev->num_crtcs) {
> > +	if (drm_dev_has_vblank(dev)) {
> >  		spin_lock_irqsave(&dev->vbl_lock, irqflags);
> >  		for (i = 0; i < dev->num_crtcs; i++) {
> >  			struct drm_vblank_crtc *vblank = &dev->vblank[i];
> > diff --git a/drivers/gpu/drm/drm_vblank.c b/drivers/gpu/drm/drm_vblank.c
> > index e278d6407f8e..162d9f7e692a 100644
> > --- a/drivers/gpu/drm/drm_vblank.c
> > +++ b/drivers/gpu/drm/drm_vblank.c
> > @@ -605,7 +605,7 @@ void drm_calc_timestamping_constants(struct drm_crtc *crtc,
> >  	int linedur_ns = 0, framedur_ns = 0;
> >  	int dotclock = mode->crtc_clock;
> >  
> > -	if (!dev->num_crtcs)
> > +	if (!drm_dev_has_vblank(dev))
> >  		return;
> >  
> >  	if (WARN_ON(pipe >= dev->num_crtcs))
> > @@ -1065,7 +1065,7 @@ void drm_crtc_send_vblank_event(struct drm_crtc *crtc,
> >  	unsigned int pipe = drm_crtc_index(crtc);
> >  	ktime_t now;
> >  
> > -	if (dev->num_crtcs > 0) {
> > +	if (drm_dev_has_vblank(dev)) {
> >  		seq = drm_vblank_count_and_time(dev, pipe, &now);
> >  	} else {
> >  		seq = 0;
> > @@ -1137,7 +1137,7 @@ static int drm_vblank_get(struct drm_device *dev, unsigned int pipe)
> >  	unsigned long irqflags;
> >  	int ret = 0;
> >  
> > -	if (!dev->num_crtcs)
> > +	if (!drm_dev_has_vblank(dev))
> >  		return -EINVAL;
> >  
> >  	if (WARN_ON(pipe >= dev->num_crtcs))
> > @@ -1506,7 +1506,7 @@ static void drm_legacy_vblank_pre_modeset(struct drm_device *dev,
> >  	struct drm_vblank_crtc *vblank = &dev->vblank[pipe];
> >  
> >  	/* vblank is not initialized (IRQ not installed ?), or has been freed */
> > -	if (!dev->num_crtcs)
> > +	if (!drm_dev_has_vblank(dev))
> >  		return;
> >  
> >  	if (WARN_ON(pipe >= dev->num_crtcs))
> > @@ -1533,7 +1533,7 @@ static void drm_legacy_vblank_post_modeset(struct drm_device *dev,
> >  	unsigned long irqflags;
> >  
> >  	/* vblank is not initialized (IRQ not installed ?), or has been freed */
> > -	if (!dev->num_crtcs)
> > +	if (!drm_dev_has_vblank(dev))
> >  		return;
> >  
> >  	if (WARN_ON(pipe >= dev->num_crtcs))
> > @@ -1558,7 +1558,7 @@ int drm_legacy_modeset_ctl_ioctl(struct drm_device *dev, void *data,
> >  	unsigned int pipe;
> >  
> >  	/* If drm_vblank_init() hasn't been called yet, just no-op */
> > -	if (!dev->num_crtcs)
> > +	if (!drm_dev_has_vblank(dev))
> >  		return 0;
> >  
> >  	/* KMS drivers handle this internally */
> > @@ -1896,7 +1896,7 @@ bool drm_handle_vblank(struct drm_device *dev, unsigned int pipe)
> >  	unsigned long irqflags;
> >  	bool disable_irq, fence_cookie;
> >  
> > -	if (WARN_ON_ONCE(!dev->num_crtcs))
> > +	if (WARN_ON_ONCE(!drm_dev_has_vblank(dev)))
> >  		return false;
> >  
> >  	if (WARN_ON(pipe >= dev->num_crtcs))
> > 
> 
> -- 
> Thomas Zimmermann
> Graphics Driver Developer
> SUSE Software Solutions Germany GmbH
> Maxfeldstr. 5, 90409 Nürnberg, Germany
> (HRB 36809, AG Nürnberg)
> Geschäftsführer: Felix Imendörffer
> 




-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-05-29 11:44 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-27 11:11 [PATCH] drm: use drm_dev_has_vblank more Daniel Vetter
2020-05-27 12:02 ` Thomas Zimmermann
2020-05-29 11:39   ` Daniel Vetter
2020-05-27 17:44 ` Sam Ravnborg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).