diff mbox

[3/6] drm/amd/amdgpu: Set DRIVER_MODESET feature flag at build time

Message ID 1466788520-21325-4-git-send-email-frank.binns@imgtec.com (mailing list archive)
State New, archived
Headers show

Commit Message

Frank Binns June 24, 2016, 5:15 p.m. UTC 
This flag was being set unconditionally at runtime so just set it at
compile time instead.

Signed-off-by: Frank Binns <frank.binns@imgtec.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Alex Deucher June 24, 2016, 10:08 p.m. UTC | #1 
On Fri, Jun 24, 2016 at 1:15 PM, Frank Binns <frank.binns@imgtec.com> wrote:
> This flag was being set unconditionally at runtime so just set it at
> compile time instead.
>
> Signed-off-by: Frank Binns <frank.binns@imgtec.com>

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

Do you want to take this as part of the patch set, or should I apply
this to my tree?

Alex

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index f888c01..7fe7f3c 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -515,7 +515,7 @@ static struct drm_driver kms_driver = {
>         .driver_features =
>             DRIVER_USE_AGP |
>             DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |
> -           DRIVER_PRIME | DRIVER_RENDER,
> +           DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET,
>         .dev_priv_size = 0,
>         .load = amdgpu_driver_load_kms,
>         .open = amdgpu_driver_open_kms,
> @@ -590,7 +590,6 @@ static int __init amdgpu_init(void)
>         DRM_INFO("amdgpu kernel modesetting enabled.\n");
>         driver = &kms_driver;
>         pdriver = &amdgpu_kms_pci_driver;
> -       driver->driver_features |= DRIVER_MODESET;
>         driver->num_ioctls = amdgpu_max_kms_ioctl;
>         amdgpu_register_atpx_handler();
>         /* let modprobe override vga console setting */
> --
> 2.7.4
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Frank Binns June 27, 2016, 9:37 a.m. UTC | #2 
On 24/06/16 23:08, Alex Deucher wrote:
> On Fri, Jun 24, 2016 at 1:15 PM, Frank Binns <frank.binns@imgtec.com> wrote:
>> This flag was being set unconditionally at runtime so just set it at
>> compile time instead.
>>
>> Signed-off-by: Frank Binns <frank.binns@imgtec.com>
> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>
> Do you want to take this as part of the patch set, or should I apply
> this to my tree?
>
> Alex

This patch is independent of the rest so I'm happy for you to
apply it to your tree.

Thanks
Frank

>
>> ---
>>   drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +--
>>   1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>> index f888c01..7fe7f3c 100644
>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>> @@ -515,7 +515,7 @@ static struct drm_driver kms_driver = {
>>          .driver_features =
>>              DRIVER_USE_AGP |
>>              DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |
>> -           DRIVER_PRIME | DRIVER_RENDER,
>> +           DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET,
>>          .dev_priv_size = 0,
>>          .load = amdgpu_driver_load_kms,
>>          .open = amdgpu_driver_open_kms,
>> @@ -590,7 +590,6 @@ static int __init amdgpu_init(void)
>>          DRM_INFO("amdgpu kernel modesetting enabled.\n");
>>          driver = &kms_driver;
>>          pdriver = &amdgpu_kms_pci_driver;
>> -       driver->driver_features |= DRIVER_MODESET;
>>          driver->num_ioctls = amdgpu_max_kms_ioctl;
>>          amdgpu_register_atpx_handler();
>>          /* let modprobe override vga console setting */
>> --
>> 2.7.4
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Alex Deucher June 27, 2016, 3:51 p.m. UTC | #3 
On Mon, Jun 27, 2016 at 5:37 AM, Frank Binns <frank.binns@imgtec.com> wrote:
> On 24/06/16 23:08, Alex Deucher wrote:
>>
>> On Fri, Jun 24, 2016 at 1:15 PM, Frank Binns <frank.binns@imgtec.com>
>> wrote:
>>>
>>> This flag was being set unconditionally at runtime so just set it at
>>> compile time instead.
>>>
>>> Signed-off-by: Frank Binns <frank.binns@imgtec.com>
>>
>> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
>>
>> Do you want to take this as part of the patch set, or should I apply
>> this to my tree?
>>
>> Alex
>
>
> This patch is independent of the rest so I'm happy for you to
> apply it to your tree.
>

Applied.  thanks!

Alex

> Thanks
> Frank
>
>
>>
>>> ---
>>>   drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +--
>>>   1 file changed, 1 insertion(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>>> b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>>> index f888c01..7fe7f3c 100644
>>> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>>> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
>>> @@ -515,7 +515,7 @@ static struct drm_driver kms_driver = {
>>>          .driver_features =
>>>              DRIVER_USE_AGP |
>>>              DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |
>>> -           DRIVER_PRIME | DRIVER_RENDER,
>>> +           DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET,
>>>          .dev_priv_size = 0,
>>>          .load = amdgpu_driver_load_kms,
>>>          .open = amdgpu_driver_open_kms,
>>> @@ -590,7 +590,6 @@ static int __init amdgpu_init(void)
>>>          DRM_INFO("amdgpu kernel modesetting enabled.\n");
>>>          driver = &kms_driver;
>>>          pdriver = &amdgpu_kms_pci_driver;
>>> -       driver->driver_features |= DRIVER_MODESET;
>>>          driver->num_ioctls = amdgpu_max_kms_ioctl;
>>>          amdgpu_register_atpx_handler();
>>>          /* let modprobe override vga console setting */
>>> --
>>> 2.7.4
>>>
>>> _______________________________________________
>>> dri-devel mailing list
>>> dri-devel@lists.freedesktop.org
>>> https://lists.freedesktop.org/mailman/listinfo/dri-devel
>
>
diff mbox

Patch

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
index f888c01..7fe7f3c 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
@@ -515,7 +515,7 @@  static struct drm_driver kms_driver = {
 	.driver_features =
 	    DRIVER_USE_AGP |
 	    DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM |
-	    DRIVER_PRIME | DRIVER_RENDER,
+	    DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET,
 	.dev_priv_size = 0,
 	.load = amdgpu_driver_load_kms,
 	.open = amdgpu_driver_open_kms,
@@ -590,7 +590,6 @@  static int __init amdgpu_init(void)
 	DRM_INFO("amdgpu kernel modesetting enabled.\n");
 	driver = &kms_driver;
 	pdriver = &amdgpu_kms_pci_driver;
-	driver->driver_features |= DRIVER_MODESET;
 	driver->num_ioctls = amdgpu_max_kms_ioctl;
 	amdgpu_register_atpx_handler();
 	/* let modprobe override vga console setting */