| Message ID | 20230209135509.7786-11-tzimmermann@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | drm,fbdev: Move video= option to drivers/video | expand |
Thomas Zimmermann <tzimmermann@suse.de> writes: > Include <video/cmdline.h> in drm_connector.c to get video_get_options() > and avoid the dependency on <linux/fb.h>. The replaced function > fb_get_options() is just a tiny wrapper around video_get_opions(). No > functional changes. > > Include <linux/property.h> to get fwnode_handle_put(), which had been > provided via <linux/fb.h>. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > --- Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Best regards, Javier
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index 9d0250c28e9b..ca5fb54b7aab 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -33,9 +33,11 @@ #include <drm/drm_sysfs.h> #include <drm/drm_utils.h> -#include <linux/fb.h> +#include <linux/property.h> #include <linux/uaccess.h> +#include <video/cmdline.h> + #include "drm_crtc_internal.h" #include "drm_internal.h" @@ -154,9 +156,10 @@ EXPORT_SYMBOL(drm_get_connector_type_name); static void drm_connector_get_cmdline_mode(struct drm_connector *connector) { struct drm_cmdline_mode *mode = &connector->cmdline_mode; - char *option = NULL; + const char *option; - if (fb_get_options(connector->name, &option)) + option = video_get_options(connector->name); + if (!option) return; if (!drm_mode_parse_command_line_for_connector(option,
Include <video/cmdline.h> in drm_connector.c to get video_get_options() and avoid the dependency on <linux/fb.h>. The replaced function fb_get_options() is just a tiny wrapper around video_get_opions(). No functional changes. Include <linux/property.h> to get fwnode_handle_put(), which had been provided via <linux/fb.h>. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> --- drivers/gpu/drm/drm_connector.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)