Commit 70a59dd8 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/<drivers>: Constify struct drm_driver 



Only the following drivers aren't converted:
- amdgpu, because of the driver_feature mangling due to virt support.
  Subsequent patch will address this.
- nouveau, because DRIVER_ATOMIC uapi is still not the default on the
  platforms where it's supported (i.e. again driver_feature mangling)
- vc4, again because of driver_feature mangling
- qxl, because the ioctl table is somewhere else and moving that is
  maybe a bit too much, hence the num_ioctls assignment prevents a
  const driver structure.
- arcpgu, because that is stuck behind a pending tiny-fication series
  from me.
- legacy drivers, because legacy requires non-const drm_driver.

Note that for armada I also went ahead and made the ioctl array const.

Only cc'ing the driver people who've not been converted (everyone else
is way too much).

v2: Fix one misplaced const static, should be static const (0day)

v3:
- Improve commit message (Sam)

Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: kernel test robot <lkp@intel.com>
Acked-by: default avatarMaxime Ripard <mripard@kernel.org>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Dave Airlie <airlied@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: virtualization@lists.linux-foundation.org
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Leo Li <sunpeng.li@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Cc: Christian König <christian.koenig@amd.com>
Cc: Eric Anholt <eric@anholt.net>
Cc: Maxime Ripard <mripard@kernel.org>
Cc: Ben Skeggs <bskeggs@redhat.com>
Cc: nouveau@lists.freedesktop.org
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201104100425.1922351-5-daniel.vetter@ffwll.ch
parent 8f5c7aa0

drivers/gpu/drm/arm/display/komeda/komeda_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static irqreturn_t komeda_kms_irq_handler(int irq, void *data) 
	return status;

}



static struct drm_driver komeda_kms_driver = {

static const struct drm_driver komeda_kms_driver = {

	.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,

	.lastclose			= drm_fb_helper_lastclose,

	DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(komeda_gem_cma_dumb_create),

drivers/gpu/drm/arm/hdlcd_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ static void hdlcd_debugfs_init(struct drm_minor *minor) 


DEFINE_DRM_GEM_CMA_FOPS(fops);



static struct drm_driver hdlcd_driver = {

static const struct drm_driver hdlcd_driver = {

	.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,

	.irq_handler = hdlcd_irq,

	.irq_preinstall = hdlcd_irq_preinstall,

drivers/gpu/drm/arm/malidp_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static void malidp_debugfs_init(struct drm_minor *minor) 


#endif //CONFIG_DEBUG_FS



static struct drm_driver malidp_driver = {

static const struct drm_driver malidp_driver = {

	.driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,

	DRM_GEM_CMA_DRIVER_OPS_WITH_DUMB_CREATE(malidp_dumb_create),

#ifdef CONFIG_DEBUG_FS

drivers/gpu/drm/armada/armada_drv.c

+3 −4
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <drm/armada_drm.h>

#include "armada_ioctlP.h"



static struct drm_ioctl_desc armada_ioctls[] = {

static const struct drm_ioctl_desc armada_ioctls[] = {

	DRM_IOCTL_DEF_DRV(ARMADA_GEM_CREATE, armada_gem_create_ioctl,0),

	DRM_IOCTL_DEF_DRV(ARMADA_GEM_MMAP, armada_gem_mmap_ioctl, 0),

	DRM_IOCTL_DEF_DRV(ARMADA_GEM_PWRITE, armada_gem_pwrite_ioctl, 0),
@@ -35,7 +35,7 @@ static struct drm_ioctl_desc armada_ioctls[] = { 


DEFINE_DRM_GEM_FOPS(armada_drm_fops);



static struct drm_driver armada_drm_driver = {

static const struct drm_driver armada_drm_driver = {

	.lastclose		= drm_fb_helper_lastclose,

	.prime_handle_to_fd	= drm_gem_prime_handle_to_fd,

	.prime_fd_to_handle	= drm_gem_prime_fd_to_handle,
@@ -48,6 +48,7 @@ static struct drm_driver armada_drm_driver = { 
	.date			= "20120730",

	.driver_features	= DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,

	.ioctls			= armada_ioctls,

	.num_ioctls = ARRAY_SIZE(armada_ioctls),

	.fops			= &armada_drm_fops,

};
@@ -275,8 +276,6 @@ static int __init armada_drm_init(void) 
{

	int ret;



	armada_drm_driver.num_ioctls = ARRAY_SIZE(armada_ioctls);



	ret = platform_driver_register(&armada_lcd_platform_driver);

	if (ret)

		return ret;

drivers/gpu/drm/aspeed/aspeed_gfx_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static void aspeed_gfx_unload(struct drm_device *drm) 


DEFINE_DRM_GEM_CMA_FOPS(fops);



static struct drm_driver aspeed_gfx_driver = {

static const struct drm_driver aspeed_gfx_driver = {

	.driver_features        = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC,

	DRM_GEM_CMA_DRIVER_OPS,

	.fops = &fops,

CRA Git | Maintained and supported by SUSTech CRA and CCSE