* [PATCH] drm: Clean up the 1366x768 fixup codes
@ 2017-01-16 14:54 Takashi Iwai
2017-01-16 19:16 ` Gustavo Padovan
0 siblings, 1 reply; 3+ messages in thread
From: Takashi Iwai @ 2017-01-16 14:54 UTC (permalink / raw)
To: dri-devel; +Cc: Ville Syrjälä, Daniel Vetter, linux-kernel
This is just a cleanup, no functional change.
The fixup code for 1366x768 in drm_mode_create_from_cmdline_mode() is
basically a copy of the existing code in drm_edid.c. Make the latter
code public so that it can be called from the former function.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
drivers/gpu/drm/drm_crtc_internal.h | 3 +++
drivers/gpu/drm/drm_edid.c | 6 +++---
drivers/gpu/drm/drm_modes.c | 9 ++-------
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
index cdf6860c9d22..01bde7103ad6 100644
--- a/drivers/gpu/drm/drm_crtc_internal.h
+++ b/drivers/gpu/drm/drm_crtc_internal.h
@@ -199,3 +199,6 @@ int drm_mode_cursor2_ioctl(struct drm_device *dev,
void *data, struct drm_file *file_priv);
int drm_mode_page_flip_ioctl(struct drm_device *dev,
void *data, struct drm_file *file_priv);
+
+/* drm_edid.c */
+void drm_mode_fixup_1366x768(struct drm_display_mode *mode);
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 336be31ff3de..739a19cb27d9 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -2152,7 +2152,7 @@ drm_dmt_modes_for_range(struct drm_connector *connector, struct edid *edid,
/* fix up 1366x768 mode from 1368x768;
* GFT/CVT can't express 1366 width which isn't dividable by 8
*/
-static void fixup_mode_1366x768(struct drm_display_mode *mode)
+void drm_mode_fixup_1366x768(struct drm_display_mode *mode)
{
if (mode->hdisplay == 1368 && mode->vdisplay == 768) {
mode->hdisplay = 1366;
@@ -2176,7 +2176,7 @@ drm_gtf_modes_for_range(struct drm_connector *connector, struct edid *edid,
if (!newmode)
return modes;
- fixup_mode_1366x768(newmode);
+ drm_mode_fixup_1366x768(newmode);
if (!mode_in_range(newmode, edid, timing) ||
!valid_inferred_mode(connector, newmode)) {
drm_mode_destroy(dev, newmode);
@@ -2205,7 +2205,7 @@ drm_cvt_modes_for_range(struct drm_connector *connector, struct edid *edid,
if (!newmode)
return modes;
- fixup_mode_1366x768(newmode);
+ drm_mode_fixup_1366x768(newmode);
if (!mode_in_range(newmode, edid, timing) ||
!valid_inferred_mode(connector, newmode)) {
drm_mode_destroy(dev, newmode);
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
index e6b19bc9021a..860f4d1ffbde 100644
--- a/drivers/gpu/drm/drm_modes.c
+++ b/drivers/gpu/drm/drm_modes.c
@@ -1461,13 +1461,8 @@ drm_mode_create_from_cmdline_mode(struct drm_device *dev,
mode->type |= DRM_MODE_TYPE_USERDEF;
/* fix up 1368x768: GFT/CVT can't express 1366 width due to alignment */
- if (cmd->xres == 1366 && mode->hdisplay == 1368) {
- mode->hdisplay = 1366;
- mode->hsync_start--;
- mode->hsync_end--;
- drm_mode_set_name(mode);
- }
- drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V);
+ if (cmd->xres == 1366)
+ drm_mode_fixup_1366x768(mode);
return mode;
}
EXPORT_SYMBOL(drm_mode_create_from_cmdline_mode);
--
2.11.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm: Clean up the 1366x768 fixup codes
2017-01-16 14:54 [PATCH] drm: Clean up the 1366x768 fixup codes Takashi Iwai
@ 2017-01-16 19:16 ` Gustavo Padovan
2017-01-16 19:52 ` Takashi Iwai
0 siblings, 1 reply; 3+ messages in thread
From: Gustavo Padovan @ 2017-01-16 19:16 UTC (permalink / raw)
To: Takashi Iwai; +Cc: dri-devel, linux-kernel
Hi Takashi,
2017-01-16 Takashi Iwai <tiwai@suse.de>:
> This is just a cleanup, no functional change.
>
> The fixup code for 1366x768 in drm_mode_create_from_cmdline_mode() is
> basically a copy of the existing code in drm_edid.c. Make the latter
> code public so that it can be called from the former function.
>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> ---
> drivers/gpu/drm/drm_crtc_internal.h | 3 +++
> drivers/gpu/drm/drm_edid.c | 6 +++---
> drivers/gpu/drm/drm_modes.c | 9 ++-------
> 3 files changed, 8 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
> index cdf6860c9d22..01bde7103ad6 100644
> --- a/drivers/gpu/drm/drm_crtc_internal.h
> +++ b/drivers/gpu/drm/drm_crtc_internal.h
> @@ -199,3 +199,6 @@ int drm_mode_cursor2_ioctl(struct drm_device *dev,
> void *data, struct drm_file *file_priv);
> int drm_mode_page_flip_ioctl(struct drm_device *dev,
> void *data, struct drm_file *file_priv);
> +
> +/* drm_edid.c */
> +void drm_mode_fixup_1366x768(struct drm_display_mode *mode);
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index 336be31ff3de..739a19cb27d9 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -2152,7 +2152,7 @@ drm_dmt_modes_for_range(struct drm_connector *connector, struct edid *edid,
> /* fix up 1366x768 mode from 1368x768;
> * GFT/CVT can't express 1366 width which isn't dividable by 8
> */
> -static void fixup_mode_1366x768(struct drm_display_mode *mode)
> +void drm_mode_fixup_1366x768(struct drm_display_mode *mode)
> {
> if (mode->hdisplay == 1368 && mode->vdisplay == 768) {
> mode->hdisplay = 1366;
> @@ -2176,7 +2176,7 @@ drm_gtf_modes_for_range(struct drm_connector *connector, struct edid *edid,
> if (!newmode)
> return modes;
>
> - fixup_mode_1366x768(newmode);
> + drm_mode_fixup_1366x768(newmode);
> if (!mode_in_range(newmode, edid, timing) ||
> !valid_inferred_mode(connector, newmode)) {
> drm_mode_destroy(dev, newmode);
> @@ -2205,7 +2205,7 @@ drm_cvt_modes_for_range(struct drm_connector *connector, struct edid *edid,
> if (!newmode)
> return modes;
>
> - fixup_mode_1366x768(newmode);
> + drm_mode_fixup_1366x768(newmode);
> if (!mode_in_range(newmode, edid, timing) ||
> !valid_inferred_mode(connector, newmode)) {
> drm_mode_destroy(dev, newmode);
> diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
> index e6b19bc9021a..860f4d1ffbde 100644
> --- a/drivers/gpu/drm/drm_modes.c
> +++ b/drivers/gpu/drm/drm_modes.c
> @@ -1461,13 +1461,8 @@ drm_mode_create_from_cmdline_mode(struct drm_device *dev,
>
> mode->type |= DRM_MODE_TYPE_USERDEF;
> /* fix up 1368x768: GFT/CVT can't express 1366 width due to alignment */
> - if (cmd->xres == 1366 && mode->hdisplay == 1368) {
> - mode->hdisplay = 1366;
> - mode->hsync_start--;
> - mode->hsync_end--;
> - drm_mode_set_name(mode);
> - }
> - drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V);
At a glance removing the call to drm_mode_set_crtcinfo() seems a
functional change to me. I'm not sure why you removed it.
Gustavo
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm: Clean up the 1366x768 fixup codes
2017-01-16 19:16 ` Gustavo Padovan
@ 2017-01-16 19:52 ` Takashi Iwai
0 siblings, 0 replies; 3+ messages in thread
From: Takashi Iwai @ 2017-01-16 19:52 UTC (permalink / raw)
To: Gustavo Padovan; +Cc: dri-devel, linux-kernel
On Mon, 16 Jan 2017 20:16:04 +0100,
Gustavo Padovan wrote:
>
> Hi Takashi,
>
> 2017-01-16 Takashi Iwai <tiwai@suse.de>:
>
> > This is just a cleanup, no functional change.
> >
> > The fixup code for 1366x768 in drm_mode_create_from_cmdline_mode() is
> > basically a copy of the existing code in drm_edid.c. Make the latter
> > code public so that it can be called from the former function.
> >
> > Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > ---
> > drivers/gpu/drm/drm_crtc_internal.h | 3 +++
> > drivers/gpu/drm/drm_edid.c | 6 +++---
> > drivers/gpu/drm/drm_modes.c | 9 ++-------
> > 3 files changed, 8 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/drm_crtc_internal.h b/drivers/gpu/drm/drm_crtc_internal.h
> > index cdf6860c9d22..01bde7103ad6 100644
> > --- a/drivers/gpu/drm/drm_crtc_internal.h
> > +++ b/drivers/gpu/drm/drm_crtc_internal.h
> > @@ -199,3 +199,6 @@ int drm_mode_cursor2_ioctl(struct drm_device *dev,
> > void *data, struct drm_file *file_priv);
> > int drm_mode_page_flip_ioctl(struct drm_device *dev,
> > void *data, struct drm_file *file_priv);
> > +
> > +/* drm_edid.c */
> > +void drm_mode_fixup_1366x768(struct drm_display_mode *mode);
> > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> > index 336be31ff3de..739a19cb27d9 100644
> > --- a/drivers/gpu/drm/drm_edid.c
> > +++ b/drivers/gpu/drm/drm_edid.c
> > @@ -2152,7 +2152,7 @@ drm_dmt_modes_for_range(struct drm_connector *connector, struct edid *edid,
> > /* fix up 1366x768 mode from 1368x768;
> > * GFT/CVT can't express 1366 width which isn't dividable by 8
> > */
> > -static void fixup_mode_1366x768(struct drm_display_mode *mode)
> > +void drm_mode_fixup_1366x768(struct drm_display_mode *mode)
> > {
> > if (mode->hdisplay == 1368 && mode->vdisplay == 768) {
> > mode->hdisplay = 1366;
> > @@ -2176,7 +2176,7 @@ drm_gtf_modes_for_range(struct drm_connector *connector, struct edid *edid,
> > if (!newmode)
> > return modes;
> >
> > - fixup_mode_1366x768(newmode);
> > + drm_mode_fixup_1366x768(newmode);
> > if (!mode_in_range(newmode, edid, timing) ||
> > !valid_inferred_mode(connector, newmode)) {
> > drm_mode_destroy(dev, newmode);
> > @@ -2205,7 +2205,7 @@ drm_cvt_modes_for_range(struct drm_connector *connector, struct edid *edid,
> > if (!newmode)
> > return modes;
> >
> > - fixup_mode_1366x768(newmode);
> > + drm_mode_fixup_1366x768(newmode);
> > if (!mode_in_range(newmode, edid, timing) ||
> > !valid_inferred_mode(connector, newmode)) {
> > drm_mode_destroy(dev, newmode);
> > diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c
> > index e6b19bc9021a..860f4d1ffbde 100644
> > --- a/drivers/gpu/drm/drm_modes.c
> > +++ b/drivers/gpu/drm/drm_modes.c
> > @@ -1461,13 +1461,8 @@ drm_mode_create_from_cmdline_mode(struct drm_device *dev,
> >
> > mode->type |= DRM_MODE_TYPE_USERDEF;
> > /* fix up 1368x768: GFT/CVT can't express 1366 width due to alignment */
> > - if (cmd->xres == 1366 && mode->hdisplay == 1368) {
> > - mode->hdisplay = 1366;
> > - mode->hsync_start--;
> > - mode->hsync_end--;
> > - drm_mode_set_name(mode);
> > - }
> > - drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V);
>
> At a glance removing the call to drm_mode_set_crtcinfo() seems a
> functional change to me. I'm not sure why you removed it.
Oops, of course it's wrong. It shouldn't have been deleted.
Will resubmit the proper patch.
Thanks for catching!
Takashi
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-16 20:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-01-16 14:54 [PATCH] drm: Clean up the 1366x768 fixup codes Takashi Iwai
2017-01-16 19:16 ` Gustavo Padovan
2017-01-16 19:52 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox