Re: [Intel-gfx] [PATCH] drm/i915: implement ibx_hpd_irq_setup

2013-04-01 Thread Daniel Vetter 
On Fri, Mar 29, 2013 at 5:35 PM, Egbert Eich e...@suse.com wrote:
 Daniel Vetter writes:
   diff --git a/drivers/gpu/drm/i915/i915_irq.c 
 b/drivers/gpu/drm/i915/i915_irq.c
   index 43436e0..1279a44 100644
   --- a/drivers/gpu/drm/i915/i915_irq.c
   +++ b/drivers/gpu/drm/i915/i915_irq.c
   @@ -2084,7 +2084,7 @@ static void ibx_enable_hotplug(struct drm_device 
 *dev)
I915_WRITE(PCH_PORT_HOTPLUG, hotplug);
}
  
   -static void ibx_irq_postinstall(struct drm_device *dev)
   +static void ibx_hpd_irq_setup(struct drm_device *dev)
{
drm_i915_private_t *dev_priv = (drm_i915_private_t *) 
 dev-dev_private;
struct drm_mode_config *mode_config = dev-mode_config;
   @@ -2095,12 +2095,10 @@ static void ibx_irq_postinstall(struct drm_device 
 *dev)
mask = ~SDE_HOTPLUG_MASK;
 ^^^
 I'm missing those lines in the committed version of the patch.

list_for_each_entry(intel_encoder, 
 mode_config-encoder_list, base.head)
mask |= hpd_ibx[intel_encoder-hpd_pin];
   -mask |= SDE_GMBUS | SDE_AUX_MASK;
} else {
mask = ~SDE_HOTPLUG_MASK_CPT;
 ^^^
list_for_each_entry(intel_encoder, 
 mode_config-encoder_list, base.head)
mask |= hpd_cpt[intel_encoder-hpd_pin];
   -mask |= SDE_GMBUS_CPT | SDE_AUX_MASK_CPT;
}
I915_WRITE(SDEIIR, I915_READ(SDEIIR));

 These are not really relevant in the present code, however they are
 important once I've got the hotplug stuff refitted as one needs to be
 able to turn off individual interrupts.
 I'm going to prepare a commit for this and will send it with the hpd
 irq storm patches.

Yeah, makes sense now that I think about it - I've simply didn't look
ahead in your patch series while writing this little fixup ;-) Can you
just re-add this when resending your patches again please?

Thanks, Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] linux-next: manual merge of the drm-intel tree with Linus' tree

2013-04-01 Thread Stephen Rothwell 
Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_dp.c between commit 9d1a455b0ca1 () from
Linus' tree and commit 965e0c489f36 (drm/i915: introduce
pipe_config-dither|pipe_bpp) from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/gpu/drm/i915/intel_dp.c
index d7d4afe,92a7c62..000
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@@ -850,10 -792,10 +802,10 @@@ intel_dp_set_m_n(struct drm_crtc *crtc
 * the number of bytes_per_pixel post-LUT, which we always
 * set up for 8-bits of R/G/B, or 3 bytes total.
 */
-   intel_link_compute_m_n(intel_crtc-bpp, lane_count,
+   intel_link_compute_m_n(intel_crtc-config.pipe_bpp, lane_count,
 - mode-clock, adjusted_mode-clock, m_n);
 + target_clock, adjusted_mode-clock, m_n);
  
-   if (IS_HASWELL(dev)) {
+   if (HAS_DDI(dev)) {
I915_WRITE(PIPE_DATA_M1(cpu_transcoder),
   TU_SIZE(m_n.tu) | m_n.gmch_m);
I915_WRITE(PIPE_DATA_N1(cpu_transcoder), m_n.gmch_n);


pgpxPf6ouagnl.pgp
Description: PGP signature
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx