From: Daniel Vetter <daniel@ffwll.ch> To: Gerd Hoffmann <kraxel@redhat.com> Cc: dri-devel@lists.freedesktop.org, lvivier@redhat.com, open list <linux-kernel@vger.kernel.org>, "open list:VIRTIO GPU DRIVER" <virtualization@lists.linux-foundation.org> Subject: Re: [PATCH 1/2] drm: virtio: add virtio_gpu_translate_format Date: Mon, 3 Apr 2017 09:51:10 +0200 [thread overview] Message-ID: <20170403075110.besn4qv53nhwlrhu@phenom.ffwll.local> (raw) In-Reply-To: <20170403070845.10793-2-kraxel@redhat.com> On Mon, Apr 03, 2017 at 09:08:44AM +0200, Gerd Hoffmann wrote: > Factors out code, no functional change. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Ugh on the big endian define, I guess we'll never managed to figure this aspect of drm pixel formats out correctly - they're supposed to encode endinaness. But the copy-paste looks correct :-) Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + > drivers/gpu/drm/virtio/virtgpu_fb.c | 58 +---------------------------- > drivers/gpu/drm/virtio/virtgpu_plane.c | 68 ++++++++++++++++++++++++++++++++++ > 3 files changed, 71 insertions(+), 56 deletions(-) > > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h > index 93900a8..1328185 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_drv.h > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h > @@ -334,6 +334,7 @@ int virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev); > void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev); > > /* virtio_gpu_plane.c */ > +uint32_t virtio_gpu_translate_format(uint32_t drm_fourcc); > struct drm_plane *virtio_gpu_plane_init(struct virtio_gpu_device *vgdev, > enum drm_plane_type type, > int index); > diff --git a/drivers/gpu/drm/virtio/virtgpu_fb.c b/drivers/gpu/drm/virtio/virtgpu_fb.c > index 9bfaef3..33df067 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_fb.c > +++ b/drivers/gpu/drm/virtio/virtgpu_fb.c > @@ -231,63 +231,9 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper, > mode_cmd.pitches[0] = mode_cmd.width * 4; > mode_cmd.pixel_format = drm_mode_legacy_fb_format(32, 24); > > - switch (mode_cmd.pixel_format) { > -#ifdef __BIG_ENDIAN > - case DRM_FORMAT_XRGB8888: > - format = VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM; > - break; > - case DRM_FORMAT_ARGB8888: > - format = VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM; > - break; > - case DRM_FORMAT_BGRX8888: > - format = VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM; > - break; > - case DRM_FORMAT_BGRA8888: > - format = VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM; > - break; > - case DRM_FORMAT_RGBX8888: > - format = VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM; > - break; > - case DRM_FORMAT_RGBA8888: > - format = VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM; > - break; > - case DRM_FORMAT_XBGR8888: > - format = VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM; > - break; > - case DRM_FORMAT_ABGR8888: > - format = VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM; > - break; > -#else > - case DRM_FORMAT_XRGB8888: > - format = VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM; > - break; > - case DRM_FORMAT_ARGB8888: > - format = VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM; > - break; > - case DRM_FORMAT_BGRX8888: > - format = VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM; > - break; > - case DRM_FORMAT_BGRA8888: > - format = VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM; > - break; > - case DRM_FORMAT_RGBX8888: > - format = VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM; > - break; > - case DRM_FORMAT_RGBA8888: > - format = VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM; > - break; > - case DRM_FORMAT_XBGR8888: > - format = VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM; > - break; > - case DRM_FORMAT_ABGR8888: > - format = VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM; > - break; > -#endif > - default: > - DRM_ERROR("failed to find virtio gpu format for %d\n", > - mode_cmd.pixel_format); > + format = virtio_gpu_translate_format(mode_cmd.pixel_format); > + if (format == 0) > return -EINVAL; > - } > > size = mode_cmd.pitches[0] * mode_cmd.height; > obj = virtio_gpu_alloc_object(dev, size, false, true); > diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c > index 1ff9c64..372c91c 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_plane.c > +++ b/drivers/gpu/drm/virtio/virtgpu_plane.c > @@ -42,6 +42,74 @@ static const uint32_t virtio_gpu_cursor_formats[] = { > DRM_FORMAT_ARGB8888, > }; > > +uint32_t virtio_gpu_translate_format(uint32_t drm_fourcc) > +{ > + uint32_t format; > + > + switch (drm_fourcc) { > +#ifdef __BIG_ENDIAN > + case DRM_FORMAT_XRGB8888: > + format = VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM; > + break; > + case DRM_FORMAT_ARGB8888: > + format = VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM; > + break; > + case DRM_FORMAT_BGRX8888: > + format = VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM; > + break; > + case DRM_FORMAT_BGRA8888: > + format = VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM; > + break; > + case DRM_FORMAT_RGBX8888: > + format = VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM; > + break; > + case DRM_FORMAT_RGBA8888: > + format = VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM; > + break; > + case DRM_FORMAT_XBGR8888: > + format = VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM; > + break; > + case DRM_FORMAT_ABGR8888: > + format = VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM; > + break; > +#else > + case DRM_FORMAT_XRGB8888: > + format = VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM; > + break; > + case DRM_FORMAT_ARGB8888: > + format = VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM; > + break; > + case DRM_FORMAT_BGRX8888: > + format = VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM; > + break; > + case DRM_FORMAT_BGRA8888: > + format = VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM; > + break; > + case DRM_FORMAT_RGBX8888: > + format = VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM; > + break; > + case DRM_FORMAT_RGBA8888: > + format = VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM; > + break; > + case DRM_FORMAT_XBGR8888: > + format = VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM; > + break; > + case DRM_FORMAT_ABGR8888: > + format = VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM; > + break; > +#endif > + default: > + /* > + * This should not happen, we handle everything listed > + * in virtio_gpu_formats[]. > + */ > + format = 0; > + break; > + } > + WARN_ON(format == 0); > + return format; > +} > + > static void virtio_gpu_plane_destroy(struct drm_plane *plane) > { > drm_plane_cleanup(plane); > -- > 2.9.3 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Vetter <daniel@ffwll.ch> To: Gerd Hoffmann <kraxel@redhat.com> Cc: lvivier@redhat.com, open list <linux-kernel@vger.kernel.org>, dri-devel@lists.freedesktop.org, "open list:VIRTIO GPU DRIVER" <virtualization@lists.linux-foundation.org> Subject: Re: [PATCH 1/2] drm: virtio: add virtio_gpu_translate_format Date: Mon, 3 Apr 2017 09:51:10 +0200 [thread overview] Message-ID: <20170403075110.besn4qv53nhwlrhu@phenom.ffwll.local> (raw) In-Reply-To: <20170403070845.10793-2-kraxel@redhat.com> On Mon, Apr 03, 2017 at 09:08:44AM +0200, Gerd Hoffmann wrote: > Factors out code, no functional change. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Ugh on the big endian define, I guess we'll never managed to figure this aspect of drm pixel formats out correctly - they're supposed to encode endinaness. But the copy-paste looks correct :-) Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/virtio/virtgpu_drv.h | 1 + > drivers/gpu/drm/virtio/virtgpu_fb.c | 58 +---------------------------- > drivers/gpu/drm/virtio/virtgpu_plane.c | 68 ++++++++++++++++++++++++++++++++++ > 3 files changed, 71 insertions(+), 56 deletions(-) > > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h > index 93900a8..1328185 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_drv.h > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h > @@ -334,6 +334,7 @@ int virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev); > void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev); > > /* virtio_gpu_plane.c */ > +uint32_t virtio_gpu_translate_format(uint32_t drm_fourcc); > struct drm_plane *virtio_gpu_plane_init(struct virtio_gpu_device *vgdev, > enum drm_plane_type type, > int index); > diff --git a/drivers/gpu/drm/virtio/virtgpu_fb.c b/drivers/gpu/drm/virtio/virtgpu_fb.c > index 9bfaef3..33df067 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_fb.c > +++ b/drivers/gpu/drm/virtio/virtgpu_fb.c > @@ -231,63 +231,9 @@ static int virtio_gpufb_create(struct drm_fb_helper *helper, > mode_cmd.pitches[0] = mode_cmd.width * 4; > mode_cmd.pixel_format = drm_mode_legacy_fb_format(32, 24); > > - switch (mode_cmd.pixel_format) { > -#ifdef __BIG_ENDIAN > - case DRM_FORMAT_XRGB8888: > - format = VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM; > - break; > - case DRM_FORMAT_ARGB8888: > - format = VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM; > - break; > - case DRM_FORMAT_BGRX8888: > - format = VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM; > - break; > - case DRM_FORMAT_BGRA8888: > - format = VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM; > - break; > - case DRM_FORMAT_RGBX8888: > - format = VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM; > - break; > - case DRM_FORMAT_RGBA8888: > - format = VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM; > - break; > - case DRM_FORMAT_XBGR8888: > - format = VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM; > - break; > - case DRM_FORMAT_ABGR8888: > - format = VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM; > - break; > -#else > - case DRM_FORMAT_XRGB8888: > - format = VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM; > - break; > - case DRM_FORMAT_ARGB8888: > - format = VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM; > - break; > - case DRM_FORMAT_BGRX8888: > - format = VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM; > - break; > - case DRM_FORMAT_BGRA8888: > - format = VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM; > - break; > - case DRM_FORMAT_RGBX8888: > - format = VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM; > - break; > - case DRM_FORMAT_RGBA8888: > - format = VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM; > - break; > - case DRM_FORMAT_XBGR8888: > - format = VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM; > - break; > - case DRM_FORMAT_ABGR8888: > - format = VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM; > - break; > -#endif > - default: > - DRM_ERROR("failed to find virtio gpu format for %d\n", > - mode_cmd.pixel_format); > + format = virtio_gpu_translate_format(mode_cmd.pixel_format); > + if (format == 0) > return -EINVAL; > - } > > size = mode_cmd.pitches[0] * mode_cmd.height; > obj = virtio_gpu_alloc_object(dev, size, false, true); > diff --git a/drivers/gpu/drm/virtio/virtgpu_plane.c b/drivers/gpu/drm/virtio/virtgpu_plane.c > index 1ff9c64..372c91c 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_plane.c > +++ b/drivers/gpu/drm/virtio/virtgpu_plane.c > @@ -42,6 +42,74 @@ static const uint32_t virtio_gpu_cursor_formats[] = { > DRM_FORMAT_ARGB8888, > }; > > +uint32_t virtio_gpu_translate_format(uint32_t drm_fourcc) > +{ > + uint32_t format; > + > + switch (drm_fourcc) { > +#ifdef __BIG_ENDIAN > + case DRM_FORMAT_XRGB8888: > + format = VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM; > + break; > + case DRM_FORMAT_ARGB8888: > + format = VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM; > + break; > + case DRM_FORMAT_BGRX8888: > + format = VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM; > + break; > + case DRM_FORMAT_BGRA8888: > + format = VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM; > + break; > + case DRM_FORMAT_RGBX8888: > + format = VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM; > + break; > + case DRM_FORMAT_RGBA8888: > + format = VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM; > + break; > + case DRM_FORMAT_XBGR8888: > + format = VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM; > + break; > + case DRM_FORMAT_ABGR8888: > + format = VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM; > + break; > +#else > + case DRM_FORMAT_XRGB8888: > + format = VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM; > + break; > + case DRM_FORMAT_ARGB8888: > + format = VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM; > + break; > + case DRM_FORMAT_BGRX8888: > + format = VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM; > + break; > + case DRM_FORMAT_BGRA8888: > + format = VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM; > + break; > + case DRM_FORMAT_RGBX8888: > + format = VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM; > + break; > + case DRM_FORMAT_RGBA8888: > + format = VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM; > + break; > + case DRM_FORMAT_XBGR8888: > + format = VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM; > + break; > + case DRM_FORMAT_ABGR8888: > + format = VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM; > + break; > +#endif > + default: > + /* > + * This should not happen, we handle everything listed > + * in virtio_gpu_formats[]. > + */ > + format = 0; > + break; > + } > + WARN_ON(format == 0); > + return format; > +} > + > static void virtio_gpu_plane_destroy(struct drm_plane *plane) > { > drm_plane_cleanup(plane); > -- > 2.9.3 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2017-04-03 7:51 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-03 7:08 [PATCH 0/2] virtio: fix virtio_gpu_mode_dumb_create Gerd Hoffmann 2017-04-03 7:08 ` [PATCH 1/2] drm: virtio: add virtio_gpu_translate_format Gerd Hoffmann 2017-04-03 7:08 ` Gerd Hoffmann 2017-04-03 7:51 ` Daniel Vetter [this message] 2017-04-03 7:51 ` Daniel Vetter 2017-04-03 9:05 ` Gerd Hoffmann 2017-04-03 9:05 ` Gerd Hoffmann 2017-04-03 9:05 ` Gerd Hoffmann 2017-04-03 7:51 ` Daniel Vetter 2017-04-03 7:08 ` [PATCH 2/2] drm: virtio: fix virtio_gpu_mode_dumb_create Gerd Hoffmann 2017-04-03 7:08 ` Gerd Hoffmann 2017-04-03 7:45 ` Dave Airlie 2017-04-03 7:45 ` Dave Airlie 2017-04-03 7:53 ` Daniel Vetter 2017-04-03 7:53 ` Daniel Vetter 2017-04-03 9:02 ` Gerd Hoffmann 2017-04-03 9:02 ` Gerd Hoffmann 2017-04-03 9:02 ` Gerd Hoffmann 2017-04-03 7:53 ` Daniel Vetter 2017-04-03 7:08 ` Gerd Hoffmann 2017-04-03 8:31 ` [PATCH 0/2] " Laurent Vivier
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170403075110.besn4qv53nhwlrhu@phenom.ffwll.local \ --to=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=kraxel@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=lvivier@redhat.com \ --cc=virtualization@lists.linux-foundation.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.