1. 22 Apr, 2013 2 commits
    • Dave Airlie's avatar
      Merge branch 'exynos-drm-next' of... · 64c026e2
      Dave Airlie authored
      Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next
      
      Inki writes:
            This is initial pull request for Exynos. It includes a big change
             that it makes drm_display_mode for timings parameters to be used
             for exynos4 and exynos5 commonly and cleans up unnecessary codes.
             And also it adds device tree support for fimd to get timing values
             and interrupt source from dts file.
      
             In addition, one more patch, device tree support feature for Exynos
             FIMC, is being reviewed. This patch was posted a little ago like below,
                  http://www.mail-archive.com/linux-samsung-soc@vger.kernel.org/msg17568.html
      
             So we are going to request git pull one more time after reviewed.
      
      * 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
        drm/exynos: prepare FIMD clocks
        Revert "of/exynos_g2d: Add Bindings for exynos G2D driver"
        drm/exynos: drm_connector: Fix error check condition
        drm/exynos: drm_rotator: Fix incorrect usage of IS_ERR_OR_NULL
        drm/exynos: mixer: Fix incorrect usage of IS_ERR_OR_NULL
        drm/exynos: hdmi: Fix incorrect usage of IS_ERR_OR_NULL
        drm/exynos: change the method for getting the interrupt
        drm/exynos: enable OF_VIDEOMODE and FB_MODE_HELPERS for exynos drm fimd
        drm/exynos: Add display-timing node parsing using video helper function
        drm/exynos: hdmi: move mode_fixup to drm common hdmi
        drm/exynos: hdmi: using drm_display_mode timings for exynos4
      64c026e2
    • Dave Airlie's avatar
      Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-next · f0aa848f
      Dave Airlie authored
      Daniel writes:
      As promised a stash of (mostly) fixes. Two pieces of non-fixes included:
      - A notch more gtt refactoring from Ben, beating to death with igt in our
        nightly testing.
      - Support for display display-less server chips (again from Ben). New hw
        support which is only likely to break itself ;-)
      
      Otherwise just tons of fixes:
      - hpd irq storm mitigation from Egbert Eich. Your -next tree already has
        the infrastructure, this here just supplies the logic.
      - sdvo hw state check fix from Egbert Eich
      - fb cb tune settings for the pch pll clocks on cpt/ppt
      - "Bring a bigger gun" coherence workaround for multi-threade, mulit-core
        & thrashing tiled gtt cpu access from Chris.
      - Update haswell mPHY code.
      - l3$ caching for context objects on ivb/hsw (Chris).
      - dp aux refclock fix for haswell (Jani)
      - moar overclocking fixes for snb/ivb (Ben)
      - ecobits ppgtt pte caching control fixes from Ville
      - fence stride check fixes and limit improvements (Ville)
      - fix up crtc force restoring, potentially resulting in tons of hw state
        check WARNs
      - OOPS fix for NULL derefencing of fb pointers when force-restoring a crtc
        when other crtcs are disabled and the force-restored crtc is _not_ the
        first one.
      - Fix pfit disabling on gen2/3.
      - Haswell ring freq scaling fixes (Chris).
      - backlight init/teardown fix (failed eDP init killed the lvds backlight)
        from Jani
      - cpt/ppt fdi polarity fixes from Paulo (should help a lot of the FDI link
        train failures).
      - And a bunch of smaller things all over.
      * 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel: (56 commits)
        drm/i915: fix bpc vs. bpp confusion in intel_crtc_compute_config
        drm/i915: move cpu_transcoder to the pipe configuration
        drm/i915: preserve the PBC bits of TRANS_CHICKEN2
        drm/i915: set CPT FDI RX polarity bits based on VBT
        drm/i915: Add Reenable Timer to turn Hotplug Detection back on (v4)
        drm/i915: Disable HPD interrupt on pin when irq storm is detected (v3)
        drm/i915: Mask out the HPD irq bits before setting them individually.
        drm/i915: (re)init HPD interrupt storm statistics
        drm/i915: Add HPD IRQ storm detection (v5)
        drm/i915: WARN when LPT-LP is not paired with ULT CPU
        drm/i915: don't intel_crt_init on any ULT machines
        drm/i915: remove comment about IVB link training from intel_pm.c
        drm/i915: VLV doesn't have LLC
        drm/i915: Scale ring, rather than ia, frequency on Haswell
        drm/i915: shorten debugfs output simple attributes
        drm/i915: Fixup pfit disabling for gen2/3
        drm/i915: Fixup Oops in the pipe config computation
        drm/i915: ensure single initialization and cleanup of backlight device
        drm/i915: don't touch the PF regs if the power well is down
        drm/i915: add intel_using_power_well
        ...
      f0aa848f
  2. 20 Apr, 2013 1 commit
    • Vikas Sajjan's avatar
      drm/exynos: prepare FIMD clocks · b4e3a3e8
      Vikas Sajjan authored
      While migrating to common clock framework (CCF), I found that the FIMD clocks
      were pulled down by the CCF.
      If CCF finds any clock(s) which has NOT been claimed by any of the
      drivers, then such clock(s) are PULLed low by CCF.
      
      Calling clk_prepare() for FIMD clocks fixes the issue.
      
      This patch also replaces clk_disable() with clk_unprepare() during exit, since
      clk_prepare() is called in fimd_probe().
      Signed-off-by: default avatarVikas Sajjan <vikas.sajjan@linaro.org>
      Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
      b4e3a3e8
  3. 18 Apr, 2013 37 commits