drm/omap: venc: Remove omap_dss_device operations (96b0a34d) · Commits · 戴 / test

drivers/gpu/drm/omapdrm/dss/venc.c

+0 −45

Original line number	Diff line number	Diff line
		@@ -306,7 +306,6 @@ struct venc_device {
		struct drm_bridge bridge;
		};

		#define dssdev_to_venc(dssdev) container_of(dssdev, struct venc_device, output)
		#define drm_bridge_to_venc(b) container_of(b, struct venc_device, bridge)

		static inline void venc_write_reg(struct venc_device *venc, int idx, u32 val)
		@@ -479,30 +478,6 @@ static void venc_power_off(struct venc_device *venc)
		venc_runtime_put(venc);
		}

		static int venc_get_modes(struct omap_dss_device *dssdev,
		struct drm_connector *connector)
		{
		static const struct drm_display_mode *modes[] = {
		&omap_dss_pal_mode,
		&omap_dss_ntsc_mode,
		};
		unsigned int i;

		for (i = 0; i < ARRAY_SIZE(modes); ++i) {
		struct drm_display_mode *mode;

		mode = drm_mode_duplicate(connector->dev, modes[i]);
		if (!mode)
		return i;

		mode->type = DRM_MODE_TYPE_DRIVER \| DRM_MODE_TYPE_PREFERRED;
		drm_mode_set_name(mode);
		drm_mode_probed_add(connector, mode);
		}

		return ARRAY_SIZE(modes);
		}

		static enum venc_videomode venc_get_videomode(const struct drm_display_mode *mode)
		{
		if (!(mode->flags & DRM_MODE_FLAG_INTERLACE))
		@@ -598,25 +573,6 @@ static int venc_get_clocks(struct venc_device *venc)
		return 0;
		}

		static int venc_connect(struct omap_dss_device *src,
		struct omap_dss_device *dst)
		{
		return omapdss_device_connect(dst->dss, dst, dst->next);
		}

		static void venc_disconnect(struct omap_dss_device *src,
		struct omap_dss_device *dst)
		{
		omapdss_device_disconnect(dst, dst->next);
		}

		static const struct omap_dss_device_ops venc_ops = {
		.connect = venc_connect,
		.disconnect = venc_disconnect,

		.get_modes = venc_get_modes,
		};

		/* -----------------------------------------------------------------------------
		* DRM Bridge Operations
		*/
		@@ -816,7 +772,6 @@ static int venc_init_output(struct venc_device *venc)
		out->type = OMAP_DISPLAY_TYPE_VENC;
		out->name = "venc.0";
		out->dispc_channel = OMAP_DSS_CHANNEL_DIGIT;
		out->ops = &venc_ops;
		out->owner = THIS_MODULE;
		out->of_port = 0;
		out->ops_flags = OMAP_DSS_DEVICE_OP_MODES;

Admin message