public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Alex Deucher <alexdeucher@gmail•com>,
	Dave Airlie <airlied@linux•ie>,
	DRI <dri-devel@lists•freedesktop.org>
Cc: Alex Deucher <alexander.deucher@amd•com>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>,
	Stylon Wang <stylon.wang@amd•com>
Subject: Re: linux-next: manual merge of the amdgpu tree with the drm-fixes tree
Date: Fri, 23 Jul 2021 13:08:18 +1000	[thread overview]
Message-ID: <20210723130818.1a33137a@canb.auug.org.au> (raw)
In-Reply-To: <20210723125807.3c779f68@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 550 bytes --]

Hi all,

On Fri, 23 Jul 2021 12:58:07 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>

> + #ifdef CONFIG_DRM_AMD_DC_HDCP
> + 	if (cp_psp && cp_psp->funcs.enable_assr) {
> + 		if (!cp_psp->funcs.enable_assr(cp_psp->handle, link)) {
> + 			/* since eDP implies ASSR on, change panel
> + 			 * mode to disable ASSR
> + 			 */
> + 			panel_mode = DP_PANEL_MODE_DEFAULT;
> + 		}
>  -	} else
>  -		panel_mode = DP_PANEL_MODE_DEFAULT;
> + #endif

I corrected that to put back just the closing '}'.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  reply	other threads:[~2021-07-23  3:08 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-23  2:58 linux-next: manual merge of the amdgpu tree with the drm-fixes tree Stephen Rothwell
2021-07-23  3:08 ` Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-02-27 14:00 Mark Brown
2026-03-05 13:37 Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210723130818.1a33137a@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=airlied@linux$(echo .)ie \
    --cc=alexander.deucher@amd$(echo .)com \
    --cc=alexdeucher@gmail$(echo .)com \
    --cc=dri-devel@lists$(echo .)freedesktop.org \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=stylon.wang@amd$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox