diff options
Diffstat (limited to 'drivers/gpu/drm/imx')
| -rw-r--r-- | drivers/gpu/drm/imx/dcss/dcss-drv.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/imx/imx-drm-core.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/imx/parallel-display.c | 8 | 
3 files changed, 5 insertions, 9 deletions
| diff --git a/drivers/gpu/drm/imx/dcss/dcss-drv.c b/drivers/gpu/drm/imx/dcss/dcss-drv.c index 8dc2f85c514b..24147ee7080e 100644 --- a/drivers/gpu/drm/imx/dcss/dcss-drv.c +++ b/drivers/gpu/drm/imx/dcss/dcss-drv.c @@ -6,6 +6,7 @@  #include <linux/module.h>  #include <linux/kernel.h>  #include <linux/platform_device.h> +#include <drm/drm_module.h>  #include <drm/drm_of.h>  #include "dcss-dev.h" @@ -131,7 +132,7 @@ static struct platform_driver dcss_platform_driver = {  	},  }; -module_platform_driver(dcss_platform_driver); +drm_module_platform_driver(dcss_platform_driver);  MODULE_AUTHOR("Laurentiu Palcu <laurentiu.palcu@nxp.com>");  MODULE_DESCRIPTION("DCSS driver for i.MX8MQ"); diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c index cb685fe2039b..a57812ec36b1 100644 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@ -341,6 +341,9 @@ static struct platform_driver * const drivers[] = {  static int __init imx_drm_init(void)  { +	if (drm_firmware_drivers_only()) +		return -ENODEV; +  	return platform_register_drivers(drivers, ARRAY_SIZE(drivers));  }  module_init(imx_drm_init); diff --git a/drivers/gpu/drm/imx/parallel-display.c b/drivers/gpu/drm/imx/parallel-display.c index a8aba0141ce7..06cb1a59b9bc 100644 --- a/drivers/gpu/drm/imx/parallel-display.c +++ b/drivers/gpu/drm/imx/parallel-display.c @@ -217,14 +217,6 @@ static int imx_pd_bridge_atomic_check(struct drm_bridge *bridge,  	if (!imx_pd_format_supported(bus_fmt))  		return -EINVAL; -	if (bus_flags & -	    ~(DRM_BUS_FLAG_DE_LOW | DRM_BUS_FLAG_DE_HIGH | -	      DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE | -	      DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE)) { -		dev_warn(imxpd->dev, "invalid bus_flags (%x)\n", bus_flags); -		return -EINVAL; -	} -  	bridge_state->output_bus_cfg.flags = bus_flags;  	bridge_state->input_bus_cfg.flags = bus_flags;  	imx_crtc_state->bus_flags = bus_flags; | 
