dri-devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Dave Airlie <airlied@gmail.com>
To: dri-devel@lists.freedesktop.org
Subject: [PATCH 1/2] drm/amdgpu: drop CV/TV bits in atombios_encoders.
Date: Thu, 14 Apr 2016 14:41:18 +1000	[thread overview]
Message-ID: <1460608879-30510-1-git-send-email-airlied@gmail.com> (raw)

From: Dave Airlie <airlied@redhat.com>

Converting to engine id doesn't have these.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---
 drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 42 ++++----------------------
 1 file changed, 6 insertions(+), 36 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
index 9f7f3fc..37c498b 100644
--- a/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
+++ b/drivers/gpu/drm/amd/amdgpu/atombios_encoders.c
@@ -1336,21 +1336,11 @@ amdgpu_atombios_encoder_set_crtc_source(struct drm_encoder *encoder)
 				break;
 			case ENCODER_ID_INTERNAL_DAC1:
 			case ENCODER_ID_INTERNAL_KLDSCP_DAC1:
-				if (amdgpu_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT))
-					args.v1.ucDevice = ATOM_DEVICE_TV1_INDEX;
-				else if (amdgpu_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT))
-					args.v1.ucDevice = ATOM_DEVICE_CV_INDEX;
-				else
-					args.v1.ucDevice = ATOM_DEVICE_CRT1_INDEX;
+				args.v1.ucDevice = ATOM_DEVICE_CRT1_INDEX;
 				break;
 			case ENCODER_ID_INTERNAL_DAC2:
 			case ENCODER_ID_INTERNAL_KLDSCP_DAC2:
-				if (amdgpu_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT))
-					args.v1.ucDevice = ATOM_DEVICE_TV1_INDEX;
-				else if (amdgpu_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT))
-					args.v1.ucDevice = ATOM_DEVICE_CV_INDEX;
-				else
-					args.v1.ucDevice = ATOM_DEVICE_CRT2_INDEX;
+				args.v1.ucDevice = ATOM_DEVICE_CRT2_INDEX;
 				break;
 			default:
 				return;
@@ -1404,20 +1394,10 @@ amdgpu_atombios_encoder_set_crtc_source(struct drm_encoder *encoder)
 				}
 				break;
 			case ENCODER_ID_INTERNAL_KLDSCP_DAC1:
-				if (amdgpu_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT))
-					args.v2.ucEncoderID = ASIC_INT_TV_ENCODER_ID;
-				else if (amdgpu_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT))
-					args.v2.ucEncoderID = ASIC_INT_TV_ENCODER_ID;
-				else
-					args.v2.ucEncoderID = ASIC_INT_DAC1_ENCODER_ID;
+				args.v2.ucEncoderID = ASIC_INT_DAC1_ENCODER_ID;
 				break;
 			case ENCODER_ID_INTERNAL_KLDSCP_DAC2:
-				if (amdgpu_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT))
-					args.v2.ucEncoderID = ASIC_INT_TV_ENCODER_ID;
-				else if (amdgpu_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT))
-					args.v2.ucEncoderID = ASIC_INT_TV_ENCODER_ID;
-				else
-					args.v2.ucEncoderID = ASIC_INT_DAC2_ENCODER_ID;
+				args.v2.ucEncoderID = ASIC_INT_DAC2_ENCODER_ID;
 				break;
 			default:
 				return;
@@ -1472,20 +1452,10 @@ amdgpu_atombios_encoder_set_crtc_source(struct drm_encoder *encoder)
 				}
 				break;
 			case ENCODER_ID_INTERNAL_KLDSCP_DAC1:
-				if (amdgpu_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT))
-					args.v3.ucEncoderID = ASIC_INT_TV_ENCODER_ID;
-				else if (amdgpu_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT))
-					args.v3.ucEncoderID = ASIC_INT_TV_ENCODER_ID;
-				else
-					args.v3.ucEncoderID = ASIC_INT_DAC1_ENCODER_ID;
+				args.v3.ucEncoderID = ASIC_INT_DAC1_ENCODER_ID;
 				break;
 			case ENCODER_ID_INTERNAL_KLDSCP_DAC2:
-				if (amdgpu_encoder->active_device & (ATOM_DEVICE_TV_SUPPORT))
-					args.v3.ucEncoderID = ASIC_INT_TV_ENCODER_ID;
-				else if (amdgpu_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT))
-					args.v3.ucEncoderID = ASIC_INT_TV_ENCODER_ID;
-				else
-					args.v3.ucEncoderID = ASIC_INT_DAC2_ENCODER_ID;
+				args.v3.ucEncoderID = ASIC_INT_DAC2_ENCODER_ID;
 				break;
 			default:
 				break;
-- 
2.5.5

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

             reply	other threads:[~2016-04-14  4:41 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-14  4:41 Dave Airlie [this message]
2016-04-14  4:41 ` [PATCH 2/2] drm/amdgpu: start using engine_id for encoders Dave Airlie

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=1460608879-30510-1-git-send-email-airlied@gmail.com \
    --to=airlied@gmail.com \
    --cc=dri-devel@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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