[11/21] drm/i915: Use drm_fb_helper_fill_info
diff mbox series

Message ID 20190326132008.11781-11-daniel.vetter@ffwll.ch
State New
Headers show
Series
  • [01/21] drm/fb-helper: Add fill_info() functions
Related show

Commit Message

Daniel Vetter March 26, 2019, 1:19 p.m. UTC
This changes the fb name from "inteldrmfb" to "i915drmfb".

v2: Rebase

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: intel-gfx@lists.freedesktop.org
---
 drivers/gpu/drm/i915/intel_fbdev.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Noralf Trønnes March 26, 2019, 2:34 p.m. UTC | #1
Den 26.03.2019 14.19, skrev Daniel Vetter:
> This changes the fb name from "inteldrmfb" to "i915drmfb".
> 
> v2: Rebase
> 
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> Cc: Jani Nikula <jani.nikula@linux.intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: intel-gfx@lists.freedesktop.org
> ---

Reviewed-by: Noralf Trønnes <noralf@tronnes.org>
Joonas Lahtinen March 27, 2019, 11:10 a.m. UTC | #2
Quoting Daniel Vetter (2019-03-26 15:19:58)
> This changes the fb name from "inteldrmfb" to "i915drmfb".

I'm fairly sure I already commented that is is Acked-by in the
case the other drivers are doing the same consolidation.

Just have to make sure we don't break any IGTs that might depend
on the module name.

Regards, Joonas
Daniel Vetter March 27, 2019, 11:15 a.m. UTC | #3
On Wed, Mar 27, 2019 at 12:10 PM Joonas Lahtinen
<joonas.lahtinen@linux.intel.com> wrote:
>
> Quoting Daniel Vetter (2019-03-26 15:19:58)
> > This changes the fb name from "inteldrmfb" to "i915drmfb".
>
> I'm fairly sure I already commented that is is Acked-by in the
> case the other drivers are doing the same consolidation.
>
> Just have to make sure we don't break any IGTs that might depend
> on the module name.

Must have missed it, but either way CI is happy. There's also not a
big chance we do have an igt which looks at this, since this is only
the legacy fbdev driver name, not the native drm driver name. I'm not
even sure we have a single testcase for that.
-Daniel

Patch
diff mbox series

diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index f9ab94b99a3c..ef93c27e60b4 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -235,12 +235,8 @@  static int intelfb_create(struct drm_fb_helper *helper,
 		goto out_unpin;
 	}
 
-	info->par = helper;
-
 	ifbdev->helper.fb = fb;
 
-	strcpy(info->fix.id, "inteldrmfb");
-
 	info->fbops = &intelfb_ops;
 
 	/* setup aperture base/size for vesafb takeover */
@@ -259,8 +255,7 @@  static int intelfb_create(struct drm_fb_helper *helper,
 	info->screen_base = vaddr;
 	info->screen_size = vma->node.size;
 
-	drm_fb_helper_fill_fix(info, fb->pitches[0], fb->format->depth);
-	drm_fb_helper_fill_var(info, &ifbdev->helper, sizes->fb_width, sizes->fb_height);
+	drm_fb_helper_fill_info(info, &ifbdev->helper, sizes);
 
 	/* If the object is shmemfs backed, it will have given us zeroed pages.
 	 * If the object is stolen however, it will be full of whatever