diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-04-02 04:08:34 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-04-02 04:08:34 +0200 |
| commit | 809609a5d8427b0025304dbb69a84a692d11c4f9 (patch) | |
| tree | 95a544cda32d36e4a9ee1ce27c527406c54d91b4 /drivers/gpu/drm/radeon/evergreen_cs.c | |
| parent | ARM: shmobile: r8a7779: Remove INTC function GPIOs (diff) | |
| parent | ARM: shmobile: r8a7790 SoC 64-bit DT support (diff) | |
| download | linux-809609a5d8427b0025304dbb69a84a692d11c4f9.tar.xz linux-809609a5d8427b0025304dbb69a84a692d11c4f9.zip | |
Merge branch 'soc' into pinmux-base
Conflicts:
drivers/pinctrl/sh-pfc/pfc-r8a7740.c
This merge is to provide r8a73a4 SoC files, which are added in the
soc branch and depended on by r8a73a4 pfc-changes which are to
be added to the pinmux branch.
Diffstat (limited to 'drivers/gpu/drm/radeon/evergreen_cs.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/evergreen_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c index 99fb13286fd0..eb8ac315f92f 100644 --- a/drivers/gpu/drm/radeon/evergreen_cs.c +++ b/drivers/gpu/drm/radeon/evergreen_cs.c @@ -834,7 +834,7 @@ static int evergreen_cs_track_validate_texture(struct radeon_cs_parser *p, __func__, __LINE__, toffset, surf.base_align); return -EINVAL; } - if (moffset & (surf.base_align - 1)) { + if (surf.nsamples <= 1 && moffset & (surf.base_align - 1)) { dev_warn(p->dev, "%s:%d mipmap bo base %ld not aligned with %ld\n", __func__, __LINE__, moffset, surf.base_align); return -EINVAL; |