drm/omap: venc: Fixup video mode in .check_timings() operation (a730ce99) · Commits · 戴 / test

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

+8 −15

Original line number	Diff line number	Diff line
		@@ -452,7 +452,7 @@ static void venc_runtime_put(struct venc_device *venc)
		WARN_ON(r < 0 && r != -ENOSYS);
		}

		static const struct venc_config venc_timings_to_config(struct videomode vm)
		static const struct venc_config venc_timings_to_config(const struct videomode vm)
		{
		switch (venc_get_videomode(vm)) {
		default:
		@@ -582,28 +582,16 @@ static void venc_set_timings(struct omap_dss_device *dssdev,
		const struct videomode *vm)
		{
		struct venc_device *venc = dssdev_to_venc(dssdev);
		struct videomode actual_vm;

		DSSDBG("venc_set_timings\n");

		mutex_lock(&venc->venc_lock);

		switch (venc_get_videomode(vm)) {
		default:
		WARN_ON_ONCE(1);
		case VENC_MODE_PAL:
		actual_vm = omap_dss_pal_vm;
		break;
		case VENC_MODE_NTSC:
		actual_vm = omap_dss_ntsc_vm;
		break;
		}

		/* Reset WSS data when the TV standard changes. */
		if (memcmp(&venc->vm, &actual_vm, sizeof(actual_vm)))
		if (memcmp(&venc->vm, vm, sizeof(*vm)))
		venc->wss_data = 0;

		venc->vm = actual_vm;
		venc->vm = *vm;

		dispc_set_tv_pclk(venc->dss->dispc, 13500000);

		@@ -617,8 +605,13 @@ static int venc_check_timings(struct omap_dss_device *dssdev,

		switch (venc_get_videomode(vm)) {
		case VENC_MODE_PAL:
		*vm = omap_dss_pal_vm;
		return 0;

		case VENC_MODE_NTSC:
		*vm = omap_dss_ntsc_vm;
		return 0;

		default:
		return -EINVAL;
		}