[PATCH v3 10/22] drm/imx: Use drm_gem_fb_create() and drm_gem_fb_prepare_fb()

[Noralf Trønnes]

Den 11.09.2017 09.57, skrev Philipp Zabel:
> Hi Noralf,
>
> On Sun, 2017-08-13 at 15:31 +0200, Noralf Trønnes wrote:
>> drm_fb_cma_create() and drm_fb_cma_prepare_fb() are just wrappers now,
>> use drm_gem_fb_create() and drm_gem_fb_prepare_fb() directly.
>>
>>> Cc: Philipp Zabel <p.zabel at pengutronix.de>
>>> Signed-off-by: Noralf Trønnes <noralf at tronnes.org>
>> ---
>>   drivers/gpu/drm/imx/imx-drm-core.c | 3 ++-
>>   drivers/gpu/drm/imx/ipuv3-plane.c  | 3 ++-
>>   2 files changed, 4 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c
>> index f91cb72..93c7e3f 100644
>> --- a/drivers/gpu/drm/imx/imx-drm-core.c
>> +++ b/drivers/gpu/drm/imx/imx-drm-core.c
>> @@ -24,6 +24,7 @@
>>   #include <drm/drm_fb_helper.h>
>>   #include <drm/drm_crtc_helper.h>
>>   #include <drm/drm_gem_cma_helper.h>
>> +#include <drm/drm_gem_framebuffer_helper.h>
>>   #include <drm/drm_fb_cma_helper.h>
>>   #include <drm/drm_plane_helper.h>
>>   #include <drm/drm_of.h>
>> @@ -105,7 +106,7 @@ static int imx_drm_atomic_check(struct drm_device *dev,
>>   }
>>   
>>   static const struct drm_mode_config_funcs imx_drm_mode_config_funcs = {
>>> -	.fb_create = drm_fb_cma_create,
>>> +	.fb_create = drm_gem_fb_create,
>>>   	.output_poll_changed = imx_drm_output_poll_changed,
>>>   	.atomic_check = imx_drm_atomic_check,
>>>   	.atomic_commit = drm_atomic_helper_commit,
>> diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
>> index debde2d..82e1c50 100644
>> --- a/drivers/gpu/drm/imx/ipuv3-plane.c
>> +++ b/drivers/gpu/drm/imx/ipuv3-plane.c
>> @@ -18,6 +18,7 @@
>>   #include <drm/drm_atomic_helper.h>
>>   #include <drm/drm_fb_cma_helper.h>
>>   #include <drm/drm_gem_cma_helper.h>
>> +#include <drm/drm_gem_framebuffer_helper.h>
>>   #include <drm/drm_plane_helper.h>
>>   
>>   #include "video/imx-ipu-v3.h"
>> @@ -661,7 +662,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
>>   }
>>   
>>   static const struct drm_plane_helper_funcs ipu_plane_helper_funcs = {
>>> -	.prepare_fb = drm_fb_cma_prepare_fb,
>>> +	.prepare_fb = drm_gem_fb_prepare_fb,
>>>   	.atomic_check = ipu_plane_atomic_check,
>>>   	.atomic_disable = ipu_plane_atomic_disable,
>>>   	.atomic_update = ipu_plane_atomic_update,
> Acked-by: Philipp Zabel <p.zabel at pengutronix.de>

Thanks, applied to drm-misc.

Noralf.