From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, Thomas Zimmermann <tzimmermann@suse.de>, Daniel Vetter <daniel.vetter@intel.com> Subject: [PATCH 4/5] drm: Allow const struct drm_driver Date: Fri, 23 Oct 2020 14:28:10 +0200 [thread overview] Message-ID: <20201023122811.2374118-4-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20201023122811.2374118-1-daniel.vetter@ffwll.ch> It's nice if a big function/ioctl table like this is const. Only downside here is that we need a few more #ifdef to paper over the differences when CONFIG_DRM_LEGACY is enabled. Maybe provides more motivation to sunset that horror show :-) 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> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/drm_drv.c | 15 ++++++++++----- include/drm/drm_device.h | 4 ++++ include/drm/drm_drv.h | 5 +++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 457ac0f82be2..94d2c41115b8 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -574,7 +574,7 @@ static void drm_dev_init_release(struct drm_device *dev, void *res) } static int drm_dev_init(struct drm_device *dev, - struct drm_driver *driver, + const struct drm_driver *driver, struct device *parent) { int ret; @@ -589,7 +589,11 @@ static int drm_dev_init(struct drm_device *dev, kref_init(&dev->ref); dev->dev = get_device(parent); +#ifdef CONFIG_DRM_LEGACY + dev->driver = (struct drm_driver *) driver; +#else dev->driver = driver; +#endif INIT_LIST_HEAD(&dev->managed.resources); spin_lock_init(&dev->managed.lock); @@ -663,7 +667,7 @@ static void devm_drm_dev_init_release(void *data) static int devm_drm_dev_init(struct device *parent, struct drm_device *dev, - struct drm_driver *driver) + const struct drm_driver *driver) { int ret; @@ -678,7 +682,8 @@ static int devm_drm_dev_init(struct device *parent, return ret; } -void *__devm_drm_dev_alloc(struct device *parent, struct drm_driver *driver, +void *__devm_drm_dev_alloc(struct device *parent, + const struct drm_driver *driver, size_t size, size_t offset) { void *container; @@ -713,7 +718,7 @@ EXPORT_SYMBOL(__devm_drm_dev_alloc); * RETURNS: * Pointer to new DRM device, or ERR_PTR on failure. */ -struct drm_device *drm_dev_alloc(struct drm_driver *driver, +struct drm_device *drm_dev_alloc(const struct drm_driver *driver, struct device *parent) { struct drm_device *dev; @@ -858,7 +863,7 @@ static void remove_compat_control_link(struct drm_device *dev) */ int drm_dev_register(struct drm_device *dev, unsigned long flags) { - struct drm_driver *driver = dev->driver; + const struct drm_driver *driver = dev->driver; int ret; if (!driver->load) diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h index f4f68e7a9149..2c361964aee7 100644 --- a/include/drm/drm_device.h +++ b/include/drm/drm_device.h @@ -83,7 +83,11 @@ struct drm_device { } managed; /** @driver: DRM driver managing the device */ +#ifdef CONFIG_DRM_LEGACY struct drm_driver *driver; +#else + const struct drm_driver *driver; +#endif /** * @dev_private: diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index 7af220226a25..cc9da43b6eda 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -516,7 +516,8 @@ struct drm_driver { #endif }; -void *__devm_drm_dev_alloc(struct device *parent, struct drm_driver *driver, +void *__devm_drm_dev_alloc(struct device *parent, + const struct drm_driver *driver, size_t size, size_t offset); /** @@ -549,7 +550,7 @@ void *__devm_drm_dev_alloc(struct device *parent, struct drm_driver *driver, ((type *) __devm_drm_dev_alloc(parent, driver, sizeof(type), \ offsetof(type, member))) -struct drm_device *drm_dev_alloc(struct drm_driver *driver, +struct drm_device *drm_dev_alloc(const struct drm_driver *driver, struct device *parent); int drm_dev_register(struct drm_device *dev, unsigned long flags); void drm_dev_unregister(struct drm_device *dev); -- 2.28.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel.vetter@ffwll.ch> To: DRI Development <dri-devel@lists.freedesktop.org> Cc: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel.vetter@ffwll.ch>, Intel Graphics Development <intel-gfx@lists.freedesktop.org>, Maxime Ripard <mripard@kernel.org>, Thomas Zimmermann <tzimmermann@suse.de>, Daniel Vetter <daniel.vetter@intel.com> Subject: [Intel-gfx] [PATCH 4/5] drm: Allow const struct drm_driver Date: Fri, 23 Oct 2020 14:28:10 +0200 [thread overview] Message-ID: <20201023122811.2374118-4-daniel.vetter@ffwll.ch> (raw) In-Reply-To: <20201023122811.2374118-1-daniel.vetter@ffwll.ch> It's nice if a big function/ioctl table like this is const. Only downside here is that we need a few more #ifdef to paper over the differences when CONFIG_DRM_LEGACY is enabled. Maybe provides more motivation to sunset that horror show :-) 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> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- drivers/gpu/drm/drm_drv.c | 15 ++++++++++----- include/drm/drm_device.h | 4 ++++ include/drm/drm_drv.h | 5 +++-- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 457ac0f82be2..94d2c41115b8 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -574,7 +574,7 @@ static void drm_dev_init_release(struct drm_device *dev, void *res) } static int drm_dev_init(struct drm_device *dev, - struct drm_driver *driver, + const struct drm_driver *driver, struct device *parent) { int ret; @@ -589,7 +589,11 @@ static int drm_dev_init(struct drm_device *dev, kref_init(&dev->ref); dev->dev = get_device(parent); +#ifdef CONFIG_DRM_LEGACY + dev->driver = (struct drm_driver *) driver; +#else dev->driver = driver; +#endif INIT_LIST_HEAD(&dev->managed.resources); spin_lock_init(&dev->managed.lock); @@ -663,7 +667,7 @@ static void devm_drm_dev_init_release(void *data) static int devm_drm_dev_init(struct device *parent, struct drm_device *dev, - struct drm_driver *driver) + const struct drm_driver *driver) { int ret; @@ -678,7 +682,8 @@ static int devm_drm_dev_init(struct device *parent, return ret; } -void *__devm_drm_dev_alloc(struct device *parent, struct drm_driver *driver, +void *__devm_drm_dev_alloc(struct device *parent, + const struct drm_driver *driver, size_t size, size_t offset) { void *container; @@ -713,7 +718,7 @@ EXPORT_SYMBOL(__devm_drm_dev_alloc); * RETURNS: * Pointer to new DRM device, or ERR_PTR on failure. */ -struct drm_device *drm_dev_alloc(struct drm_driver *driver, +struct drm_device *drm_dev_alloc(const struct drm_driver *driver, struct device *parent) { struct drm_device *dev; @@ -858,7 +863,7 @@ static void remove_compat_control_link(struct drm_device *dev) */ int drm_dev_register(struct drm_device *dev, unsigned long flags) { - struct drm_driver *driver = dev->driver; + const struct drm_driver *driver = dev->driver; int ret; if (!driver->load) diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h index f4f68e7a9149..2c361964aee7 100644 --- a/include/drm/drm_device.h +++ b/include/drm/drm_device.h @@ -83,7 +83,11 @@ struct drm_device { } managed; /** @driver: DRM driver managing the device */ +#ifdef CONFIG_DRM_LEGACY struct drm_driver *driver; +#else + const struct drm_driver *driver; +#endif /** * @dev_private: diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index 7af220226a25..cc9da43b6eda 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -516,7 +516,8 @@ struct drm_driver { #endif }; -void *__devm_drm_dev_alloc(struct device *parent, struct drm_driver *driver, +void *__devm_drm_dev_alloc(struct device *parent, + const struct drm_driver *driver, size_t size, size_t offset); /** @@ -549,7 +550,7 @@ void *__devm_drm_dev_alloc(struct device *parent, struct drm_driver *driver, ((type *) __devm_drm_dev_alloc(parent, driver, sizeof(type), \ offsetof(type, member))) -struct drm_device *drm_dev_alloc(struct drm_driver *driver, +struct drm_device *drm_dev_alloc(const struct drm_driver *driver, struct device *parent); int drm_dev_register(struct drm_device *dev, unsigned long flags); void drm_dev_unregister(struct drm_device *dev); -- 2.28.0 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2020-10-23 12:28 UTC|newest] Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-10-23 12:28 [PATCH 1/5] drm/radeon: Stop changing the drm_driver struct Daniel Vetter 2020-10-23 12:28 ` Daniel Vetter 2020-10-23 12:28 ` [Intel-gfx] " Daniel Vetter 2020-10-23 12:28 ` [PATCH 2/5] drm: Compile out legacy chunks from struct drm_device Daniel Vetter 2020-10-23 12:28 ` [Intel-gfx] " Daniel Vetter 2020-10-23 15:10 ` Maxime Ripard 2020-10-23 15:10 ` [Intel-gfx] " Maxime Ripard 2020-10-25 22:08 ` Sam Ravnborg 2020-10-25 22:08 ` [Intel-gfx] " Sam Ravnborg 2020-10-26 8:37 ` Thomas Zimmermann 2020-10-26 8:37 ` [Intel-gfx] " Thomas Zimmermann 2020-10-26 9:17 ` Daniel Vetter 2020-10-26 9:17 ` [Intel-gfx] " Daniel Vetter 2020-10-23 12:28 ` [PATCH 3/5] drm/amdgpu: Paper over the drm_driver mangling for virt Daniel Vetter 2020-10-23 12:28 ` [Intel-gfx] " Daniel Vetter 2020-10-23 12:28 ` Daniel Vetter [this message] 2020-10-23 12:28 ` [Intel-gfx] [PATCH 4/5] drm: Allow const struct drm_driver Daniel Vetter 2020-10-23 15:11 ` Maxime Ripard 2020-10-23 15:11 ` [Intel-gfx] " Maxime Ripard 2020-10-25 21:44 ` Sam Ravnborg 2020-10-25 21:44 ` [Intel-gfx] " Sam Ravnborg 2020-10-26 8:40 ` Thomas Zimmermann 2020-10-26 8:40 ` [Intel-gfx] " Thomas Zimmermann 2020-10-23 12:28 ` [PATCH 5/5] drm/<drivers>: Constify " Daniel Vetter 2020-10-23 12:28 ` [Intel-gfx] " Daniel Vetter 2020-10-23 12:28 ` Daniel Vetter 2020-10-23 12:28 ` Daniel Vetter 2020-10-23 15:13 ` Maxime Ripard 2020-10-23 15:13 ` [Intel-gfx] " Maxime Ripard 2020-10-23 15:13 ` Maxime Ripard 2020-10-23 15:22 ` kernel test robot 2020-10-23 15:22 ` [Intel-gfx] " kernel test robot 2020-10-23 15:22 ` kernel test robot 2020-10-23 15:22 ` kernel test robot 2020-10-23 15:22 ` kernel test robot [not found] ` <20201023122811.2374118-5-daniel.vetter-/w4YWyX8dFk@public.gmane.org> 2020-10-23 16:04 ` [PATCH] " Daniel Vetter 2020-10-23 16:04 ` [Intel-gfx] " Daniel Vetter 2020-10-23 16:04 ` Daniel Vetter 2020-10-23 16:04 ` Daniel Vetter [not found] ` <20201023160444.2465340-1-daniel.vetter-/w4YWyX8dFk@public.gmane.org> 2020-10-25 22:23 ` Sam Ravnborg 2020-10-25 22:23 ` [Intel-gfx] " Sam Ravnborg 2020-10-25 22:23 ` Sam Ravnborg 2020-10-25 22:23 ` Sam Ravnborg [not found] ` <20201025222303.GC13779-uyr5N9Q2VtJg9hUCZPvPmw@public.gmane.org> 2020-10-25 23:04 ` Daniel Vetter 2020-10-25 23:04 ` [Intel-gfx] " Daniel Vetter 2020-10-25 23:04 ` Daniel Vetter 2020-10-25 23:04 ` Daniel Vetter 2020-10-26 8:43 ` [PATCH 5/5] " Thomas Zimmermann 2020-10-26 8:43 ` [Intel-gfx] " Thomas Zimmermann 2020-10-26 8:43 ` Thomas Zimmermann 2020-10-26 8:43 ` Thomas Zimmermann 2020-10-26 9:14 ` Daniel Vetter 2020-10-26 9:14 ` [Intel-gfx] " Daniel Vetter 2020-10-26 9:14 ` Daniel Vetter 2020-10-26 9:14 ` Daniel Vetter 2020-10-23 13:39 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/5] drm/radeon: Stop changing the drm_driver struct Patchwork 2020-10-23 13:42 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2020-10-23 14:05 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2020-10-23 16:32 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/5] drm/radeon: Stop changing the drm_driver struct (rev2) Patchwork 2020-10-23 16:34 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork 2020-10-23 16:57 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork 2020-10-23 17:11 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for series starting with [1/5] drm/radeon: Stop changing the drm_driver struct Patchwork 2020-10-23 20:37 ` [Intel-gfx] ✓ Fi.CI.IGT: success for series starting with [1/5] drm/radeon: Stop changing the drm_driver struct (rev2) Patchwork 2020-10-30 10:11 [PATCH 1/5] drm/radeon: Stop changing the drm_driver struct Daniel Vetter 2020-10-30 10:11 ` [PATCH 4/5] drm: Allow const struct drm_driver Daniel Vetter 2020-10-30 18:53 ` Alex Deucher
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201023122811.2374118-4-daniel.vetter@ffwll.ch \ --to=daniel.vetter@ffwll.ch \ --cc=airlied@linux.ie \ --cc=daniel.vetter@intel.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=intel-gfx@lists.freedesktop.org \ --cc=tzimmermann@suse.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.