mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
![Daniel Vetter](/assets/img/avatar_default.png)
We have a pretty decent confusion about vertical timings of interlaced modes. Peter Ross has written a patch that makes interlace modes work on a lot more platforms/output combinations by doubling the vertical timings. The issue with that patch is that core drm _does_ support specifying whether we want these vertical timings in fields or frames, we just haven't managed to consistently use this facility. The relavant function is drm_mode_set_crtcinfo, which fills in the crtc timing information. The first thing to note is that the drm core keeps interlaced modes in frames, but displays modelines in fields. So when the crtc modeset helper copies over the mode into adjusted_mode it will already contain vertical timings in half-frames. The result is that the fixup code in intel_crtc_mode_fixup doesn't actually do anything (in most cases at least). Now gen3+ natively supports interlaced modes and wants the vertical timings in frames. Which is what sdvo already fixes up, at least under some conditions. There are a few other place that demand vertical timings in fields but never actually deal with interlaced modes, so use frame timings for consistency, too. These are: - lvds panel, - dvo encoders - dvo is the only way gen2 could support interlaced mode, but currently we don't support any encoders that do. - tv out - despite that the tv dac sends out an interlaced signal it expects a progressive mode pipe configuration. All these encoders enforce progressive modes by resetting interlace_allowed. Hence we always want crtc vertical timings in frames. Enforce this in our crtc mode_fixup function and rip out any redudant timing computations from the encoders' mode_fixup function. v2-4: Adjust the vertical timings a bit. v5: Split out the 'subtract-one for interlaced' fixes. v6: Clarify issues around tv-out and gen2. Reviewed-by: Eugeni Dodonov <eugeni.dodonov@intel.com> Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Tested-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Tested-by: Christopher Egert <cme3000@gmail.com> Tested-by: Alfonso Fiore <alfonso.fiore@gmail.com> Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
447 lines
13 KiB
C
447 lines
13 KiB
C
/*
|
|
* 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>
|
|
#include <linux/slab.h>
|
|
#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
|
|
|
|
static const struct intel_dvo_device intel_dvo_devices[] = {
|
|
{
|
|
.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,
|
|
.gpio = GMBUS_PORT_DPB,
|
|
.dev_ops = &ch7017_ops,
|
|
}
|
|
};
|
|
|
|
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)
|
|
{
|
|
return container_of(encoder, struct intel_dvo, base.base);
|
|
}
|
|
|
|
static struct intel_dvo *intel_attached_dvo(struct drm_connector *connector)
|
|
{
|
|
return container_of(intel_attached_encoder(connector),
|
|
struct intel_dvo, base);
|
|
}
|
|
|
|
static void intel_dvo_dpms(struct drm_encoder *encoder, int mode)
|
|
{
|
|
struct drm_i915_private *dev_priv = encoder->dev->dev_private;
|
|
struct intel_dvo *intel_dvo = enc_to_intel_dvo(encoder);
|
|
u32 dvo_reg = intel_dvo->dev.dvo_reg;
|
|
u32 temp = I915_READ(dvo_reg);
|
|
|
|
if (mode == DRM_MODE_DPMS_ON) {
|
|
I915_WRITE(dvo_reg, temp | DVO_ENABLE);
|
|
I915_READ(dvo_reg);
|
|
intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, mode);
|
|
} else {
|
|
intel_dvo->dev.dev_ops->dpms(&intel_dvo->dev, mode);
|
|
I915_WRITE(dvo_reg, temp & ~DVO_ENABLE);
|
|
I915_READ(dvo_reg);
|
|
}
|
|
}
|
|
|
|
static int intel_dvo_mode_valid(struct drm_connector *connector,
|
|
struct drm_display_mode *mode)
|
|
{
|
|
struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
|
|
|
|
if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
|
|
return MODE_NO_DBLESCAN;
|
|
|
|
/* XXX: Validate clock range */
|
|
|
|
if (intel_dvo->panel_fixed_mode) {
|
|
if (mode->hdisplay > intel_dvo->panel_fixed_mode->hdisplay)
|
|
return MODE_PANEL;
|
|
if (mode->vdisplay > intel_dvo->panel_fixed_mode->vdisplay)
|
|
return MODE_PANEL;
|
|
}
|
|
|
|
return intel_dvo->dev.dev_ops->mode_valid(&intel_dvo->dev, mode);
|
|
}
|
|
|
|
static bool intel_dvo_mode_fixup(struct drm_encoder *encoder,
|
|
struct drm_display_mode *mode,
|
|
struct drm_display_mode *adjusted_mode)
|
|
{
|
|
struct intel_dvo *intel_dvo = enc_to_intel_dvo(encoder);
|
|
|
|
/* 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.
|
|
*/
|
|
if (intel_dvo->panel_fixed_mode != NULL) {
|
|
#define C(x) adjusted_mode->x = intel_dvo->panel_fixed_mode->x
|
|
C(hdisplay);
|
|
C(hsync_start);
|
|
C(hsync_end);
|
|
C(htotal);
|
|
C(vdisplay);
|
|
C(vsync_start);
|
|
C(vsync_end);
|
|
C(vtotal);
|
|
C(clock);
|
|
#undef C
|
|
}
|
|
|
|
if (intel_dvo->dev.dev_ops->mode_fixup)
|
|
return intel_dvo->dev.dev_ops->mode_fixup(&intel_dvo->dev, mode, adjusted_mode);
|
|
|
|
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);
|
|
struct intel_dvo *intel_dvo = enc_to_intel_dvo(encoder);
|
|
int pipe = intel_crtc->pipe;
|
|
u32 dvo_val;
|
|
u32 dvo_reg = intel_dvo->dev.dvo_reg, dvo_srcdim_reg;
|
|
int dpll_reg = DPLL(pipe);
|
|
|
|
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;
|
|
}
|
|
|
|
intel_dvo->dev.dev_ops->mode_set(&intel_dvo->dev, mode, adjusted_mode);
|
|
|
|
/* 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.
|
|
*/
|
|
static enum drm_connector_status
|
|
intel_dvo_detect(struct drm_connector *connector, bool force)
|
|
{
|
|
struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
|
|
return intel_dvo->dev.dev_ops->detect(&intel_dvo->dev);
|
|
}
|
|
|
|
static int intel_dvo_get_modes(struct drm_connector *connector)
|
|
{
|
|
struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
|
|
struct drm_i915_private *dev_priv = connector->dev->dev_private;
|
|
|
|
/* 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.
|
|
*/
|
|
intel_ddc_get_modes(connector,
|
|
&dev_priv->gmbus[GMBUS_PORT_DPC].adapter);
|
|
if (!list_empty(&connector->probed_modes))
|
|
return 1;
|
|
|
|
if (intel_dvo->panel_fixed_mode != NULL) {
|
|
struct drm_display_mode *mode;
|
|
mode = drm_mode_duplicate(connector->dev, intel_dvo->panel_fixed_mode);
|
|
if (mode) {
|
|
drm_mode_probed_add(connector, mode);
|
|
return 1;
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void intel_dvo_destroy(struct drm_connector *connector)
|
|
{
|
|
drm_sysfs_connector_remove(connector);
|
|
drm_connector_cleanup(connector);
|
|
kfree(connector);
|
|
}
|
|
|
|
static const struct drm_encoder_helper_funcs intel_dvo_helper_funcs = {
|
|
.dpms = intel_dvo_dpms,
|
|
.mode_fixup = intel_dvo_mode_fixup,
|
|
.prepare = intel_encoder_prepare,
|
|
.mode_set = intel_dvo_mode_set,
|
|
.commit = intel_encoder_commit,
|
|
};
|
|
|
|
static const struct drm_connector_funcs intel_dvo_connector_funcs = {
|
|
.dpms = drm_helper_connector_dpms,
|
|
.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,
|
|
.best_encoder = intel_best_encoder,
|
|
};
|
|
|
|
static void intel_dvo_enc_destroy(struct drm_encoder *encoder)
|
|
{
|
|
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);
|
|
}
|
|
|
|
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 *
|
|
intel_dvo_get_current_mode(struct drm_connector *connector)
|
|
{
|
|
struct drm_device *dev = connector->dev;
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
|
|
uint32_t dvo_val = I915_READ(intel_dvo->dev.dvo_reg);
|
|
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;
|
|
|
|
crtc = intel_get_crtc_for_pipe(dev, pipe);
|
|
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;
|
|
}
|
|
}
|
|
}
|
|
|
|
return mode;
|
|
}
|
|
|
|
void intel_dvo_init(struct drm_device *dev)
|
|
{
|
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
|
struct intel_encoder *intel_encoder;
|
|
struct intel_dvo *intel_dvo;
|
|
struct intel_connector *intel_connector;
|
|
int i;
|
|
int encoder_type = DRM_MODE_ENCODER_NONE;
|
|
|
|
intel_dvo = kzalloc(sizeof(struct intel_dvo), GFP_KERNEL);
|
|
if (!intel_dvo)
|
|
return;
|
|
|
|
intel_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL);
|
|
if (!intel_connector) {
|
|
kfree(intel_dvo);
|
|
return;
|
|
}
|
|
|
|
intel_encoder = &intel_dvo->base;
|
|
drm_encoder_init(dev, &intel_encoder->base,
|
|
&intel_dvo_enc_funcs, encoder_type);
|
|
|
|
/* Now, try to find a controller */
|
|
for (i = 0; i < ARRAY_SIZE(intel_dvo_devices); i++) {
|
|
struct drm_connector *connector = &intel_connector->base;
|
|
const struct intel_dvo_device *dvo = &intel_dvo_devices[i];
|
|
struct i2c_adapter *i2c;
|
|
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.
|
|
*/
|
|
if (dvo->gpio != 0)
|
|
gpio = dvo->gpio;
|
|
else if (dvo->type == INTEL_DVO_CHIP_LVDS)
|
|
gpio = GMBUS_PORT_SSC;
|
|
else
|
|
gpio = GMBUS_PORT_DPB;
|
|
|
|
/* 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).
|
|
*/
|
|
i2c = &dev_priv->gmbus[gpio].adapter;
|
|
|
|
intel_dvo->dev = *dvo;
|
|
if (!dvo->dev_ops->init(&intel_dvo->dev, i2c))
|
|
continue;
|
|
|
|
intel_encoder->type = INTEL_OUTPUT_DVO;
|
|
intel_encoder->crtc_mask = (1 << 0) | (1 << 1);
|
|
switch (dvo->type) {
|
|
case INTEL_DVO_CHIP_TMDS:
|
|
intel_encoder->clone_mask =
|
|
(1 << INTEL_DVO_TMDS_CLONE_BIT) |
|
|
(1 << INTEL_ANALOG_CLONE_BIT);
|
|
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:
|
|
intel_encoder->clone_mask =
|
|
(1 << INTEL_DVO_LVDS_CLONE_BIT);
|
|
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;
|
|
|
|
drm_encoder_helper_add(&intel_encoder->base,
|
|
&intel_dvo_helper_funcs);
|
|
|
|
intel_connector_attach_encoder(intel_connector, intel_encoder);
|
|
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.
|
|
*/
|
|
intel_dvo->panel_fixed_mode =
|
|
intel_dvo_get_current_mode(connector);
|
|
intel_dvo->panel_wants_dither = true;
|
|
}
|
|
|
|
drm_sysfs_connector_add(connector);
|
|
return;
|
|
}
|
|
|
|
drm_encoder_cleanup(&intel_encoder->base);
|
|
kfree(intel_dvo);
|
|
kfree(intel_connector);
|
|
}
|