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

Archit Taneja architt at codeaurora.org
Thu May 7 01:13:30 PDT 2015


Hi,

On 05/06/2015 07:58 PM, Rob Clark wrote:
> On Wed, May 6, 2015 at 9:25 AM, Stephane Viau <sviau at 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 at 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 at 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


More information about the dri-devel mailing list