| Message ID | 1408096373-16929-1-git-send-email-deathsimple@vodafone.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Aug 15, 2014 at 5:52 AM, Christian König <deathsimple@vodafone.de> wrote: > From: Christian König <christian.koenig@amd.com> > > Instead of hard coding the value properly document > that this is an userspace interface. > > No intended functional change. > > Signed-off-by: Christian König <christian.koenig@amd.com> Applied to my fixes tree. thanks! Alex > --- > drivers/gpu/drm/radeon/radeon_cs.c | 3 ++- > include/uapi/drm/radeon_drm.h | 1 + > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c > index ee712c1..cb12df7 100644 > --- a/drivers/gpu/drm/radeon/radeon_cs.c > +++ b/drivers/gpu/drm/radeon/radeon_cs.c > @@ -132,7 +132,8 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p) > * the buffers used for read only, which doubles the range > * to 0 to 31. 32 is reserved for the kernel driver. > */ > - priority = (r->flags & 0xf) * 2 + !!r->write_domain; > + priority = (r->flags & RADEON_RELOC_PRIO_MASK) * 2 > + + !!r->write_domain; > > /* the first reloc of an UVD job is the msg and that must be in > VRAM, also but everything into VRAM on AGP cards to avoid > diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h > index 509b2d7..fea6099 100644 > --- a/include/uapi/drm/radeon_drm.h > +++ b/include/uapi/drm/radeon_drm.h > @@ -944,6 +944,7 @@ struct drm_radeon_cs_chunk { > }; > > /* drm_radeon_cs_reloc.flags */ > +#define RADEON_RELOC_PRIO_MASK (0xf << 0) > > struct drm_radeon_cs_reloc { > uint32_t handle; > -- > 1.9.1 >
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index ee712c1..cb12df7 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c @@ -132,7 +132,8 @@ static int radeon_cs_parser_relocs(struct radeon_cs_parser *p) * the buffers used for read only, which doubles the range * to 0 to 31. 32 is reserved for the kernel driver. */ - priority = (r->flags & 0xf) * 2 + !!r->write_domain; + priority = (r->flags & RADEON_RELOC_PRIO_MASK) * 2 + + !!r->write_domain; /* the first reloc of an UVD job is the msg and that must be in VRAM, also but everything into VRAM on AGP cards to avoid diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm.h index 509b2d7..fea6099 100644 --- a/include/uapi/drm/radeon_drm.h +++ b/include/uapi/drm/radeon_drm.h @@ -944,6 +944,7 @@ struct drm_radeon_cs_chunk { }; /* drm_radeon_cs_reloc.flags */ +#define RADEON_RELOC_PRIO_MASK (0xf << 0) struct drm_radeon_cs_reloc { uint32_t handle;