* [PATCH] drm: Consider drivers setting DRIVER_ATOMIC as atomic.
@ 2018-06-21 19:54 Eric Anholt
2018-06-22 8:29 ` Daniel Vetter
0 siblings, 1 reply; 2+ messages in thread
From: Eric Anholt @ 2018-06-21 19:54 UTC (permalink / raw)
To: dri-devel; +Cc: linux-kernel, Eric Anholt
Drivers such as vc4 don't initialize mode_config.funcs until later in
initialization, but we know they're atomic since they've got the flag
set. This avoids oopsing on dereferencing funcs in the new atomic
methods sanity checks.
I moved the atomic check function down below the core flag check, to
avoid needing a prototype.
Signed-off-by: Eric Anholt <eric@anholt.net>
Fixes: ba1f665f161c ("drm: Add checks for atomic_[duplicate/destroy]_state with atomic drivers")
---
include/drm/drmP.h | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index f5099c12c6a6..c5dfbdb7271d 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -97,6 +97,16 @@ struct pci_controller;
#define DRM_IF_VERSION(maj, min) (maj << 16 | min)
+#define DRM_SWITCH_POWER_ON 0
+#define DRM_SWITCH_POWER_OFF 1
+#define DRM_SWITCH_POWER_CHANGING 2
+#define DRM_SWITCH_POWER_DYNAMIC_OFF 3
+
+static inline bool drm_core_check_feature(struct drm_device *dev, int feature)
+{
+ return dev->driver->driver_features & feature;
+}
+
/**
* drm_drv_uses_atomic_modeset - check if the driver implements
* atomic_commit()
@@ -107,17 +117,8 @@ struct pci_controller;
*/
static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev)
{
- return dev->mode_config.funcs->atomic_commit != NULL;
-}
-
-#define DRM_SWITCH_POWER_ON 0
-#define DRM_SWITCH_POWER_OFF 1
-#define DRM_SWITCH_POWER_CHANGING 2
-#define DRM_SWITCH_POWER_DYNAMIC_OFF 3
-
-static inline bool drm_core_check_feature(struct drm_device *dev, int feature)
-{
- return dev->driver->driver_features & feature;
+ return drm_core_check_feature(dev, DRIVER_ATOMIC) ||
+ dev->mode_config.funcs->atomic_commit != NULL;
}
/* returns true if currently okay to sleep */
--
2.18.0.rc2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm: Consider drivers setting DRIVER_ATOMIC as atomic.
2018-06-21 19:54 [PATCH] drm: Consider drivers setting DRIVER_ATOMIC as atomic Eric Anholt
@ 2018-06-22 8:29 ` Daniel Vetter
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Vetter @ 2018-06-22 8:29 UTC (permalink / raw)
To: Eric Anholt; +Cc: dri-devel, linux-kernel
On Thu, Jun 21, 2018 at 12:54:28PM -0700, Eric Anholt wrote:
> Drivers such as vc4 don't initialize mode_config.funcs until later in
> initialization, but we know they're atomic since they've got the flag
> set. This avoids oopsing on dereferencing funcs in the new atomic
> methods sanity checks.
>
> I moved the atomic check function down below the core flag check, to
> avoid needing a prototype.
>
> Signed-off-by: Eric Anholt <eric@anholt.net>
> Fixes: ba1f665f161c ("drm: Add checks for atomic_[duplicate/destroy]_state with atomic drivers")
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
btw, dim fixes also generates Cc: tags for you (author/reviewer/maintainer
of the commit your fixing), besides just the Fixes: line.
-Daniel
> ---
> include/drm/drmP.h | 23 ++++++++++++-----------
> 1 file changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/include/drm/drmP.h b/include/drm/drmP.h
> index f5099c12c6a6..c5dfbdb7271d 100644
> --- a/include/drm/drmP.h
> +++ b/include/drm/drmP.h
> @@ -97,6 +97,16 @@ struct pci_controller;
>
> #define DRM_IF_VERSION(maj, min) (maj << 16 | min)
>
> +#define DRM_SWITCH_POWER_ON 0
> +#define DRM_SWITCH_POWER_OFF 1
> +#define DRM_SWITCH_POWER_CHANGING 2
> +#define DRM_SWITCH_POWER_DYNAMIC_OFF 3
> +
> +static inline bool drm_core_check_feature(struct drm_device *dev, int feature)
> +{
> + return dev->driver->driver_features & feature;
> +}
> +
> /**
> * drm_drv_uses_atomic_modeset - check if the driver implements
> * atomic_commit()
> @@ -107,17 +117,8 @@ struct pci_controller;
> */
> static inline bool drm_drv_uses_atomic_modeset(struct drm_device *dev)
> {
> - return dev->mode_config.funcs->atomic_commit != NULL;
> -}
> -
> -#define DRM_SWITCH_POWER_ON 0
> -#define DRM_SWITCH_POWER_OFF 1
> -#define DRM_SWITCH_POWER_CHANGING 2
> -#define DRM_SWITCH_POWER_DYNAMIC_OFF 3
> -
> -static inline bool drm_core_check_feature(struct drm_device *dev, int feature)
> -{
> - return dev->driver->driver_features & feature;
> + return drm_core_check_feature(dev, DRIVER_ATOMIC) ||
> + dev->mode_config.funcs->atomic_commit != NULL;
> }
>
> /* returns true if currently okay to sleep */
> --
> 2.18.0.rc2
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-06-22 8:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-06-21 19:54 [PATCH] drm: Consider drivers setting DRIVER_ATOMIC as atomic Eric Anholt
2018-06-22 8:29 ` Daniel Vetter
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).