[PATCH] drm/msm: Fix compil issue when DRM_MSM_FBDEV is disabled

[PATCH] drm/msm: Fix compil issue when DRM_MSM_FBDEV is disabled

[Stephane Viau]

When CONFIG_DRM_MSM_FBDEV is not defined,
CONFIG_DRM_KMS_FB_HELPER does not get selected and
drm_fb_helper_*() helper functions are thus not available.

This change fixes these link issues.

Signed-off-by: Stephane Viau <sviau@codeaurora.org>
---
 drivers/gpu/drm/msm/msm_drv.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 2b1218c..35380ec 100644
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -21,9 +21,11 @@
 
 static void msm_fb_output_poll_changed(struct drm_device *dev)
 {
+#ifdef DRM_MSM_FBDEV
 	struct msm_drm_private *priv = dev->dev_private;
 	if (priv->fbdev)
 		drm_fb_helper_hotplug_event(priv->fbdev);
+#endif
 }
 
 static const struct drm_mode_config_funcs mode_config_funcs = {
@@ -419,9 +421,11 @@ static void msm_preclose(struct drm_device *dev, struct drm_file *file)
 
 static void msm_lastclose(struct drm_device *dev)
 {
+#ifdef DRM_MSM_FBDEV
 	struct msm_drm_private *priv = dev->dev_private;
 	if (priv->fbdev)
 		drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev);
+#endif
 }
 
 static irqreturn_t msm_irq(int irq, void *arg)
-- 
Qualcomm Innovation Center, Inc.

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project

Re: [PATCH] drm/msm: Fix compil issue when DRM_MSM_FBDEV is disabled

[Rob Clark]

On Wed, May 6, 2015 at 9:25 AM, Stephane Viau <sviau@codeaurora.org> wrote:
> When CONFIG_DRM_MSM_FBDEV is not defined,
> CONFIG_DRM_KMS_FB_HELPER does not get selected and
> drm_fb_helper_*() helper functions are thus not available.
>
> This change fixes these link issues.

Hmm, didn't Archit start on making fbdev config option global and
adding nop-stubs for the case that it was disabled?  I lost track of
where that was going..

BR,
-R

> Signed-off-by: Stephane Viau <sviau@codeaurora.org>
> ---
>  drivers/gpu/drm/msm/msm_drv.c | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
> index 2b1218c..35380ec 100644
> --- a/drivers/gpu/drm/msm/msm_drv.c
> +++ b/drivers/gpu/drm/msm/msm_drv.c
> @@ -21,9 +21,11 @@
>
>  static void msm_fb_output_poll_changed(struct drm_device *dev)
>  {
> +#ifdef DRM_MSM_FBDEV
>         struct msm_drm_private *priv = dev->dev_private;
>         if (priv->fbdev)
>                 drm_fb_helper_hotplug_event(priv->fbdev);
> +#endif
>  }
>
>  static const struct drm_mode_config_funcs mode_config_funcs = {
> @@ -419,9 +421,11 @@ static void msm_preclose(struct drm_device *dev, struct drm_file *file)
>
>  static void msm_lastclose(struct drm_device *dev)
>  {
> +#ifdef DRM_MSM_FBDEV
>         struct msm_drm_private *priv = dev->dev_private;
>         if (priv->fbdev)
>                 drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev);
> +#endif
>  }
>
>  static irqreturn_t msm_irq(int irq, void *arg)
> --
> Qualcomm Innovation Center, Inc.
>
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
>

Re: [PATCH] drm/msm: Fix compil issue when DRM_MSM_FBDEV is disabled

["Stéphane Viau"]

> On Wed, May 6, 2015 at 9:25 AM, Stephane Viau <sviau@codeaurora.org>
> wrote:
>> When CONFIG_DRM_MSM_FBDEV is not defined,
>> CONFIG_DRM_KMS_FB_HELPER does not get selected and
>> drm_fb_helper_*() helper functions are thus not available.
>>
>> This change fixes these link issues.
>
> Hmm, didn't Archit start on making fbdev config option global and
> adding nop-stubs for the case that it was disabled?  I lost track of
> where that was going..

Oh right... https://lkml.org/lkml/2015/2/23/99
I'll take my patch back then ;-)

Thanks,
Stephane.

>
> BR,
> -R
>
>> Signed-off-by: Stephane Viau <sviau@codeaurora.org>
>> ---
>>  drivers/gpu/drm/msm/msm_drv.c | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/msm/msm_drv.c
>> b/drivers/gpu/drm/msm/msm_drv.c
>> index 2b1218c..35380ec 100644
>> --- a/drivers/gpu/drm/msm/msm_drv.c
>> +++ b/drivers/gpu/drm/msm/msm_drv.c
>> @@ -21,9 +21,11 @@
>>
>>  static void msm_fb_output_poll_changed(struct drm_device *dev)
>>  {
>> +#ifdef DRM_MSM_FBDEV
>>         struct msm_drm_private *priv = dev->dev_private;
>>         if (priv->fbdev)
>>                 drm_fb_helper_hotplug_event(priv->fbdev);
>> +#endif
>>  }
>>
>>  static const struct drm_mode_config_funcs mode_config_funcs = {
>> @@ -419,9 +421,11 @@ static void msm_preclose(struct drm_device *dev,
>> struct drm_file *file)
>>
>>  static void msm_lastclose(struct drm_device *dev)
>>  {
>> +#ifdef DRM_MSM_FBDEV
>>         struct msm_drm_private *priv = dev->dev_private;
>>         if (priv->fbdev)
>>                 drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev);
>> +#endif
>>  }
>>
>>  static irqreturn_t msm_irq(int irq, void *arg)
>> --
>> Qualcomm Innovation Center, Inc.
>>
>> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora
>> Forum, a Linux Foundation Collaborative Project
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-arm-msm"
> in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>


-- 
Qualcomm Innovation Center, Inc.

The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH] drm/msm: Fix compil issue when DRM_MSM_FBDEV is disabled

[Archit Taneja]

Hi,

On 05/06/2015 07:58 PM, Rob Clark wrote:
> On Wed, May 6, 2015 at 9:25 AM, Stephane Viau <sviau@codeaurora.org> wrote:
>> When CONFIG_DRM_MSM_FBDEV is not defined,
>> CONFIG_DRM_KMS_FB_HELPER does not get selected and
>> drm_fb_helper_*() helper functions are thus not available.
>>
>> This change fixes these link issues.
>
> Hmm, didn't Archit start on making fbdev config option global and
> adding nop-stubs for the case that it was disabled?  I lost track of
> where that was going..

Daniel and I had thought of a possible solution. I had started working
on it, but it's still work in progress. It required more things to do
than originally thought of.

I don't know if that work will make it in time for 4.2. Maybe we could
pull this for the time being?

Archit

>
> BR,
> -R
>
>> Signed-off-by: Stephane Viau <sviau@codeaurora.org>
>> ---
>>   drivers/gpu/drm/msm/msm_drv.c | 4 ++++
>>   1 file changed, 4 insertions(+)
>>
>> diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
>> index 2b1218c..35380ec 100644
>> --- a/drivers/gpu/drm/msm/msm_drv.c
>> +++ b/drivers/gpu/drm/msm/msm_drv.c
>> @@ -21,9 +21,11 @@
>>
>>   static void msm_fb_output_poll_changed(struct drm_device *dev)
>>   {
>> +#ifdef DRM_MSM_FBDEV
>>          struct msm_drm_private *priv = dev->dev_private;
>>          if (priv->fbdev)
>>                  drm_fb_helper_hotplug_event(priv->fbdev);
>> +#endif
>>   }
>>
>>   static const struct drm_mode_config_funcs mode_config_funcs = {
>> @@ -419,9 +421,11 @@ static void msm_preclose(struct drm_device *dev, struct drm_file *file)
>>
>>   static void msm_lastclose(struct drm_device *dev)
>>   {
>> +#ifdef DRM_MSM_FBDEV
>>          struct msm_drm_private *priv = dev->dev_private;
>>          if (priv->fbdev)
>>                  drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev);
>> +#endif
>>   }
>>
>>   static irqreturn_t msm_irq(int irq, void *arg)
>> --
>> Qualcomm Innovation Center, Inc.
>>
>> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

Re: [PATCH] drm/msm: Fix compil issue when DRM_MSM_FBDEV is disabled

[Rob Clark]

On Thu, May 7, 2015 at 4:13 AM, Archit Taneja <architt@codeaurora.org> wrote:
> Hi,
>
> On 05/06/2015 07:58 PM, Rob Clark wrote:
>>
>> On Wed, May 6, 2015 at 9:25 AM, Stephane Viau <sviau@codeaurora.org>
>> wrote:
>>>
>>> When CONFIG_DRM_MSM_FBDEV is not defined,
>>> CONFIG_DRM_KMS_FB_HELPER does not get selected and
>>> drm_fb_helper_*() helper functions are thus not available.
>>>
>>> This change fixes these link issues.
>>
>>
>> Hmm, didn't Archit start on making fbdev config option global and
>> adding nop-stubs for the case that it was disabled?  I lost track of
>> where that was going..
>
>
> Daniel and I had thought of a possible solution. I had started working
> on it, but it's still work in progress. It required more things to do
> than originally thought of.
>
> I don't know if that work will make it in time for 4.2. Maybe we could
> pull this for the time being?

Ok, then I'll pull in this change for the time being..

BR,
-R

> Archit
>
>>
>> BR,
>> -R
>>
>>> Signed-off-by: Stephane Viau <sviau@codeaurora.org>
>>> ---
>>>   drivers/gpu/drm/msm/msm_drv.c | 4 ++++
>>>   1 file changed, 4 insertions(+)
>>>
>>> diff --git a/drivers/gpu/drm/msm/msm_drv.c
>>> b/drivers/gpu/drm/msm/msm_drv.c
>>> index 2b1218c..35380ec 100644
>>> --- a/drivers/gpu/drm/msm/msm_drv.c
>>> +++ b/drivers/gpu/drm/msm/msm_drv.c
>>> @@ -21,9 +21,11 @@
>>>
>>>   static void msm_fb_output_poll_changed(struct drm_device *dev)
>>>   {
>>> +#ifdef DRM_MSM_FBDEV
>>>          struct msm_drm_private *priv = dev->dev_private;
>>>          if (priv->fbdev)
>>>                  drm_fb_helper_hotplug_event(priv->fbdev);
>>> +#endif
>>>   }
>>>
>>>   static const struct drm_mode_config_funcs mode_config_funcs = {
>>> @@ -419,9 +421,11 @@ static void msm_preclose(struct drm_device *dev,
>>> struct drm_file *file)
>>>
>>>   static void msm_lastclose(struct drm_device *dev)
>>>   {
>>> +#ifdef DRM_MSM_FBDEV
>>>          struct msm_drm_private *priv = dev->dev_private;
>>>          if (priv->fbdev)
>>>                  drm_fb_helper_restore_fbdev_mode_unlocked(priv->fbdev);
>>> +#endif
>>>   }
>>>
>>>   static irqreturn_t msm_irq(int irq, void *arg)
>>> --
>>> Qualcomm Innovation Center, Inc.
>>>
>>> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora
>>> Forum, a Linux Foundation Collaborative Project
>>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-arm-msm"
>> in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>>
>
> --
> Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
>
> a Linux Foundation Collaborative Project