intel_dvo.c 14.6 KB
Newer Older
J
Jesse Barnes 已提交
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
/*
 * Copyright 2006 Dave Airlie <airlied@linux.ie>
 * Copyright © 2006-2007 Intel Corporation
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Software"),
 * to deal in the Software without restriction, including without limitation
 * the rights to use, copy, modify, merge, publish, distribute, sublicense,
 * and/or sell copies of the Software, and to permit persons to whom the
 * Software is furnished to do so, subject to the following conditions:
 *
 * The above copyright notice and this permission notice (including the next
 * paragraph) shall be included in all copies or substantial portions of the
 * Software.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
 * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 * DEALINGS IN THE SOFTWARE.
 *
 * Authors:
 *	Eric Anholt <eric@anholt.net>
 */
#include <linux/i2c.h>
28
#include <linux/slab.h>
J
Jesse Barnes 已提交
29 30 31 32 33 34 35 36 37 38 39
#include "drmP.h"
#include "drm.h"
#include "drm_crtc.h"
#include "intel_drv.h"
#include "i915_drm.h"
#include "i915_drv.h"
#include "dvo.h"

#define SIL164_ADDR	0x38
#define CH7xxx_ADDR	0x76
#define TFP410_ADDR	0x38
40
#define NS2501_ADDR     0x38
J
Jesse Barnes 已提交
41

C
Chris Wilson 已提交
42
static const struct intel_dvo_device intel_dvo_devices[] = {
J
Jesse Barnes 已提交
43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75
	{
		.type = INTEL_DVO_CHIP_TMDS,
		.name = "sil164",
		.dvo_reg = DVOC,
		.slave_addr = SIL164_ADDR,
		.dev_ops = &sil164_ops,
	},
	{
		.type = INTEL_DVO_CHIP_TMDS,
		.name = "ch7xxx",
		.dvo_reg = DVOC,
		.slave_addr = CH7xxx_ADDR,
		.dev_ops = &ch7xxx_ops,
	},
	{
		.type = INTEL_DVO_CHIP_LVDS,
		.name = "ivch",
		.dvo_reg = DVOA,
		.slave_addr = 0x02, /* Might also be 0x44, 0x84, 0xc4 */
		.dev_ops = &ivch_ops,
	},
	{
		.type = INTEL_DVO_CHIP_TMDS,
		.name = "tfp410",
		.dvo_reg = DVOC,
		.slave_addr = TFP410_ADDR,
		.dev_ops = &tfp410_ops,
	},
	{
		.type = INTEL_DVO_CHIP_LVDS,
		.name = "ch7017",
		.dvo_reg = DVOC,
		.slave_addr = 0x75,
76
		.gpio = GMBUS_PORT_DPB,
J
Jesse Barnes 已提交
77
		.dev_ops = &ch7017_ops,
78 79 80 81 82 83 84 85
	},
	{
	        .type = INTEL_DVO_CHIP_TMDS,
		.name = "ns2501",
		.dvo_reg = DVOC,
		.slave_addr = NS2501_ADDR,
		.dev_ops = &ns2501_ops,
       }
J
Jesse Barnes 已提交
86 87
};

C
Chris Wilson 已提交
88 89 90 91 92 93 94 95 96 97 98
struct intel_dvo {
	struct intel_encoder base;

	struct intel_dvo_device dev;

	struct drm_display_mode *panel_fixed_mode;
	bool panel_wants_dither;
};

static struct intel_dvo *enc_to_intel_dvo(struct drm_encoder *encoder)
{
99
	return container_of(encoder, struct intel_dvo, base.base);
C
Chris Wilson 已提交
100 101
}

102 103 104 105 106 107
static struct intel_dvo *intel_attached_dvo(struct drm_connector *connector)
{
	return container_of(intel_attached_encoder(connector),
			    struct intel_dvo, base);
}

108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132
static bool intel_dvo_connector_get_hw_state(struct intel_connector *connector)
{
	struct intel_dvo *intel_dvo = intel_attached_dvo(&connector->base);

	return intel_dvo->dev.dev_ops->get_hw_state(&intel_dvo->dev);
}

static bool intel_dvo_get_hw_state(struct intel_encoder *encoder,
				   enum pipe *pipe)
{
	struct drm_device *dev = encoder->base.dev;
	struct drm_i915_private *dev_priv = dev->dev_private;
	struct intel_dvo *intel_dvo = enc_to_intel_dvo(&encoder->base);
	u32 tmp;

	tmp = I915_READ(intel_dvo->dev.dvo_reg);

	if (!(tmp & DVO_ENABLE))
		return false;

	*pipe = PORT_TO_PIPE(tmp);

	return true;
}

133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156
static void intel_disable_dvo(struct intel_encoder *encoder)
{
	struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
	struct intel_dvo *intel_dvo = enc_to_intel_dvo(&encoder->base);
	u32 dvo_reg = intel_dvo->dev.dvo_reg;
	u32 temp = I915_READ(dvo_reg);

	intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, false);
	I915_WRITE(dvo_reg, temp & ~DVO_ENABLE);
	I915_READ(dvo_reg);
}

static void intel_enable_dvo(struct intel_encoder *encoder)
{
	struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
	struct intel_dvo *intel_dvo = enc_to_intel_dvo(&encoder->base);
	u32 dvo_reg = intel_dvo->dev.dvo_reg;
	u32 temp = I915_READ(dvo_reg);

	I915_WRITE(dvo_reg, temp | DVO_ENABLE);
	I915_READ(dvo_reg);
	intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, true);
}

157
static void intel_dvo_dpms(struct drm_connector *connector, int mode)
J
Jesse Barnes 已提交
158
{
159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176
	struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
	struct drm_crtc *crtc;

	/* dvo supports only 2 dpms states. */
	if (mode != DRM_MODE_DPMS_ON)
		mode = DRM_MODE_DPMS_OFF;

	if (mode == connector->dpms)
		return;

	connector->dpms = mode;

	/* Only need to change hw state when actually enabled */
	crtc = intel_dvo->base.base.crtc;
	if (!crtc) {
		intel_dvo->base.connectors_active = false;
		return;
	}
J
Jesse Barnes 已提交
177 178

	if (mode == DRM_MODE_DPMS_ON) {
179 180 181 182
		intel_dvo->base.connectors_active = true;

		intel_crtc_update_dpms(crtc);

183
		intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, true);
J
Jesse Barnes 已提交
184
	} else {
185
		intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, false);
186 187 188 189

		intel_dvo->base.connectors_active = false;

		intel_crtc_update_dpms(crtc);
J
Jesse Barnes 已提交
190
	}
191 192

	intel_connector_check_state(to_intel_connector(connector));
J
Jesse Barnes 已提交
193 194 195 196 197
}

static int intel_dvo_mode_valid(struct drm_connector *connector,
				struct drm_display_mode *mode)
{
198
	struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
J
Jesse Barnes 已提交
199 200 201 202 203 204

	if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
		return MODE_NO_DBLESCAN;

	/* XXX: Validate clock range */

C
Chris Wilson 已提交
205 206
	if (intel_dvo->panel_fixed_mode) {
		if (mode->hdisplay > intel_dvo->panel_fixed_mode->hdisplay)
J
Jesse Barnes 已提交
207
			return MODE_PANEL;
C
Chris Wilson 已提交
208
		if (mode->vdisplay > intel_dvo->panel_fixed_mode->vdisplay)
J
Jesse Barnes 已提交
209 210 211
			return MODE_PANEL;
	}

C
Chris Wilson 已提交
212
	return intel_dvo->dev.dev_ops->mode_valid(&intel_dvo->dev, mode);
J
Jesse Barnes 已提交
213 214 215
}

static bool intel_dvo_mode_fixup(struct drm_encoder *encoder,
216
				 const struct drm_display_mode *mode,
J
Jesse Barnes 已提交
217 218
				 struct drm_display_mode *adjusted_mode)
{
C
Chris Wilson 已提交
219
	struct intel_dvo *intel_dvo = enc_to_intel_dvo(encoder);
J
Jesse Barnes 已提交
220 221 222 223 224 225

	/* If we have timings from the BIOS for the panel, put them in
	 * to the adjusted mode.  The CRTC will be set up for this mode,
	 * with the panel scaling set up to source from the H/VDisplay
	 * of the original mode.
	 */
C
Chris Wilson 已提交
226 227
	if (intel_dvo->panel_fixed_mode != NULL) {
#define C(x) adjusted_mode->x = intel_dvo->panel_fixed_mode->x
J
Jesse Barnes 已提交
228 229 230 231 232 233 234 235 236 237 238 239
		C(hdisplay);
		C(hsync_start);
		C(hsync_end);
		C(htotal);
		C(vdisplay);
		C(vsync_start);
		C(vsync_end);
		C(vtotal);
		C(clock);
#undef C
	}

C
Chris Wilson 已提交
240 241
	if (intel_dvo->dev.dev_ops->mode_fixup)
		return intel_dvo->dev.dev_ops->mode_fixup(&intel_dvo->dev, mode, adjusted_mode);
J
Jesse Barnes 已提交
242 243 244 245 246 247 248 249 250 251 252

	return true;
}

static void intel_dvo_mode_set(struct drm_encoder *encoder,
			       struct drm_display_mode *mode,
			       struct drm_display_mode *adjusted_mode)
{
	struct drm_device *dev = encoder->dev;
	struct drm_i915_private *dev_priv = dev->dev_private;
	struct intel_crtc *intel_crtc = to_intel_crtc(encoder->crtc);
C
Chris Wilson 已提交
253
	struct intel_dvo *intel_dvo = enc_to_intel_dvo(encoder);
J
Jesse Barnes 已提交
254 255
	int pipe = intel_crtc->pipe;
	u32 dvo_val;
C
Chris Wilson 已提交
256
	u32 dvo_reg = intel_dvo->dev.dvo_reg, dvo_srcdim_reg;
257
	int dpll_reg = DPLL(pipe);
J
Jesse Barnes 已提交
258 259 260 261 262 263 264 265 266 267 268 269 270 271

	switch (dvo_reg) {
	case DVOA:
	default:
		dvo_srcdim_reg = DVOA_SRCDIM;
		break;
	case DVOB:
		dvo_srcdim_reg = DVOB_SRCDIM;
		break;
	case DVOC:
		dvo_srcdim_reg = DVOC_SRCDIM;
		break;
	}

C
Chris Wilson 已提交
272
	intel_dvo->dev.dev_ops->mode_set(&intel_dvo->dev, mode, adjusted_mode);
J
Jesse Barnes 已提交
273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304

	/* Save the data order, since I don't know what it should be set to. */
	dvo_val = I915_READ(dvo_reg) &
		  (DVO_PRESERVE_MASK | DVO_DATA_ORDER_GBRG);
	dvo_val |= DVO_DATA_ORDER_FP | DVO_BORDER_ENABLE |
		   DVO_BLANK_ACTIVE_HIGH;

	if (pipe == 1)
		dvo_val |= DVO_PIPE_B_SELECT;
	dvo_val |= DVO_PIPE_STALL;
	if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC)
		dvo_val |= DVO_HSYNC_ACTIVE_HIGH;
	if (adjusted_mode->flags & DRM_MODE_FLAG_PVSYNC)
		dvo_val |= DVO_VSYNC_ACTIVE_HIGH;

	I915_WRITE(dpll_reg, I915_READ(dpll_reg) | DPLL_DVO_HIGH_SPEED);

	/*I915_WRITE(DVOB_SRCDIM,
	  (adjusted_mode->hdisplay << DVO_SRCDIM_HORIZONTAL_SHIFT) |
	  (adjusted_mode->VDisplay << DVO_SRCDIM_VERTICAL_SHIFT));*/
	I915_WRITE(dvo_srcdim_reg,
		   (adjusted_mode->hdisplay << DVO_SRCDIM_HORIZONTAL_SHIFT) |
		   (adjusted_mode->vdisplay << DVO_SRCDIM_VERTICAL_SHIFT));
	/*I915_WRITE(DVOB, dvo_val);*/
	I915_WRITE(dvo_reg, dvo_val);
}

/**
 * Detect the output connection on our DVO device.
 *
 * Unimplemented.
 */
305
static enum drm_connector_status
306
intel_dvo_detect(struct drm_connector *connector, bool force)
J
Jesse Barnes 已提交
307
{
308
	struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
C
Chris Wilson 已提交
309
	return intel_dvo->dev.dev_ops->detect(&intel_dvo->dev);
J
Jesse Barnes 已提交
310 311 312 313
}

static int intel_dvo_get_modes(struct drm_connector *connector)
{
314
	struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
315
	struct drm_i915_private *dev_priv = connector->dev->dev_private;
J
Jesse Barnes 已提交
316 317 318 319 320 321

	/* We should probably have an i2c driver get_modes function for those
	 * devices which will have a fixed set of modes determined by the chip
	 * (TV-out, for example), but for now with just TMDS and LVDS,
	 * that's not the case.
	 */
322
	intel_ddc_get_modes(connector,
323
			    intel_gmbus_get_adapter(dev_priv, GMBUS_PORT_DPC));
J
Jesse Barnes 已提交
324 325 326
	if (!list_empty(&connector->probed_modes))
		return 1;

C
Chris Wilson 已提交
327
	if (intel_dvo->panel_fixed_mode != NULL) {
J
Jesse Barnes 已提交
328
		struct drm_display_mode *mode;
C
Chris Wilson 已提交
329
		mode = drm_mode_duplicate(connector->dev, intel_dvo->panel_fixed_mode);
J
Jesse Barnes 已提交
330 331 332 333 334
		if (mode) {
			drm_mode_probed_add(connector, mode);
			return 1;
		}
	}
C
Chris Wilson 已提交
335

J
Jesse Barnes 已提交
336 337 338
	return 0;
}

C
Chris Wilson 已提交
339
static void intel_dvo_destroy(struct drm_connector *connector)
J
Jesse Barnes 已提交
340 341 342
{
	drm_sysfs_connector_remove(connector);
	drm_connector_cleanup(connector);
343
	kfree(connector);
J
Jesse Barnes 已提交
344 345 346 347 348
}

static const struct drm_encoder_helper_funcs intel_dvo_helper_funcs = {
	.mode_fixup = intel_dvo_mode_fixup,
	.mode_set = intel_dvo_mode_set,
349
	.disable = intel_encoder_noop,
J
Jesse Barnes 已提交
350 351 352
};

static const struct drm_connector_funcs intel_dvo_connector_funcs = {
353
	.dpms = intel_dvo_dpms,
J
Jesse Barnes 已提交
354 355 356 357 358 359 360 361
	.detect = intel_dvo_detect,
	.destroy = intel_dvo_destroy,
	.fill_modes = drm_helper_probe_single_connector_modes,
};

static const struct drm_connector_helper_funcs intel_dvo_connector_helper_funcs = {
	.mode_valid = intel_dvo_mode_valid,
	.get_modes = intel_dvo_get_modes,
362
	.best_encoder = intel_best_encoder,
J
Jesse Barnes 已提交
363 364
};

365
static void intel_dvo_enc_destroy(struct drm_encoder *encoder)
J
Jesse Barnes 已提交
366
{
C
Chris Wilson 已提交
367 368 369 370 371 372 373 374
	struct intel_dvo *intel_dvo = enc_to_intel_dvo(encoder);

	if (intel_dvo->dev.dev_ops->destroy)
		intel_dvo->dev.dev_ops->destroy(&intel_dvo->dev);

	kfree(intel_dvo->panel_fixed_mode);

	intel_encoder_destroy(encoder);
J
Jesse Barnes 已提交
375 376 377 378 379 380 381 382 383 384 385 386 387
}

static const struct drm_encoder_funcs intel_dvo_enc_funcs = {
	.destroy = intel_dvo_enc_destroy,
};

/**
 * Attempts to get a fixed panel timing for LVDS (currently only the i830).
 *
 * Other chips with DVO LVDS will need to extend this to deal with the LVDS
 * chip being on DVOB/C and having multiple pipes.
 */
static struct drm_display_mode *
C
Chris Wilson 已提交
388
intel_dvo_get_current_mode(struct drm_connector *connector)
J
Jesse Barnes 已提交
389 390 391
{
	struct drm_device *dev = connector->dev;
	struct drm_i915_private *dev_priv = dev->dev_private;
392
	struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
C
Chris Wilson 已提交
393
	uint32_t dvo_val = I915_READ(intel_dvo->dev.dvo_reg);
J
Jesse Barnes 已提交
394 395 396 397 398 399 400 401 402
	struct drm_display_mode *mode = NULL;

	/* If the DVO port is active, that'll be the LVDS, so we can pull out
	 * its timings to get how the BIOS set up the panel.
	 */
	if (dvo_val & DVO_ENABLE) {
		struct drm_crtc *crtc;
		int pipe = (dvo_val & DVO_PIPE_B_SELECT) ? 1 : 0;

403
		crtc = intel_get_crtc_for_pipe(dev, pipe);
J
Jesse Barnes 已提交
404 405 406 407 408 409 410 411 412 413 414
		if (crtc) {
			mode = intel_crtc_mode_get(dev, crtc);
			if (mode) {
				mode->type |= DRM_MODE_TYPE_PREFERRED;
				if (dvo_val & DVO_HSYNC_ACTIVE_HIGH)
					mode->flags |= DRM_MODE_FLAG_PHSYNC;
				if (dvo_val & DVO_VSYNC_ACTIVE_HIGH)
					mode->flags |= DRM_MODE_FLAG_PVSYNC;
			}
		}
	}
C
Chris Wilson 已提交
415

J
Jesse Barnes 已提交
416 417 418 419 420
	return mode;
}

void intel_dvo_init(struct drm_device *dev)
{
421
	struct drm_i915_private *dev_priv = dev->dev_private;
422
	struct intel_encoder *intel_encoder;
C
Chris Wilson 已提交
423
	struct intel_dvo *intel_dvo;
424
	struct intel_connector *intel_connector;
J
Jesse Barnes 已提交
425 426
	int i;
	int encoder_type = DRM_MODE_ENCODER_NONE;
C
Chris Wilson 已提交
427 428 429

	intel_dvo = kzalloc(sizeof(struct intel_dvo), GFP_KERNEL);
	if (!intel_dvo)
J
Jesse Barnes 已提交
430 431
		return;

432 433
	intel_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL);
	if (!intel_connector) {
C
Chris Wilson 已提交
434
		kfree(intel_dvo);
435 436 437
		return;
	}

C
Chris Wilson 已提交
438
	intel_encoder = &intel_dvo->base;
439 440
	drm_encoder_init(dev, &intel_encoder->base,
			 &intel_dvo_enc_funcs, encoder_type);
C
Chris Wilson 已提交
441

442 443
	intel_encoder->disable = intel_disable_dvo;
	intel_encoder->enable = intel_enable_dvo;
444 445
	intel_encoder->get_hw_state = intel_dvo_get_hw_state;
	intel_connector->get_hw_state = intel_dvo_connector_get_hw_state;
446

J
Jesse Barnes 已提交
447 448
	/* Now, try to find a controller */
	for (i = 0; i < ARRAY_SIZE(intel_dvo_devices); i++) {
449
		struct drm_connector *connector = &intel_connector->base;
C
Chris Wilson 已提交
450
		const struct intel_dvo_device *dvo = &intel_dvo_devices[i];
451
		struct i2c_adapter *i2c;
J
Jesse Barnes 已提交
452 453 454 455 456 457
		int gpio;

		/* Allow the I2C driver info to specify the GPIO to be used in
		 * special cases, but otherwise default to what's defined
		 * in the spec.
		 */
458
		if (intel_gmbus_is_port_valid(dvo->gpio))
J
Jesse Barnes 已提交
459 460
			gpio = dvo->gpio;
		else if (dvo->type == INTEL_DVO_CHIP_LVDS)
461
			gpio = GMBUS_PORT_SSC;
J
Jesse Barnes 已提交
462
		else
463
			gpio = GMBUS_PORT_DPB;
J
Jesse Barnes 已提交
464 465 466 467 468

		/* Set up the I2C bus necessary for the chip we're probing.
		 * It appears that everything is on GPIOE except for panels
		 * on i830 laptops, which are on GPIOB (DVOA).
		 */
469
		i2c = intel_gmbus_get_adapter(dev_priv, gpio);
J
Jesse Barnes 已提交
470

C
Chris Wilson 已提交
471
		intel_dvo->dev = *dvo;
472
		if (!dvo->dev_ops->init(&intel_dvo->dev, i2c))
J
Jesse Barnes 已提交
473 474
			continue;

475 476
		intel_encoder->type = INTEL_OUTPUT_DVO;
		intel_encoder->crtc_mask = (1 << 0) | (1 << 1);
J
Jesse Barnes 已提交
477 478
		switch (dvo->type) {
		case INTEL_DVO_CHIP_TMDS:
479
			intel_encoder->cloneable = true;
J
Jesse Barnes 已提交
480 481 482 483 484 485
			drm_connector_init(dev, connector,
					   &intel_dvo_connector_funcs,
					   DRM_MODE_CONNECTOR_DVII);
			encoder_type = DRM_MODE_ENCODER_TMDS;
			break;
		case INTEL_DVO_CHIP_LVDS:
486
			intel_encoder->cloneable = false;
J
Jesse Barnes 已提交
487 488 489 490 491 492 493 494 495 496 497 498 499
			drm_connector_init(dev, connector,
					   &intel_dvo_connector_funcs,
					   DRM_MODE_CONNECTOR_LVDS);
			encoder_type = DRM_MODE_ENCODER_LVDS;
			break;
		}

		drm_connector_helper_add(connector,
					 &intel_dvo_connector_helper_funcs);
		connector->display_info.subpixel_order = SubPixelHorizontalRGB;
		connector->interlace_allowed = false;
		connector->doublescan_allowed = false;

500
		drm_encoder_helper_add(&intel_encoder->base,
J
Jesse Barnes 已提交
501 502
				       &intel_dvo_helper_funcs);

503
		intel_connector_attach_encoder(intel_connector, intel_encoder);
J
Jesse Barnes 已提交
504 505 506 507 508 509 510 511
		if (dvo->type == INTEL_DVO_CHIP_LVDS) {
			/* For our LVDS chipsets, we should hopefully be able
			 * to dig the fixed panel mode out of the BIOS data.
			 * However, it's in a different format from the BIOS
			 * data on chipsets with integrated LVDS (stored in AIM
			 * headers, likely), so for now, just get the current
			 * mode being output through DVO.
			 */
C
Chris Wilson 已提交
512
			intel_dvo->panel_fixed_mode =
J
Jesse Barnes 已提交
513
				intel_dvo_get_current_mode(connector);
C
Chris Wilson 已提交
514
			intel_dvo->panel_wants_dither = true;
J
Jesse Barnes 已提交
515 516 517 518 519 520
		}

		drm_sysfs_connector_add(connector);
		return;
	}

521
	drm_encoder_cleanup(&intel_encoder->base);
C
Chris Wilson 已提交
522
	kfree(intel_dvo);
523
	kfree(intel_connector);
J
Jesse Barnes 已提交
524
}