Picture aspect ratio support in DRM layer
Subsystems (4)
v3 cover Picture aspect ratio support in DRM layer
This patch series adds 4 patches.
- The first two patches add aspect ratio support in DRM layes
- Next two patches add new aspect ratios defined in CEA-861-F supported for HDMI 2.0 4k modes.
Adding aspect ratio support in DRM layer:
- The CEA videmodes contain aspect ratio information, which we parse when we read the modes from EDID. But while transforming user_mode to kernel_mode or viceversa, DRM layer lose this information.
- HDMI compliance testing for CEA modes, expects the AVI info frames to contain exact VIC no for the 'video mode under test'. Now CEA modes have different VIC for same modes but different aspect ratio for example:
VIC 2 = 720x480@60 4:3
VIC 3 = 720x480@60 16:9 In this way, lack of aspect ratio information, can cause wrong VIC no in AVI IF, causing HDMI complaince test to fail.
- This patch set adds code, which embeds the aspect ratio information also in DRM video mode flags, and uses it while comparing two modes.
Adding new aspect ratios for HDMI 2.0
- CEA-861-F defines two new aspect ratios, to be used for 4k HDMI 2.0 modes.
- 64:27
- 256:135
Last two patches in the series, adds code to handle these new aspect ratios.
V2: Fixed review comments from Sean, Emil, Daniel
V3: Fixed review comment from Jim Bride, got r-b for all patches
Shashank Sharma (4):
drm/i915: Add lspcon resume function
drm: Add aspect ratio parsing in DRM layer
video: Add new aspect ratios for HDMI 2.0
drm: Add and handle new aspect ratios in DRM layer
drivers/gpu/drm/drm_modes.c | 43 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 7 +++++- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_lspcon.c | 8 +++++++ drivers/video/hdmi.c | 4 ++++ include/linux/hdmi.h | 2 ++ include/uapi/drm/drm_mode.h | 6 ++++++ 7 files changed, 70 insertions(+), 1 deletion(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Please ignore this series, I mixed up one patch from LSPCON in here. Will send the right series in few minutes.
Regards
Shashank
-----Original Message-----
From: Sharma, Shashank
Sent: Monday, October 17, 2016 4:52 PM
To: [email protected]; [email protected]
Cc: [email protected]; Vetter, Daniel <[email protected]>; Sharma, Shashank <[email protected]>
Subject: [PATCH v3 0/4] Picture aspect ratio support in DRM layer
This patch series adds 4 patches.
- The first two patches add aspect ratio support in DRM layes
- Next two patches add new aspect ratios defined in CEA-861-F supported for HDMI 2.0 4k modes.
Adding aspect ratio support in DRM layer:
- The CEA videmodes contain aspect ratio information, which we parse when we read the modes from EDID. But while transforming user_mode to kernel_mode or viceversa, DRM layer lose this information.
- HDMI compliance testing for CEA modes, expects the AVI info frames to contain exact VIC no for the 'video mode under test'. Now CEA modes have different VIC for same modes but different aspect ratio for example:
VIC 2 = 720x480@60 4:3
VIC 3 = 720x480@60 16:9 In this way, lack of aspect ratio information, can cause wrong VIC no in AVI IF, causing HDMI complaince test to fail.
- This patch set adds code, which embeds the aspect ratio information also in DRM video mode flags, and uses it while comparing two modes.
Adding new aspect ratios for HDMI 2.0
- CEA-861-F defines two new aspect ratios, to be used for 4k HDMI 2.0 modes.
- 64:27
- 256:135
Last two patches in the series, adds code to handle these new aspect ratios.
V2: Fixed review comments from Sean, Emil, Daniel
V3: Fixed review comment from Jim Bride, got r-b for all patches
Shashank Sharma (4):
drm/i915: Add lspcon resume function
drm: Add aspect ratio parsing in DRM layer
video: Add new aspect ratios for HDMI 2.0
drm: Add and handle new aspect ratios in DRM layer
drivers/gpu/drm/drm_modes.c | 43 +++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_dp.c | 7 +++++- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_lspcon.c | 8 +++++++ drivers/video/hdmi.c | 4 ++++ include/linux/hdmi.h | 2 ++ include/uapi/drm/drm_mode.h | 6 ++++++ 7 files changed, 70 insertions(+), 1 deletion(-)
--
1.9.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 1/4 drm/i915: Add lspcon resume function
In reply to Shashank SharmaAs per the software design, we are driving lspcon in PCON mode. But while resuming from suspend, lspcon can go in LS mode (which is its default operating mode on power on)
This patch adds a resume function for lspcon, which makes sure its operating in PCON mode, post resume.
V2: Address review comments from Imre
- move lspcon_resume call to encoder->reset()
- use early returns
--- drivers/gpu/drm/i915/intel_dp.c | 7 ++++++- drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_lspcon.c | 8 ++++++++ 3 files changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_dp.c +6 -1
@@ -4755,11 +4755,16 @@ static void intel_edp_panel_vdd_sanitize(struct intel_dp *intel_dp)void intel_dp_encoder_reset (struct drm_encoder *encoder) {struct drm_i915_private *dev_priv =to_i915 (encoder->dev); -struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +struct intel_digital_port *intel_dig_port =enc_to_dig_port (encoder); +struct intel_lspcon *lspcon = &intel_dig_port->lspcon; +struct intel_dp *intel_dp = &intel_dig_port->dp;if (!HAS_DDI (dev_priv)) intel_dp->DP =I915_READ (intel_dp->output_reg); +if (IS_GEN9 (dev_priv) && lspcon->active) +lspcon_resume (lspcon); +if (to_intel_encoder (encoder)->type !=INTEL_OUTPUT_EDP )return ;
drivers/gpu/drm/i915/intel_drv.h +1 -0
@@ -1856,4 +1856,5 @@ void intel_color_load_luts(struct drm_crtc_state *crtc_state);/* intel_lspcon.c */ bool lspcon_init (struct intel_digital_port *intel_dig_port); +void lspcon_resume (struct intel_lspcon *lspcon);#endif /* __INTEL_DRV_H__ */
drivers/gpu/drm/i915/intel_lspcon.c +8 -0
@@ -89,6 +89,14 @@ static bool lspcon_probe(struct intel_lspcon *lspcon)return true; } +void lspcon_resume (struct intel_lspcon *lspcon) +{ +if (lspcon_change_mode (lspcon,DRM_LSPCON_MODE_PCON , true)) +DRM_ERROR ("LSPCON resume failed\n" ); +else +DRM_DEBUG_KMS ("LSPCON resume success\n" ); +} +bool lspcon_init (struct intel_digital_port *intel_dig_port) {struct intel_dp *dp = &intel_dig_port->dp;
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/4 drm: Add aspect ratio parsing in DRM layer
In reply to Shashank SharmaCurrent DRM layer functions don't parse aspect ratio information while converting a user mode->kernel mode or vice versa. This causes modeset to pick mode with wrong aspect ratio, eventually causing failures in HDMI compliance test cases, due to wrong VIC.
This patch adds aspect ratio information in DRM's mode conversion and mode comparision functions, to make sure kernel picks mode with right aspect ratio (as per the VIC).
V2: Addressed review comments from Sean:
- Fix spellings/typo
- No need to handle aspect ratio none
- Add a break, for default case too
V3: Rebase
--- drivers/gpu/drm/drm_modes.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)
drivers/gpu/drm/drm_modes.c +31 -0
@@ -997,6 +997,7 @@ bool drm_mode_equal_no_clocks_no_stereo(const struct drm_display_mode *mode1, mode1->vsync_end == mode2->vsync_end && mode1->vtotal == mode2->vtotal && mode1->vscan == mode2->vscan && + mode1->picture_aspect_ratio == mode2->picture_aspect_ratio && (mode1->flags & ~DRM_MODE_FLAG_3D_MASK ) == (mode2->flags & ~DRM_MODE_FLAG_3D_MASK)) return true;
@@ -1499,6 +1500,21 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out, out->vrefresh = in->vrefresh; out->flags = in->flags; out->type = in->type; + out->flags &= ~DRM_MODE_FLAG_PIC_AR_MASK ; + +switch (in->picture_aspect_ratio) { +case HDMI_PICTURE_ASPECT_4_3 : + out->flags |=DRM_MODE_FLAG_PIC_AR_4_3 ; +break ; +case HDMI_PICTURE_ASPECT_16_9 : + out->flags |=DRM_MODE_FLAG_PIC_AR_16_9 ; +break ; +case HDMI_PICTURE_ASPECT_RESERVED : +default : + out->flags |=DRM_MODE_FLAG_PIC_AR_NONE ; +break ; + } +strncpy (out->name, in->name,DRM_DISPLAY_MODE_LEN ); out->name[DRM_DISPLAY_MODE_LEN -1 ] =0 ; }
@@ -1544,6 +1560,21 @@ int drm_mode_convert_umode(struct drm_display_mode *out,strncpy (out->name, in->name,DRM_DISPLAY_MODE_LEN ); out->name[DRM_DISPLAY_MODE_LEN -1 ] =0 ; +/* Clearing picture aspect ratio bits from out flags */ + out->flags &= ~DRM_MODE_FLAG_PIC_AR_MASK ; + +switch (in->flags &DRM_MODE_FLAG_PIC_AR_MASK ) { +case DRM_MODE_FLAG_PIC_AR_4_3 : + out->picture_aspect_ratio |=HDMI_PICTURE_ASPECT_4_3 ; +break ; +case DRM_MODE_FLAG_PIC_AR_16_9 : + out->picture_aspect_ratio |=HDMI_PICTURE_ASPECT_16_9 ; +break ; +default : + out->picture_aspect_ratio =HDMI_PICTURE_ASPECT_NONE ; +break ; + } + out->status =drm_mode_validate_basic (out);if (out->status !=MODE_OK ) goto out;
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 3/4 video: Add new aspect ratios for HDMI 2.0
In reply to Shashank SharmaHDMI 2.0/CEA-861-F introduces two new aspect ratios:
- 64:27
- 256:135
This patch adds enumeration for the new aspect ratios in the existing aspect ratio list.
V2: rebase
V3: rebase
--- drivers/video/hdmi.c | 4 ++++ include/linux/hdmi.h | 2 ++ 2 files changed, 6 insertions(+)
drivers/video/hdmi.c +4 -0
@@ -533,6 +533,10 @@ hdmi_picture_aspect_get_name(enum hdmi_picture_aspect picture_aspect)return "4:3" ;case HDMI_PICTURE_ASPECT_16_9 :return "16:9" ; +case HDMI_PICTURE_ASPECT_64_27 : +return "64:27" ; +case HDMI_PICTURE_ASPECT_256_135 : +return "256:135" ;case HDMI_PICTURE_ASPECT_RESERVED :return "Reserved" ; }
include/linux/hdmi.h +2 -0
@@ -78,6 +78,8 @@ enum hdmi_picture_aspect {HDMI_PICTURE_ASPECT_NONE ,HDMI_PICTURE_ASPECT_4_3 ,HDMI_PICTURE_ASPECT_16_9 , +HDMI_PICTURE_ASPECT_64_27 , +HDMI_PICTURE_ASPECT_256_135 , HDMI_PICTURE_ASPECT_RESERVED, };
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 4/4 drm: Add and handle new aspect ratios in DRM layer
In reply to Shashank SharmaHDMI 2.0/CEA-861-F introduces two new aspect ratios:
- 64:27
- 256:135
This patch:
- Adds new DRM flags for to represent these new aspect ratios.
- Adds new cases to handle these aspect ratios while converting from user->kernel mode or vise versa.
V2: Rebase
V3: Align macro for DRM_MODE_PICTURE_ASPECT_256_135 (Jim Bride)
--- drivers/gpu/drm/drm_modes.c | 12 ++++++++++++ include/uapi/drm/drm_mode.h | 6 ++++++ 2 files changed, 18 insertions(+)
drivers/gpu/drm/drm_modes.c +12 -0
@@ -1509,6 +1509,12 @@ void drm_mode_convert_to_umode(struct drm_mode_modeinfo *out,case HDMI_PICTURE_ASPECT_16_9 : out->flags |=DRM_MODE_FLAG_PIC_AR_16_9 ;break ; +case HDMI_PICTURE_ASPECT_64_27 : + out->flags |=DRM_MODE_FLAG_PIC_AR_64_27 ; +break ; +case DRM_MODE_PICTURE_ASPECT_256_135 : + out->flags |=DRM_MODE_FLAG_PIC_AR_256_135 ; +break ;case HDMI_PICTURE_ASPECT_RESERVED :default : out->flags |=DRM_MODE_FLAG_PIC_AR_NONE ;
@@ -1570,6 +1576,12 @@ int drm_mode_convert_umode(struct drm_display_mode *out,case DRM_MODE_FLAG_PIC_AR_16_9 : out->picture_aspect_ratio |=HDMI_PICTURE_ASPECT_16_9 ;break ; +case DRM_MODE_FLAG_PIC_AR_64_27 : + out->picture_aspect_ratio |=HDMI_PICTURE_ASPECT_64_27 ; +break ; +case DRM_MODE_FLAG_PIC_AR_256_135 : + out->picture_aspect_ratio |=HDMI_PICTURE_ASPECT_256_135 ; +break ;default : out->picture_aspect_ratio =HDMI_PICTURE_ASPECT_NONE ;break ;
include/uapi/drm/drm_mode.h +6 -0
@@ -81,6 +81,8 @@ extern "C" {#define DRM_MODE_PICTURE_ASPECT_NONE 0#define DRM_MODE_PICTURE_ASPECT_4_3 1#define DRM_MODE_PICTURE_ASPECT_16_9 2 +#define DRM_MODE_PICTURE_ASPECT_64_27 3 +#define DRM_MODE_PICTURE_ASPECT_256_135 4/* Aspect ratio flag bitmask (4 bits 22:19) */ #define DRM_MODE_FLAG_PIC_AR_MASK (0x0F<<19)
@@ -90,6 +92,10 @@ extern "C" { (DRM_MODE_PICTURE_ASPECT_4_3<<19)#define DRM_MODE_FLAG_PIC_AR_16_9 \ (DRM_MODE_PICTURE_ASPECT_16_9<<19) +#define DRM_MODE_FLAG_PIC_AR_64_27 \ + (DRM_MODE_PICTURE_ASPECT_64_27<<19) +#define DRM_MODE_FLAG_PIC_AR_256_135 \ + (DRM_MODE_PICTURE_ASPECT_256_135<<19)/* DPMS flags */ /* bit compatible with the xorg definitions. */
Signature · 6 lines
1.9.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel