[PATCH] drm/radeon: fix UPLL_REF_DIV_MASK definition

Alex Deucher alexdeucher at gmail.com
Mon Apr 29 07:22:57 PDT 2013


On Mon, Apr 29, 2013 at 4:20 AM, Christian König
<deathsimple at vodafone.de> wrote:
> From: Christian König <christian.koenig at amd.com>
>
> Stupid copy & paste error over all generations.

Applied to my tree.

Alex

>
> Signed-off-by: Christian König <christian.koenig at amd.com>
> ---
>  drivers/gpu/drm/radeon/evergreend.h |    2 +-
>  drivers/gpu/drm/radeon/rv770d.h     |    2 +-
>  drivers/gpu/drm/radeon/sid.h        |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/evergreend.h b/drivers/gpu/drm/radeon/evergreend.h
> index d9a0054..75c0563 100644
> --- a/drivers/gpu/drm/radeon/evergreend.h
> +++ b/drivers/gpu/drm/radeon/evergreend.h
> @@ -59,7 +59,7 @@
>  #      define UPLL_SLEEP_MASK                          0x00000002
>  #      define UPLL_BYPASS_EN_MASK                      0x00000004
>  #      define UPLL_CTLREQ_MASK                         0x00000008
> -#      define UPLL_REF_DIV_MASK                        0x001F0000
> +#      define UPLL_REF_DIV_MASK                        0x003F0000
>  #      define UPLL_VCO_MODE_MASK                       0x00000200
>  #      define UPLL_CTLACK_MASK                         0x40000000
>  #      define UPLL_CTLACK2_MASK                        0x80000000
> diff --git a/drivers/gpu/drm/radeon/rv770d.h b/drivers/gpu/drm/radeon/rv770d.h
> index 6a52b20..85b1626 100644
> --- a/drivers/gpu/drm/radeon/rv770d.h
> +++ b/drivers/gpu/drm/radeon/rv770d.h
> @@ -45,7 +45,7 @@
>  #      define UPLL_BYPASS_EN_MASK                      0x00000004
>  #      define UPLL_CTLREQ_MASK                         0x00000008
>  #      define UPLL_REF_DIV(x)                          ((x) << 16)
> -#      define UPLL_REF_DIV_MASK                        0x001F0000
> +#      define UPLL_REF_DIV_MASK                        0x003F0000
>  #      define UPLL_CTLACK_MASK                         0x40000000
>  #      define UPLL_CTLACK2_MASK                        0x80000000
>  #define CG_UPLL_FUNC_CNTL_2                            0x71c
> diff --git a/drivers/gpu/drm/radeon/sid.h b/drivers/gpu/drm/radeon/sid.h
> index 042b91d..222877b 100644
> --- a/drivers/gpu/drm/radeon/sid.h
> +++ b/drivers/gpu/drm/radeon/sid.h
> @@ -36,7 +36,7 @@
>  #      define UPLL_BYPASS_EN_MASK                      0x00000004
>  #      define UPLL_CTLREQ_MASK                         0x00000008
>  #      define UPLL_VCO_MODE_MASK                       0x00000600
> -#      define UPLL_REF_DIV_MASK                        0x001F0000
> +#      define UPLL_REF_DIV_MASK                        0x003F0000
>  #      define UPLL_CTLACK_MASK                         0x40000000
>  #      define UPLL_CTLACK2_MASK                        0x80000000
>  #define        CG_UPLL_FUNC_CNTL_2                             0x638
> --
> 1.7.10.4
>


More information about the dri-devel mailing list