lkml.org 
[lkml]   [2011]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/15] gma500: Set the correct bits according to the pipe
    Date
    From: Alan Cox <alan@linux.intel.com>

    Squash a hardcoded assumption we shouldn't really make

    Signed-off-by: Alan Cox <alan@linux.intel.com>
    ---

    drivers/staging/gma500/psb_intel_display.c | 11 ++++++-----
    1 files changed, 6 insertions(+), 5 deletions(-)

    diff --git a/drivers/staging/gma500/psb_intel_display.c b/drivers/staging/gma500/psb_intel_display.c
    index 4f47d09..a99271d 100644
    --- a/drivers/staging/gma500/psb_intel_display.c
    +++ b/drivers/staging/gma500/psb_intel_display.c
    @@ -723,17 +723,18 @@ static int psb_intel_crtc_mode_set(struct drm_crtc *crtc,
    if (is_lvds) {
    u32 lvds = REG_READ(LVDS);

    - lvds |=
    - LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP |
    - LVDS_PIPEB_SELECT;
    + lvds &= ~LVDS_PIPEB_SELECT;
    + if (pipe == 1)
    + lvds |= LVDS_PIPEB_SELECT;
    +
    + lvds |= LVDS_PORT_EN | LVDS_A0A2_CLKA_POWER_UP;
    /* Set the B0-B3 data pairs corresponding to
    * whether we're going to
    * set the DPLLs for dual-channel mode or not.
    */
    + lvds &= ~(LVDS_B0B3_POWER_UP | LVDS_CLKB_POWER_UP);
    if (clock.p2 == 7)
    lvds |= LVDS_B0B3_POWER_UP | LVDS_CLKB_POWER_UP;
    - else
    - lvds &= ~(LVDS_B0B3_POWER_UP | LVDS_CLKB_POWER_UP);

    /* It would be nice to set 24 vs 18-bit mode (LVDS_A3_POWER_UP)
    * appropriately here, but we need to look more


    \
     
     \ /
      Last update: 2011-06-08 12:27    [W:0.020 / U:2.096 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site