linux-kernel - Re: linux-next: manual merge of the drm tree with Linus' tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20141117094714.GA20092@ulmo.nvidia.com>
Date:	Mon, 17 Nov 2014 10:47:15 +0100
From:	Thierry Reding <treding@...dia.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	Dave Airlie <airlied@...ux.ie>, <linux-next@...r.kernel.org>,
	<linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the drm tree with Linus' tree

On Mon, Nov 17, 2014 at 02:11:58PM +1100, Stephen Rothwell wrote:
> * PGP Signed by an unknown key
> 
> Hi Dave,
> 
> Today's linux-next merge of the drm tree got a conflict in
> drivers/gpu/drm/tegra/dc.c between commit 8ff64c17f3be ("drm/tegra: dc:
> Add missing call to drm_vblank_on()") from Linus' tree and commits
> 205d48edee84 ("drm/tegra: dc: Factor out DC, window and cursor commit")
> and c7679306a923 ("drm/tegra: dc: Universal plane support") from the
> drm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
> 
> diff --cc drivers/gpu/drm/tegra/dc.c
> index 054a79f143ae,b957908aec73..000000000000
> --- a/drivers/gpu/drm/tegra/dc.c
> +++ b/drivers/gpu/drm/tegra/dc.c
> @@@ -751,7 -906,8 +906,8 @@@ static void tegra_crtc_disable(struct d
>   		}
>   	}
>   
>  -	drm_vblank_off(drm, dc->pipe);
>  +	drm_crtc_vblank_off(crtc);
> + 	tegra_dc_commit(dc);
>   }
>   
>   static bool tegra_crtc_mode_fixup(struct drm_crtc *crtc,
> @@@ -934,15 -1090,9 +1090,9 @@@ static void tegra_crtc_prepare(struct d
>   static void tegra_crtc_commit(struct drm_crtc *crtc)
>   {
>   	struct tegra_dc *dc = to_tegra_dc(crtc);
> - 	unsigned long value;
> - 
> - 	value = GENERAL_UPDATE | WIN_A_UPDATE;
> - 	tegra_dc_writel(dc, value, DC_CMD_STATE_CONTROL);
> - 
> - 	value = GENERAL_ACT_REQ | WIN_A_ACT_REQ;
> - 	tegra_dc_writel(dc, value, DC_CMD_STATE_CONTROL);
>   
>  -	drm_vblank_post_modeset(crtc->dev, dc->pipe);
>  +	drm_crtc_vblank_on(crtc);
> + 	tegra_dc_commit(dc);
>   }
>   
>   static void tegra_crtc_load_lut(struct drm_crtc *crtc)

Looks good.

Thanks,
Thierry

Content of type "application/pgp-signature" skipped