Commit 82d118ef authored by Alex Deucher's avatar Alex Deucher Committed by Dave Airlie
Browse files

drm/radeon/kms: fix up atom HPD gpio parsing for DCE6 



Signed-off-by: default avatarAlex Deucher <alexdeucher@gmail.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent 43b3cd99

drivers/gpu/drm/radeon/radeon_atombios.c

+3 −1
Original line number Diff line number Diff line
@@ -253,7 +253,9 @@ static struct radeon_hpd radeon_atom_get_hpd_info_from_gpio(struct radeon_device 


	memset(&hpd, 0, sizeof(struct radeon_hpd));



	if (ASIC_IS_DCE4(rdev))

	if (ASIC_IS_DCE6(rdev))

		reg = SI_DC_GPIO_HPD_A;

	else if (ASIC_IS_DCE4(rdev))

		reg = EVERGREEN_DC_GPIO_HPD_A;

	else

		reg = AVIVO_DC_GPIO_HPD_A;

drivers/gpu/drm/radeon/radeon_reg.h

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ 
#include "r600_reg.h"

#include "evergreen_reg.h"

#include "ni_reg.h"

#include "si_reg.h"



#define RADEON_MC_AGP_LOCATION		0x014c

#define		RADEON_MC_AGP_START_MASK	0x0000FFFF

drivers/gpu/drm/radeon/si_reg.h

0 → 100644
+33 −0
Original line number Diff line number Diff line 
/*

 * 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 __SI_REG_H__

#define __SI_REG_H__



/* SI */

#define SI_DC_GPIO_HPD_MASK                      0x65b0

#define SI_DC_GPIO_HPD_A                         0x65b4

#define SI_DC_GPIO_HPD_EN                        0x65b8

#define SI_DC_GPIO_HPD_Y                         0x65bc



#endif