dri-devel.lists.freedesktop.org archive mirror
 help / color / mirror / Atom feed
From: Alex Deucher <alexdeucher@gmail.com>
To: airlied@gmail.com, dri-devel@lists.freedesktop.org
Subject: [PATCH 19/25] drm/radeon/kms: add ni_reg.h
Date: Thu,  6 Jan 2011 21:19:29 -0500	[thread overview]
Message-ID: <1294366775-1605-20-git-send-email-alexdeucher@gmail.com> (raw)
In-Reply-To: <1294366775-1605-1-git-send-email-alexdeucher@gmail.com>

This adds some new NI (northern islands) specific display
register defines.

Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
---
 drivers/gpu/drm/radeon/ni_reg.h     |   86 +++++++++++++++++++++++++++++++++++
 drivers/gpu/drm/radeon/radeon_reg.h |    1 +
 2 files changed, 87 insertions(+), 0 deletions(-)
 create mode 100644 drivers/gpu/drm/radeon/ni_reg.h

diff --git a/drivers/gpu/drm/radeon/ni_reg.h b/drivers/gpu/drm/radeon/ni_reg.h
new file mode 100644
index 0000000..5db7b7d
--- /dev/null
+++ b/drivers/gpu/drm/radeon/ni_reg.h
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2010 Advanced Micro Devices, Inc.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors: Alex Deucher
+ */
+#ifndef __NI_REG_H__
+#define __NI_REG_H__
+
+/* northern islands - DCE5 */
+
+#define NI_INPUT_GAMMA_CONTROL                         0x6840
+#       define NI_GRPH_INPUT_GAMMA_MODE(x)             (((x) & 0x3) << 0)
+#       define NI_INPUT_GAMMA_USE_LUT                  0
+#       define NI_INPUT_GAMMA_BYPASS                   1
+#       define NI_INPUT_GAMMA_SRGB_24                  2
+#       define NI_INPUT_GAMMA_XVYCC_222                3
+#       define NI_OVL_INPUT_GAMMA_MODE(x)              (((x) & 0x3) << 4)
+
+#define NI_PRESCALE_GRPH_CONTROL                       0x68b4
+#       define NI_GRPH_PRESCALE_BYPASS                 (1 << 4)
+
+#define NI_PRESCALE_OVL_CONTROL                        0x68c4
+#       define NI_OVL_PRESCALE_BYPASS                  (1 << 4)
+
+#define NI_INPUT_CSC_CONTROL                           0x68d4
+#       define NI_INPUT_CSC_GRPH_MODE(x)               (((x) & 0x3) << 0)
+#       define NI_INPUT_CSC_BYPASS                     0
+#       define NI_INPUT_CSC_PROG_COEFF                 1
+#       define NI_INPUT_CSC_PROG_SHARED_MATRIXA        2
+#       define NI_INPUT_CSC_OVL_MODE(x)                (((x) & 0x3) << 4)
+
+#define NI_OUTPUT_CSC_CONTROL                          0x68f0
+#       define NI_OUTPUT_CSC_GRPH_MODE(x)              (((x) & 0x7) << 0)
+#       define NI_OUTPUT_CSC_BYPASS                    0
+#       define NI_OUTPUT_CSC_TV_RGB                    1
+#       define NI_OUTPUT_CSC_YCBCR_601                 2
+#       define NI_OUTPUT_CSC_YCBCR_709                 3
+#       define NI_OUTPUT_CSC_PROG_COEFF                4
+#       define NI_OUTPUT_CSC_PROG_SHARED_MATRIXB       5
+#       define NI_OUTPUT_CSC_OVL_MODE(x)               (((x) & 0x7) << 4)
+
+#define NI_DEGAMMA_CONTROL                             0x6960
+#       define NI_GRPH_DEGAMMA_MODE(x)                 (((x) & 0x3) << 0)
+#       define NI_DEGAMMA_BYPASS                       0
+#       define NI_DEGAMMA_SRGB_24                      1
+#       define NI_DEGAMMA_XVYCC_222                    2
+#       define NI_OVL_DEGAMMA_MODE(x)                  (((x) & 0x3) << 4)
+#       define NI_ICON_DEGAMMA_MODE(x)                 (((x) & 0x3) << 8)
+#       define NI_CURSOR_DEGAMMA_MODE(x)               (((x) & 0x3) << 12)
+
+#define NI_GAMUT_REMAP_CONTROL                         0x6964
+#       define NI_GRPH_GAMUT_REMAP_MODE(x)             (((x) & 0x3) << 0)
+#       define NI_GAMUT_REMAP_BYPASS                   0
+#       define NI_GAMUT_REMAP_PROG_COEFF               1
+#       define NI_GAMUT_REMAP_PROG_SHARED_MATRIXA      2
+#       define NI_GAMUT_REMAP_PROG_SHARED_MATRIXB      3
+#       define NI_OVL_GAMUT_REMAP_MODE(x)              (((x) & 0x3) << 4)
+
+#define NI_REGAMMA_CONTROL                             0x6a80
+#       define NI_GRPH_REGAMMA_MODE(x)                 (((x) & 0x7) << 0)
+#       define NI_REGAMMA_BYPASS                       0
+#       define NI_REGAMMA_SRGB_24                      1
+#       define NI_REGAMMA_XVYCC_222                    2
+#       define NI_REGAMMA_PROG_A                       3
+#       define NI_REGAMMA_PROG_B                       4
+#       define NI_OVL_REGAMMA_MODE(x)                  (((x) & 0x7) << 4)
+
+#endif
diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h
index 3369ce9..3cd4dac 100644
--- a/drivers/gpu/drm/radeon/radeon_reg.h
+++ b/drivers/gpu/drm/radeon/radeon_reg.h
@@ -55,6 +55,7 @@
 #include "r500_reg.h"
 #include "r600_reg.h"
 #include "evergreen_reg.h"
+#include "ni_reg.h"
 
 #define RADEON_MC_AGP_LOCATION		0x014c
 #define		RADEON_MC_AGP_START_MASK	0x0000FFFF
-- 
1.7.1.1

  parent reply	other threads:[~2011-01-07  2:20 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-07  2:19 [PATCH 0/25] drm/radeon/kms: Add support for NI (Northern Islands) Alex Deucher
2011-01-07  2:19 ` [PATCH 01/25] drm/radeon/kms: clean up ASIC_IS_DCE41() macro Alex Deucher
2011-01-07  2:19 ` [PATCH 02/25] drm/radeon/kms: add NI chip families Alex Deucher
2011-01-07  2:19 ` [PATCH 03/25] drm/radeon/kms: update display watermark calculations for DCE5 Alex Deucher
2011-01-07  2:19 ` [PATCH 04/25] drm/radeon/kms: DCE5 supports 16k display surfaces Alex Deucher
2011-01-07  2:19 ` [PATCH 05/25] drm/radeon/kms: DCE5 atom SetPixelClock updates Alex Deucher
2011-01-07  2:19 ` [PATCH 06/25] drm/radeon/kms: DCE5 atom spread spectrum updates Alex Deucher
2011-01-07  2:19 ` [PATCH 07/25] drm/radeon/kms: DCE5 atom transmitter control updates Alex Deucher
2011-01-07  2:19 ` [PATCH 08/25] drm/radeon/kms: DCE5 atom dig encoder updates Alex Deucher
2011-01-07  2:19 ` [PATCH 09/25] drm/radeon/kms: dac dpms updates for DCE5 Alex Deucher
2011-01-07  2:19 ` [PATCH 10/25] drm/radeon/kms: dvo " Alex Deucher
2011-01-07  2:19 ` [PATCH 11/25] drm/radeon/kms: parse DCE5 encoder caps when setting up encoders Alex Deucher
2011-01-07  2:19 ` [PATCH 12/25] drm/radeon/kms: handle NI thermal controller Alex Deucher
2011-01-07  2:19 ` [PATCH 13/25] drm/radeon/kms: add disabled vbios accessor for NI asics Alex Deucher
2011-01-07  2:19 ` [PATCH 14/25] drm/radeon/kms: fill gpu init " Alex Deucher
2011-01-07  2:19 ` [PATCH 15/25] drm/radeon/kms: add backend map workaround for barts Alex Deucher
2011-01-07  2:19 ` [PATCH 16/25] drm/radeon/kms: adjust default clock/vddc tracking for pm on DCE5 Alex Deucher
2011-01-07  2:19 ` [PATCH 17/25] drm/radeon/kms: always use writeback/events for fences on NI Alex Deucher
2011-01-07  2:19 ` [PATCH 18/25] drm/radeon/kms: add bo blit support for NI Alex Deucher
2011-01-07  2:19 ` Alex Deucher [this message]
2011-01-07  2:19 ` [PATCH 20/25] drm/radeon/kms: add support for DCE5 display LUTs Alex Deucher
2011-01-07  2:19 ` [PATCH 21/25] drm/radeon/kms: add ucode loader for NI Alex Deucher
2011-01-07  2:19 ` [PATCH 22/25] drm/radeon/kms/ni: load default sclk/mclk/vddc at pm init Alex Deucher
2011-01-07  2:19 ` [PATCH 23/25] drm/radeon/kms: add radeon_asic struct for NI asics Alex Deucher
2011-01-07  2:19 ` [PATCH 24/25] drm/radeon/kms: don't enable pcie gen2 on NI yet Alex Deucher
2011-01-07  2:19 ` [PATCH 25/25] drm/radeon/kms: add NI pci ids Alex Deucher

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=1294366775-1605-20-git-send-email-alexdeucher@gmail.com \
    --to=alexdeucher@gmail.com \
    --cc=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;
as well as URLs for NNTP newsgroup(s).