Messages in this thread | | | Date | Mon, 28 Oct 2013 17:12:26 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the drm tree with the drm-intel-fixes tree |
| |
Hi Dave,
On Mon, 28 Oct 2013 16:46:09 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > @@@ -1486,8 -1542,8 +1562,8 @@@ static void intel_edp_psr_setup(struct > intel_edp_psr_write_vsc(intel_dp, &psr_vsc); > > /* Avoid continuous PSR exit by masking memup and hpd */ > - I915_WRITE(EDP_PSR_DEBUG_CTL(dev), EDP_PSR_DEBUG_MASK_MEMUP | > + I915_WRITE(EDP_PSR_DEBUG_CTL, EDP_PSR_DEBUG_MASK_MEMUP | > - EDP_PSR_DEBUG_MASK_HPD | EDP_PSR_DEBUG_MASK_LPSP); > + EDP_PSR_DEBUG_MASK_HPD); > > intel_dp->psr_setup_done = true; > }
This last hunk is wrong. I fixed it up to do the reverse of the above.
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |