[Intel-gfx] [PATCH] drm/i915: fix FDI_RX_CHICKEN register read masking

[Lespiau, Damien]

On Mon, Oct 29, 2012 at 5:26 PM, Jani Nikula <jani.nikula at intel.com> wrote:
> Mask the value, not the register. Spotted while reading the code.
>
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Reviewed-by: Damien Lespiau <damien.lespiau at intel.com>

Good catch! FWIW, I ran:

git grep -e "READ.*\(pipe\|plane\|cpu_transcoder\))[^)]*[|&]"
drivers/gpu/drm/i915/

and this was the only catch.

-- 
Damien


> ---
>
> Only compile tested. Is there a bug that might match this?
> ---
>  drivers/gpu/drm/i915/intel_display.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index a5be346..6f8cf2a 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2804,8 +2804,8 @@ static void ironlake_fdi_disable(struct drm_crtc *crtc)
>         if (HAS_PCH_IBX(dev)) {
>                 I915_WRITE(FDI_RX_CHICKEN(pipe), FDI_RX_PHASE_SYNC_POINTER_OVR);
>                 I915_WRITE(FDI_RX_CHICKEN(pipe),
> -                          I915_READ(FDI_RX_CHICKEN(pipe) &
> -                                    ~FDI_RX_PHASE_SYNC_POINTER_EN));
> +                          I915_READ(FDI_RX_CHICKEN(pipe)) &
> +                          ~FDI_RX_PHASE_SYNC_POINTER_EN);
>         } else if (HAS_PCH_CPT(dev)) {
>                 cpt_phase_pointer_disable(dev, pipe);
>         }
> --
> 1.7.9.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx