Commit 9fda81e0 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/udl: Convert to struct drm_simple_display_pipe 



Udl has a single display pipeline with a primary plane; perfect for
simple-pipe helpers. Convert it over. The old encoder and CRTC code
becomes unused and obsolete.

Exported formats for the primary plane are RGB565 and XRGB8888, with
the latter being emulated. The 16-bit format is the default and what
is used when communicating with the device.

This patch enables atomic modesetting for udl devices.

v3:
	* remove unused field crtc from struct udl_device
	* set crtc_state->no_vblank at beginning of enable()
v2:
	* move suspend/resume changes into separate patch
	* remove non-atomic code

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarEmil Velikov <emil.l.velikov@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191210084905.5570-3-tzimmermann@suse.de
parent e829cf0b

drivers/gpu/drm/udl/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

udl-y := udl_drv.o udl_modeset.o udl_connector.o udl_encoder.o udl_main.o udl_fb.o udl_transfer.o udl_gem.o

udl-y := udl_drv.o udl_modeset.o udl_connector.o udl_main.o udl_fb.o udl_transfer.o udl_gem.o



obj-$(CONFIG_DRM_UDL) := udl.o

drivers/gpu/drm/udl/udl_connector.c

+4 −8
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com>

 */



#include <drm/drm_atomic_state_helper.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_probe_helper.h>
@@ -90,13 +91,6 @@ udl_detect(struct drm_connector *connector, bool force) 
	return connector_status_connected;

}



static int udl_connector_set_property(struct drm_connector *connector,

				      struct drm_property *property,

				      uint64_t val)

{

	return 0;

}



static void udl_connector_destroy(struct drm_connector *connector)

{

	struct udl_drm_connector *udl_connector =
@@ -116,10 +110,12 @@ static const struct drm_connector_helper_funcs udl_connector_helper_funcs = { 


static const struct drm_connector_funcs udl_connector_funcs = {

	.dpms = drm_helper_connector_dpms,

	.reset = drm_atomic_helper_connector_reset,

	.detect = udl_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.destroy = udl_connector_destroy,

	.set_property = udl_connector_set_property,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

	.atomic_destroy_state   = drm_atomic_helper_connector_destroy_state,

};



struct drm_connector *udl_connector_init(struct drm_device *dev)

drivers/gpu/drm/udl/udl_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ static void udl_driver_release(struct drm_device *dev) 
}



static struct drm_driver driver = {

	.driver_features = DRIVER_MODESET | DRIVER_GEM,

	.driver_features = DRIVER_ATOMIC | DRIVER_GEM | DRIVER_MODESET,

	.release = udl_driver_release,



	/* gem hooks */

drivers/gpu/drm/udl/udl_drv.h

+3 −4
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
#include <drm/drm_device.h>

#include <drm/drm_framebuffer.h>

#include <drm/drm_gem.h>

#include <drm/drm_simple_kms_helper.h>



struct drm_encoder;

struct drm_mode_create_dumb;



#define DRIVER_NAME		"udl"
@@ -51,7 +51,8 @@ struct udl_device { 
	struct drm_device drm;

	struct device *dev;

	struct usb_device *udev;

	struct drm_crtc *crtc;



	struct drm_simple_display_pipe display_pipe;



	/* active framebuffer on the 16-bit channel */

	const struct drm_framebuffer *active_fb_16;
@@ -75,8 +76,6 @@ void udl_modeset_restore(struct drm_device *dev); 
void udl_modeset_cleanup(struct drm_device *dev);

struct drm_connector *udl_connector_init(struct drm_device *dev);



struct drm_encoder *udl_encoder_init(struct drm_device *dev);



struct urb *udl_get_urb(struct drm_device *dev);



int udl_submit_urb(struct drm_device *dev, struct urb *urb, size_t len);

drivers/gpu/drm/udl/udl_encoder.c

deleted100644 → 0
+0 −70
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (C) 2012 Red Hat

 * based in parts on udlfb.c:

 * Copyright (C) 2009 Roberto De Ioris <roberto@unbit.it>

 * Copyright (C) 2009 Jaya Kumar <jayakumar.lkml@gmail.com>

 * Copyright (C) 2009 Bernie Thompson <bernie@plugable.com>

 */



#include <drm/drm_encoder.h>

#include <drm/drm_modeset_helper_vtables.h>



#include "udl_drv.h"



/* dummy encoder */

static void udl_enc_destroy(struct drm_encoder *encoder)

{

	drm_encoder_cleanup(encoder);

	kfree(encoder);

}



static void udl_encoder_disable(struct drm_encoder *encoder)

{

}



static void udl_encoder_prepare(struct drm_encoder *encoder)

{

}



static void udl_encoder_commit(struct drm_encoder *encoder)

{

}



static void udl_encoder_mode_set(struct drm_encoder *encoder,

				 struct drm_display_mode *mode,

				 struct drm_display_mode *adjusted_mode)

{

}



static void

udl_encoder_dpms(struct drm_encoder *encoder, int mode)

{

}



static const struct drm_encoder_helper_funcs udl_helper_funcs = {

	.dpms = udl_encoder_dpms,

	.prepare = udl_encoder_prepare,

	.mode_set = udl_encoder_mode_set,

	.commit = udl_encoder_commit,

	.disable = udl_encoder_disable,

};



static const struct drm_encoder_funcs udl_enc_funcs = {

	.destroy = udl_enc_destroy,

};



struct drm_encoder *udl_encoder_init(struct drm_device *dev)

{

	struct drm_encoder *encoder;



	encoder = kzalloc(sizeof(struct drm_encoder), GFP_KERNEL);

	if (!encoder)

		return NULL;



	drm_encoder_init(dev, encoder, &udl_enc_funcs, DRM_MODE_ENCODER_TMDS,

			 NULL);

	drm_encoder_helper_add(encoder, &udl_helper_funcs);

	encoder->possible_crtcs = 1;

	return encoder;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE