diff mbox series

[10/13] drm/i915/lvds: switch to drm_edid_read_switcheroo()

Message ID 5807d1d2eb484ca90eceb4689261942a5ab3c8d1.1682077472.git.jani.nikula@intel.com (mailing list archive)
State New, archived
Headers show
Series drm/display & drm/i915: more struct drm_edid conversions | expand

Commit Message

Jani Nikula April 21, 2023, 11:47 a.m. UTC 
Use drm_edid_read_switcheroo() to switch from struct edid to struct
drm_edid.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_lvds.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

Comments

Lukas Wunner April 23, 2023, 8:10 a.m. UTC | #1 
On Fri, Apr 21, 2023 at 02:47:48PM +0300, Jani Nikula wrote:
> --- a/drivers/gpu/drm/i915/display/intel_lvds.c
> +++ b/drivers/gpu/drm/i915/display/intel_lvds.c
> @@ -943,17 +943,8 @@ void intel_lvds_init(struct drm_i915_private *i915)
>  	 */
>  	mutex_lock(&i915->drm.mode_config.mutex);
>  	if (vga_switcheroo_handler_flags() & VGA_SWITCHEROO_CAN_SWITCH_DDC) {
> -		const struct edid *edid;
> -
> -		/* FIXME: Make drm_get_edid_switcheroo() return drm_edid */
> -		edid = drm_get_edid_switcheroo(&connector->base,
> -					       intel_gmbus_get_adapter(i915, pin));
> -		if (edid) {
> -			drm_edid = drm_edid_alloc(edid, (edid->extensions + 1) * EDID_LENGTH);
> -			kfree(edid);
> -		} else {
> -			drm_edid = NULL;
> -		}
> +		drm_edid = drm_edid_read_switcheroo(&connector->base,
> +						    intel_gmbus_get_adapter(i915, pin));
>  	} else {
>  		drm_edid = drm_edid_read_ddc(&connector->base,
>  					     intel_gmbus_get_adapter(i915, pin));

No need for curly braces anymore, but regardless:

Reviewed-by: Lukas Wunner <lukas@wunner.de>
diff mbox series

Patch

diff --git a/drivers/gpu/drm/i915/display/intel_lvds.c b/drivers/gpu/drm/i915/display/intel_lvds.c
index 8e9a3d72b83b..682d5cdaa0ba 100644
--- a/drivers/gpu/drm/i915/display/intel_lvds.c
+++ b/drivers/gpu/drm/i915/display/intel_lvds.c
@@ -943,17 +943,8 @@  void intel_lvds_init(struct drm_i915_private *i915)
 	 */
 	mutex_lock(&i915->drm.mode_config.mutex);
 	if (vga_switcheroo_handler_flags() & VGA_SWITCHEROO_CAN_SWITCH_DDC) {
-		const struct edid *edid;
-
-		/* FIXME: Make drm_get_edid_switcheroo() return drm_edid */
-		edid = drm_get_edid_switcheroo(&connector->base,
-					       intel_gmbus_get_adapter(i915, pin));
-		if (edid) {
-			drm_edid = drm_edid_alloc(edid, (edid->extensions + 1) * EDID_LENGTH);
-			kfree(edid);
-		} else {
-			drm_edid = NULL;
-		}
+		drm_edid = drm_edid_read_switcheroo(&connector->base,
+						    intel_gmbus_get_adapter(i915, pin));
 	} else {
 		drm_edid = drm_edid_read_ddc(&connector->base,
 					     intel_gmbus_get_adapter(i915, pin));