4d1defd724
Fixes a regression introduced by 58bbb63720c8997e0136fe1884101e7ca40d68fd (fdo bug 29324). Reported-by: Johannes Obermayr <johannesobermayr@gmx.de> Signed-off-by: Francisco Jerez <currojerez@riseup.net> Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
96 lines
2.6 KiB
C
96 lines
2.6 KiB
C
/*
|
|
* Copyright (C) 2010 Francisco Jerez.
|
|
* All Rights Reserved.
|
|
*
|
|
* 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 (including the
|
|
* next paragraph) 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 OWNER(S) AND/OR ITS SUPPLIERS 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.
|
|
*
|
|
*/
|
|
|
|
#include "drmP.h"
|
|
#include "drm.h"
|
|
#include "nouveau_drv.h"
|
|
#include "nouveau_drm.h"
|
|
|
|
static int
|
|
calc_bias(struct drm_device *dev, int k, int i, int j)
|
|
{
|
|
struct drm_nouveau_private *dev_priv = dev->dev_private;
|
|
int b = (dev_priv->chipset > 0x30 ?
|
|
nv_rd32(dev, 0x122c + 0x10 * k + 0x4 * j) >> (4 * (i ^ 1)) :
|
|
0) & 0xf;
|
|
|
|
return 2 * (b & 0x8 ? b - 0x10 : b);
|
|
}
|
|
|
|
static int
|
|
calc_ref(struct drm_device *dev, int l, int k, int i)
|
|
{
|
|
int j, x = 0;
|
|
|
|
for (j = 0; j < 4; j++) {
|
|
int m = (l >> (8 * i) & 0xff) + calc_bias(dev, k, i, j);
|
|
|
|
x |= (0x80 | clamp(m, 0, 0x1f)) << (8 * j);
|
|
}
|
|
|
|
return x;
|
|
}
|
|
|
|
int
|
|
nv30_fb_init(struct drm_device *dev)
|
|
{
|
|
struct drm_nouveau_private *dev_priv = dev->dev_private;
|
|
struct nouveau_fb_engine *pfb = &dev_priv->engine.fb;
|
|
int i, j;
|
|
|
|
pfb->num_tiles = NV10_PFB_TILE__SIZE;
|
|
|
|
/* Turn all the tiling regions off. */
|
|
for (i = 0; i < pfb->num_tiles; i++)
|
|
pfb->set_region_tiling(dev, i, 0, 0, 0);
|
|
|
|
/* Init the memory timing regs at 0x10037c/0x1003ac */
|
|
if (dev_priv->chipset == 0x30 ||
|
|
dev_priv->chipset == 0x31 ||
|
|
dev_priv->chipset == 0x35) {
|
|
/* Related to ROP count */
|
|
int n = (dev_priv->chipset == 0x31 ? 2 : 4);
|
|
int l = nv_rd32(dev, 0x1003d0);
|
|
|
|
for (i = 0; i < n; i++) {
|
|
for (j = 0; j < 3; j++)
|
|
nv_wr32(dev, 0x10037c + 0xc * i + 0x4 * j,
|
|
calc_ref(dev, l, 0, j));
|
|
|
|
for (j = 0; j < 2; j++)
|
|
nv_wr32(dev, 0x1003ac + 0x8 * i + 0x4 * j,
|
|
calc_ref(dev, l, 1, j));
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
nv30_fb_takedown(struct drm_device *dev)
|
|
{
|
|
}
|