From: "Christian König" <deathsimple@vodafone.de>
To: Alex Deucher <alexdeucher@gmail.com>
Cc: Maling list - DRI developers <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH] drm/radeon: add ring working query
Date: Tue, 09 Apr 2013 19:10:50 +0200 [thread overview]
Message-ID: <51644B9A.1080903@vodafone.de> (raw)
In-Reply-To: <CADnq5_PzqE+V3wGV1i5NNO3qvra+k9Bzt-sf_3Frg9W7_NX0QA@mail.gmail.com>
Am 09.04.2013 16:26, schrieb Alex Deucher:
> On Tue, Apr 9, 2013 at 10:13 AM, Jerome Glisse <j.glisse@gmail.com> wrote:
>> On Tue, Apr 9, 2013 at 8:44 AM, Christian König <deathsimple@vodafone.de> wrote:
>>> From: Christian König <christian.koenig@amd.com>
>>>
>>> Add new ioctl option and bumb minor version number.
>>
>> I already have the tiling patch that bump the version, but i think it's just a matter for Alex.
> I'll take care of it.
IIRC we also have another internal patch that wants to bumb the version
number.
Alex could you start with a drm-next-3.10 branch and try to merge all
that stuff?
Thanks,
Christian.
> Alex
>
>> Reviewed-by: Jerome Glisse <jglisse@redhat.com>
>>
>>>
>>> Signed-off-by: Christian König <christian.koenig@amd.com>
>>> ---
>>> drivers/gpu/drm/radeon/radeon_drv.c | 2 +-
>>> drivers/gpu/drm/radeon/radeon_kms.c | 17 +++++++++++++++++
>>> include/uapi/drm/radeon_drm.h | 2 ++
>>> 3 files changed, 20 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c
>>> index 66a7f0f..31b193b 100644
>>> --- a/drivers/gpu/drm/radeon/radeon_drv.c
>>> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
>>> @@ -73,7 +73,7 @@
>>> * 2.30.0 - fix for FMASK texturing
>>> */
>>> #define KMS_DRIVER_MAJOR 2
>>> -#define KMS_DRIVER_MINOR 30
>>> +#define KMS_DRIVER_MINOR 31
>>> #define KMS_DRIVER_PATCHLEVEL 0
>>> int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
>>> int radeon_driver_unload_kms(struct drm_device *dev);
>>> diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
>>> index 3019759..8cb9d12 100644
>>> --- a/drivers/gpu/drm/radeon/radeon_kms.c
>>> +++ b/drivers/gpu/drm/radeon/radeon_kms.c
>>> @@ -376,6 +376,23 @@ int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
>>> else
>>> return -EINVAL;
>>> break;
>>> + case RADEON_INFO_RING_WORKING:
>>> + switch (value) {
>>> + case RADEON_CS_RING_GFX:
>>> + case RADEON_CS_RING_COMPUTE:
>>> + value = rdev->ring[RADEON_RING_TYPE_GFX_INDEX]..ready;
>>> + break;
>>> + case RADEON_CS_RING_DMA:
>>> + value = rdev->ring[R600_RING_TYPE_DMA_INDEX].ready;
>>> + value |= rdev->ring[CAYMAN_RING_TYPE_DMA1_INDEX].ready;
>>> + break;
>>> + case RADEON_CS_RING_UVD:
>>> + value = rdev->ring[R600_RING_TYPE_UVD_INDEX].ready;
>>> + break;
>>> + default:
>>> + return -EINVAL;
>>> + }
>>> + break;
>>> default:
>>> DRM_DEBUG_KMS("Invalid request %d\n", info->request);
>>> return -EINVAL;
>>> diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm..h
>>> index cd085d1..8459415 100644
>>> --- a/include/uapi/drm/radeon_drm.h
>>> +++ b/include/uapi/drm/radeon_drm.h
>>> @@ -973,6 +973,8 @@ struct drm_radeon_cs {
>>> #define RADEON_INFO_MAX_SE 0x12
>>> /* max SH per SE */
>>> #define RADEON_INFO_MAX_SH_PER_SE 0x13
>>> +/* query if a RADEON_CS_RING_* submission is supported */
>>> +#define RADEON_INFO_RING_WORKING 0x14
>>>
>>> struct drm_radeon_info {
>>> uint32_t request;
>>> --
>>> 1.7.9.5
>>>
>>> _______________________________________________
>>> dri-devel mailing list
>>> dri-devel@lists.freedesktop.org
>>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>>
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>>
> On Tue, Apr 9, 2013 at 10:13 AM, Jerome Glisse <j.glisse@gmail.com> wrote:
>> On Tue, Apr 9, 2013 at 8:44 AM, Christian König <deathsimple@vodafone.de>
>> wrote:
>>> From: Christian König <christian.koenig@amd.com>
>>>
>>> Add new ioctl option and bumb minor version number.
>>
>> I already have the tiling patch that bump the version, but i think it's just
>> a matter for Alex.
>>
>> Reviewed-by: Jerome Glisse <jglisse@redhat.com>
>>
>>>
>>> Signed-off-by: Christian König <christian.koenig@amd.com>
>>> ---
>>> drivers/gpu/drm/radeon/radeon_drv.c | 2 +-
>>> drivers/gpu/drm/radeon/radeon_kms.c | 17 +++++++++++++++++
>>> include/uapi/drm/radeon_drm.h | 2 ++
>>> 3 files changed, 20 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/gpu/drm/radeon/radeon_drv.c
>>> b/drivers/gpu/drm/radeon/radeon_drv.c
>>> index 66a7f0f..31b193b 100644
>>> --- a/drivers/gpu/drm/radeon/radeon_drv.c
>>> +++ b/drivers/gpu/drm/radeon/radeon_drv.c
>>> @@ -73,7 +73,7 @@
>>> * 2.30.0 - fix for FMASK texturing
>>> */
>>> #define KMS_DRIVER_MAJOR 2
>>> -#define KMS_DRIVER_MINOR 30
>>> +#define KMS_DRIVER_MINOR 31
>>> #define KMS_DRIVER_PATCHLEVEL 0
>>> int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags);
>>> int radeon_driver_unload_kms(struct drm_device *dev);
>>> diff --git a/drivers/gpu/drm/radeon/radeon_kms.c
>>> b/drivers/gpu/drm/radeon/radeon_kms.c
>>> index 3019759..8cb9d12 100644
>>> --- a/drivers/gpu/drm/radeon/radeon_kms.c
>>> +++ b/drivers/gpu/drm/radeon/radeon_kms.c
>>> @@ -376,6 +376,23 @@ int radeon_info_ioctl(struct drm_device *dev, void
>>> *data, struct drm_file *filp)
>>> else
>>> return -EINVAL;
>>> break;
>>> + case RADEON_INFO_RING_WORKING:
>>> + switch (value) {
>>> + case RADEON_CS_RING_GFX:
>>> + case RADEON_CS_RING_COMPUTE:
>>> + value =
>>> rdev->ring[RADEON_RING_TYPE_GFX_INDEX].ready;
>>> + break;
>>> + case RADEON_CS_RING_DMA:
>>> + value =
>>> rdev->ring[R600_RING_TYPE_DMA_INDEX].ready;
>>> + value |=
>>> rdev->ring[CAYMAN_RING_TYPE_DMA1_INDEX].ready;
>>> + break;
>>> + case RADEON_CS_RING_UVD:
>>> + value =
>>> rdev->ring[R600_RING_TYPE_UVD_INDEX].ready;
>>> + break;
>>> + default:
>>> + return -EINVAL;
>>> + }
>>> + break;
>>> default:
>>> DRM_DEBUG_KMS("Invalid request %d\n", info->request);
>>> return -EINVAL;
>>> diff --git a/include/uapi/drm/radeon_drm.h b/include/uapi/drm/radeon_drm..h
>>> index cd085d1..8459415 100644
>>> --- a/include/uapi/drm/radeon_drm.h
>>> +++ b/include/uapi/drm/radeon_drm.h
>>> @@ -973,6 +973,8 @@ struct drm_radeon_cs {
>>> #define RADEON_INFO_MAX_SE 0x12
>>> /* max SH per SE */
>>> #define RADEON_INFO_MAX_SH_PER_SE 0x13
>>> +/* query if a RADEON_CS_RING_* submission is supported */
>>> +#define RADEON_INFO_RING_WORKING 0x14
>>>
>>> struct drm_radeon_info {
>>> uint32_t request;
>>> --
>>> 1.7.9.5
>>>
>>> _______________________________________________
>>> dri-devel mailing list
>>> dri-devel@lists.freedesktop.org
>>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>>
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>>
next prev parent reply other threads:[~2013-04-09 17:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-09 12:44 [PATCH] drm/radeon: add ring working query Christian König
2013-04-09 14:13 ` Jerome Glisse
2013-04-09 14:26 ` Alex Deucher
2013-04-09 17:10 ` Christian König [this message]
2013-04-09 17:14 ` Alex Deucher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51644B9A.1080903@vodafone.de \
--to=deathsimple@vodafone.de \
--cc=alexdeucher@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.